This commit was manufactured by cvs2svn to create tag 'ACE-4_6_45'.ACE-4_6_45

343 files changed, 0 insertions, 164485 deletions

diff --git a/TAO/tao/Acceptor_Impl.cpp b/TAO/tao/Acceptor_Impl.cpp
deleted file mode 100644
index f7d35cfaddd..00000000000
--- a/TAO/tao/Acceptor_Impl.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   Acceptor_Impl.cpp
-//
-// = AUTHOR
-//   Carlos O'Ryan <coryan@cs.wustl.edu>
-//   Ossama Othman <othman@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_ACCEPTOR_IMPL_C
-#define TAO_ACCEPTOR_IMPL_C
-
-#include "tao/Acceptor_Impl.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/ORB_Core.h"
-#include "tao/Server_Strategy_Factory.h"
-
-#if !defined(__ACE_INLINE__)
-#include "tao/Acceptor_Impl.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(tao, Acceptor_Impl, "$Id$")
-
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-TAO_Acceptor_Impl<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open (TAO_ORB_Core* orb_core,
-                              const ACE_PEER_ACCEPTOR_ADDR &local_address,
-                              int flags,
-                              int use_select,
-                              int reuse_addr)
-{
-  this->orb_core_ = orb_core;
-  return this->ACE_Acceptor<SVC_HANDLER,ACE_PEER_ACCEPTOR_2>::open 
-    (local_address,
-     this->orb_core_->reactor (),
-     flags,
-     use_select,
-     reuse_addr);
-}
-
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-TAO_Acceptor_Impl<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::make_svc_handler (SVC_HANDLER *&sh)
-{
-  if (sh == 0)
-    {
-      if (this->orb_core_ == 0)
-        this->orb_core_ = TAO_ORB_Core_instance ();
-
-      ACE_NEW_RETURN (sh,
-                      SVC_HANDLER (this->orb_core_),
-                      -1);
-    }
-  return 0;
-}
-
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-TAO_Acceptor_Impl<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::activate_svc_handler (SVC_HANDLER *sh)
-{
-  if (this->ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::activate_svc_handler (sh) == -1)
-    return -1;
-
-  TAO_Server_Strategy_Factory *f =
-    this->orb_core_->server_factory ();
-
-  if (f->activate_server_connections ())
-    return sh->activate (f->server_connection_thread_flags (),
-                         f->server_connection_thread_count ());
-
-  return this->reactor ()->register_handler 
-    (sh, ACE_Event_Handler::READ_MASK);
-}
-
-#endif /* TAO_ACCEPTOR_IMPL_C */
diff --git a/TAO/tao/Acceptor_Impl.h b/TAO/tao/Acceptor_Impl.h
deleted file mode 100644
index de100f75f2d..00000000000
--- a/TAO/tao/Acceptor_Impl.h
+++ /dev/null
@@ -1,86 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   Acceptor_Impl.h
-//
-// = AUTHOR
-//   Carlos O'Ryan <coryan@cs.wustl.edu>
-//   Ossama Othman <othman@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_ACCEPTOR_IMPL_H
-#define TAO_ACCEPTOR_IMPL_H
-
-#include "ace/Acceptor.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-template<class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> class TAO_Acceptor_Impl : public ACE_Acceptor<SVC_HANDLER,ACE_PEER_ACCEPTOR_2>
-{
-  // = TITLE
-  //   Helper class to implement the acceptors in TAO
-  //
-  // = DESCRIPTION
-  //   TAO pluggable protocols framework provide an abstraction to
-  //   represent any kind of acceptor object, the implementation of
-  //   that acceptor is left for the pluggable protocol implementor,
-  //   but the most common case would be to use an ACE_Acceptor<>
-  //   instantiated over the right Svc_Handlers.
-  //   But the Svc_Handlers must inherit the <orb_core> that owns the
-  //   acceptor, though this could be implemented in each pluggable
-  //   protocol we believe that this class would simplify that task
-  //   and work in most cases.  Pluggable protocol implementors are,
-  //   of course, free to use something else.
-  //
-public:
-  // = Initialization and termination methods.
-  TAO_Acceptor_Impl (ACE_Reactor * = 0,
-                     int use_select = 1);
-  // Constructor.
-
-  TAO_Acceptor_Impl (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
-                     ACE_Reactor * = ACE_Reactor::instance (),
-                     int flags = 0,
-                     int use_select = 1,
-                     int reuse_addr = 1);
-  // The constructors, just delegate to the base class.
-
-  int open (TAO_ORB_Core* orb_core,
-            const ACE_PEER_ACCEPTOR_ADDR &,
-            int flags = 0,
-            int use_select = 1,
-            int reuse_addr = 1);
-  // Initialize the ORB_Core.
-
-protected:
-  // = See $ACE_ROOT/ace/Acceptor.h for the documentation.
-  virtual int make_svc_handler (SVC_HANDLER *&sh);
-  virtual int activate_svc_handler (SVC_HANDLER *svc_handler);
-
-private:
-  TAO_ORB_Core *orb_core_;
-  // Pointer to the ORB Core.
-};
-
-#if defined(__ACE_INLINE__)
-#include "tao/Acceptor_Impl.i"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Acceptor_Impl.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Acceptor_Impl.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* TAO_ACCEPTOR_IMPL_H */
diff --git a/TAO/tao/Acceptor_Impl.i b/TAO/tao/Acceptor_Impl.i
deleted file mode 100644
index 7cafd44c6d7..00000000000
--- a/TAO/tao/Acceptor_Impl.i
+++ /dev/null
@@ -1,26 +0,0 @@
-// $Id$
-
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> ACE_INLINE
-TAO_Acceptor_Impl<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::
-    TAO_Acceptor_Impl (ACE_Reactor *reactor,
-                       int use_select)
-  : ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> (reactor, use_select),
-    orb_core_ (0)
-{
-}
-
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> ACE_INLINE
-TAO_Acceptor_Impl<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::
-    TAO_Acceptor_Impl (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
-                       ACE_Reactor * reactor,
-                       int flags,
-                       int use_select,
-                       int reuse_addr)
-  : ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> (local_addr,
-                                                    reactor,
-                                                    flags,
-                                                    use_select,
-                                                    reuse_addr),
-    orb_core_ (0)
-{
-}
diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp
deleted file mode 100644
index c3be42fef06..00000000000
--- a/TAO/tao/Acceptor_Registry.cpp
+++ /dev/null
@@ -1,365 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-#include "tao/Acceptor_Registry.h"
-#include "tao/Stub.h"
-#include "tao/Environment.h"
-#include "tao/GIOP.h"
-#include "tao/ORB_Core.h"
-#include "tao/params.h"
-#include "tao/MProfile.h"
-#include "tao/debug.h"
-
-#include "ace/Auto_Ptr.h"
-
-#if !defined(__ACE_INLINE__)
-#include "tao/Acceptor_Registry.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(tao, Acceptor_Registry, "$Id$")
-
-TAO_Acceptor_Registry::TAO_Acceptor_Registry (void)
-  : acceptors_ ()
-{
-}
-
-TAO_Acceptor_Registry::~TAO_Acceptor_Registry (void)
-{
-  this->close_all ();
-}
-
-size_t
-TAO_Acceptor_Registry::endpoint_count (void)
-{
-  int count = 0;
-  TAO_AcceptorSetItor end = this->end ();
-
-  for (TAO_AcceptorSetItor i = this->begin (); i != end; ++i)
-    count += (*i)->endpoint_count ();
-
-  return count;
-}
-
-int
-TAO_Acceptor_Registry::make_mprofile (const TAO_ObjectKey &object_key,
-                                      TAO_MProfile &mprofile)
-{
-  TAO_AcceptorSetItor end = this->end ();
-
-  for (TAO_AcceptorSetItor i = this->begin (); i != end; ++i)
-    if ((*i)->create_mprofile (object_key,
-                               mprofile) == -1)
-      return -1;
-
-  return 0;
-}
-
-int
-TAO_Acceptor_Registry::is_collocated (const TAO_MProfile &mprofile)
-{
-  TAO_AcceptorSetItor end = this->end ();
-
-  for (TAO_AcceptorSetItor i = this->begin (); i != end; ++i)
-    {
-      for (TAO_PHandle j = 0;
-           j != mprofile.profile_count ();
-           ++j)
-        {
-          const TAO_Profile *profile = mprofile.get_profile (j);
-
-          // Check the address for equality.
-          if ((*i)->tag () == profile->tag ()
-              && (*i)->is_collocated (profile))
-            return 1;
-        }
-    }
-
-  return 0;
-}
-
-int
-TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core)
-{
-  // protocol_factories is in the following form
-  //   IOP1://addr1,addr2,...,addrN/;IOP2://addr1,...addrM/;...
-
-  TAO_EndpointSetIterator first_endpoint =
-    orb_core->orb_params ()->endpoints ().begin ();
-
-  TAO_EndpointSetIterator last_endpoint =
-    orb_core->orb_params ()->endpoints ().end ();
-
-  if (first_endpoint == last_endpoint)
-    {
-      // No endpoints were specified, we let each protocol pick its
-      // own default.
-
-      // All TAO pluggable protocols are expected to have the ability
-      // to create a default endpoint.
-
-      return this->open_default (orb_core);
-    }
-
-  ACE_Auto_Basic_Array_Ptr <char> addr_str;
-
-  for (TAO_EndpointSetIterator endpoint = first_endpoint;
-       endpoint != last_endpoint;
-       ++endpoint)
-    {
-      ACE_CString iop = (*endpoint);
-
-      // IOP://address1,address2
-      //    ^ slot
-      int slot = iop.find ("://", 0);
-      if (slot == iop.npos)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) Invalid endpoint epecification: "
-                           "<%s>.\n",
-                           iop.c_str ()),
-                          -1);
-      ACE_CString prefix = iop.substring (0, slot);
-
-      // @@ We could move the protocol factory loop to the outermost
-      //    level but for now we leave it inside the endpoint loop
-      //    under the assumption that there will be more endpoints
-      //    than protocols.
-
-      // Now get the list of available protocol factories.
-      TAO_ProtocolFactorySetItor end =
-        orb_core->protocol_factories ()->end ();
-
-      int found = 0;
-      // If usable protocol (factory) is found then this will be
-      // set equal to 1.
-
-      for (TAO_ProtocolFactorySetItor factory =
-             orb_core->protocol_factories ()->begin ();
-           factory != end;
-           ++factory)
-        {
-          if ((*factory)->factory ()->match_prefix (prefix))
-            {
-              found = 1;  // A usable protocol was found.
-
-              // check for the presence of addresses.  Get length and
-              // subtract  3 for the three chars `://'
-              if (slot == ACE_static_cast (int, iop.length () - 3))
-                {
-                  // Protocol was specified without an endpoint.
-                  // According to the "iioploc" spec, this is valid.
-                  // As such, we extend this feature to all pluggable
-                  // protocols.  All TAO pluggable protocols are
-                  // expected to have the ability to create a default
-                  // endpoint.
-
-                  if (this->open_default (orb_core, factory) == 0)
-                    continue;
-                  else
-                    return -1;  // Problem creating default server.
-                }
-
-              // increment slot past the "://" (i.e. add 3)
-              ACE_CString addrs = iop.substring (slot + 3);
-
-              // @@ Should we check for something else besides '/',
-              // i.e. make it protocol dependent?  -- Ossama
-              if (addrs [addrs.length () - 1] == '/')
-                // Get rid of trailing '/'.
-                addrs [addrs.length () - 1] = '\0';
-
-              char *last_addr=0;
-              addr_str.reset (addrs.rep ());
-
-              // Iterate over the addrs specified in the endpoint.
-              for (char *astr = ACE_OS::strtok_r (addr_str.get (),
-                                                  ",",
-                                                  &last_addr);
-                   astr != 0 ;
-                   astr = ACE_OS::strtok_r (0,
-                                            ",",
-                                            &last_addr))
-                {
-                  ACE_CString address (astr);
-
-                  TAO_Acceptor *acceptor =
-                    (*factory)->factory ()->make_acceptor ();
-                  if (acceptor != 0)
-                    {
-                      // Check if an "N.n@" version prefix was
-                      // specified.
-                      // @@ For now, we just drop the version prefix.
-                      // At some point in the future it may become
-                      // useful.
-                      int major = -1;
-                      int minor = -1;
-                      const char *temp_iop = address.c_str ();
-                      if (isdigit (temp_iop[0])
-                          && temp_iop[1] == '.'
-                          && isdigit (temp_iop[2])
-                          && temp_iop[3] == '@')
-                        {
-                          major = temp_iop[0] - '0';
-                          minor = temp_iop[2] - '0';
-                          address = address.substring (4);
-                        }
-
-                      if (acceptor->open (orb_core,
-                                          major, minor,
-                                          address) == -1)
-                        {
-                          delete acceptor;
-
-                          return -1;
-                        }
-
-                      // add acceptor to list.
-                      if (this->acceptors_.insert (acceptor) == -1)
-                        {
-                          delete acceptor;
-
-                          ACE_ERROR_RETURN ((LM_ERROR,
-                                             "TAO (%P|%t) unable to add <%s> "
-                                             "to acceptor registry.\n",
-                                             address.c_str ()),
-                                            -1);
-                        }
-                    }
-                  else
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                                         "TAO (%P|%t) unable to create "
-                                         "an acceptor for <%s>\n",
-                                         iop.c_str ()),
-                                        -1);
-                    }
-                }
-            }
-          else
-            continue;
-        }
-
-      if (found == 0)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "TAO (%P|%t) no usable transport protocol "
-                             "was found\n"),
-                            -1);
-        }
-    }
-
-  return 0;
-}
-
-// Iterate through the loaded transport protocols and create a default 
-// server for each protocol.
-int TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core)
-{
-  TAO_ProtocolFactorySetItor end =
-    orb_core->protocol_factories ()->end ();
-
-  // loop through all the loaded protocols...
-  for (TAO_ProtocolFactorySetItor i =
-         orb_core->protocol_factories ()->begin ();
-       i != end;
-       ++i)
-    {
-      // if the protocol requires an explicit -ORBendpoint option then 
-      // don't use it, otherwise open a default endpoint for that
-      // protocol, this solves the problem with persistent endpoints
-      // (such as UNIX domain rendesvouz points), that are not cleaned 
-      // up if the server crashes.
-      if (!(*i)->factory ()->requires_explicit_endpoint ())
-        {
-          if (this->open_default (orb_core, i) != 0)
-            return -1;
-        }
-    }
-
-  return 0;
-}
-
-// Used when no endpoints were specified.  Open a default server for
-// the indicated protocol.
-int
-TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core,
-                                     TAO_ProtocolFactorySetItor &factory)
-{
-  // No endpoints were specified, we let each protocol pick its own
-  // default endpoint.
-
-  // Make an acceptor
-  TAO_Acceptor *acceptor =
-    (*factory)->factory ()->make_acceptor ();
-
-  if (acceptor == 0)
-    {
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) unable to create "
-                    "an acceptor for <%s>\n",
-                    (*factory)->protocol_name ().c_str ()));
-
-      return -1;
-    }
-
-  // Initialize the acceptor to listen on a default endpoint.
-  if (acceptor->open_default (orb_core) == -1)
-    {
-      delete acceptor;
-
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) unable to open "
-                    "default acceptor for <%s>%p\n",
-                    (*factory)->protocol_name ().c_str (), ""));
-
-      return -1;
-    }
-
-  if (this->acceptors_.insert (acceptor) == -1)
-    {
-      delete acceptor;
-
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                           "TAO (%P|%t) unable to add <%s> default_acceptor "
-                           "to acceptor registry.\n",
-                           (*factory)->protocol_name ().c_str ()));
-
-      return -1;
-    }
-
-  return 0;
-}
-
-int
-TAO_Acceptor_Registry::close_all (void)
-{
-  TAO_AcceptorSetItor end =
-                this->acceptors_.end ();
-
-  for (TAO_AcceptorSetItor i = this->acceptors_.begin ();
-       i != end;
-       ++i)
-    {
-      if (*i == 0)
-        continue;
-
-      (*i)->close ();
-
-      delete *i;
-    }
-
-  this->acceptors_.reset ();
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Node<TAO_Acceptor*>;
-template class ACE_Unbounded_Set<TAO_Acceptor*>;
-template class ACE_Unbounded_Set_Iterator<TAO_Acceptor*>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Node<TAO_Acceptor*>
-#pragma instantiate ACE_Unbounded_Set<TAO_Acceptor*>
-#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_Acceptor*>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Acceptor_Registry.h b/TAO/tao/Acceptor_Registry.h
deleted file mode 100644
index 09ccca9491e..00000000000
--- a/TAO/tao/Acceptor_Registry.h
+++ /dev/null
@@ -1,107 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     Acceptor_Registry.h
-//
-// = DESCRIPTION
-//     Interface for the TAO pluggable protocol framework.
-//
-// = AUTHOR
-//     Fred Kuhns <fredk@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_ACCEPTOR_REGISTRY_H
-#define TAO_ACCEPTOR_REGISTRY_H
-
-#include "tao/Pluggable.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/corbafwd.h"
-#include "tao/Typecode.h"
-#include "tao/Resource_Factory.h"
-
-#include "ace/Containers_T.h"
-
-// Forward declarations.
-class ACE_Addr;
-class ACE_Reactor;
-class TAO_ORB_Core;
-
-class TAO_Stub;
-class TAO_Profile;
-class TAO_MProfile;
-
-typedef ACE_Unbounded_Set<TAO_Acceptor*>
-        TAO_AcceptorSet;
-typedef ACE_Unbounded_Set_Iterator<TAO_Acceptor*>
-        TAO_AcceptorSetItor;
-
-class TAO_Export TAO_Acceptor_Registry
-{
-  // = TITLE
-  //   Acceptor Registry and Generic Acceptor interface definitions.
-  //   All loaded ESIOP or GIOP acceptor bridges must register with
-  //   this object.
-  //
-  // = DESCRIPTION
-  //   This class maintains a list os acceptor factories
-  //   for all loaded ORB protocols.
-  //   There is one Acceptor_Registry per ORB_Core.
-public:
-  // = Initialization and termination methods.
-  TAO_Acceptor_Registry (void);
-  //  Default constructor.
-
-  ~TAO_Acceptor_Registry (void);
-  //  Default destructor.
-
-  int open (TAO_ORB_Core *orb_core);
-  // Initialize all registered acceptors.  Return -1 on error.
-
-  int close_all (void);
-  // Close all open acceptors.
-
-  size_t endpoint_count (void);
-  // Returns the total number of endpoints, i.e., the number of
-  // profiles that will be created.
-
-  int make_mprofile (const TAO_ObjectKey& object_key,
-                     TAO_MProfile &mprofile);
-  // Add profiles to the <mprofile> object for all open endpoints.
-
-  int is_collocated (const TAO_MProfile& mprofile);
-  // Check if there is at least one profile in <mprofile> that
-  // corresponds to a collocated object.
-
-  // = Iterator.
-  TAO_AcceptorSetItor begin (void);
-  TAO_AcceptorSetItor end (void);
-
-private:
-  int open_default (TAO_ORB_Core *orb_core);
-  // Create a default acceptor for all loaded protocols.
-
-  int open_default (TAO_ORB_Core *orb_core,
-                    TAO_ProtocolFactorySetItor &factory);
-  // Create a default acceptor using the specified protocol factory.
-
-private:
-  TAO_AcceptorSet acceptors_;
-  // List of acceptors that are currently open.
-};
-
-#if defined(__ACE_INLINE__)
-#include "tao/Acceptor_Registry.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_ACCEPTOR_REGISTRY_H */
diff --git a/TAO/tao/Acceptor_Registry.i b/TAO/tao/Acceptor_Registry.i
deleted file mode 100644
index eb5e463892b..00000000000
--- a/TAO/tao/Acceptor_Registry.i
+++ /dev/null
@@ -1,14 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-ACE_INLINE TAO_AcceptorSetItor
-TAO_Acceptor_Registry::begin (void)
-{
-  return this->acceptors_.begin ();
-}
-
-ACE_INLINE TAO_AcceptorSetItor
-TAO_Acceptor_Registry::end (void)
-{
-  return this->acceptors_.end ();
-}
diff --git a/TAO/tao/Active_Object_Map.cpp b/TAO/tao/Active_Object_Map.cpp
deleted file mode 100644
index 2f75e2e5e5c..00000000000
--- a/TAO/tao/Active_Object_Map.cpp
+++ /dev/null
@@ -1,1087 +0,0 @@
-// $Id$
-
-#include "tao/Active_Object_Map.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Active_Object_Map.i"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/Auto_Ptr.h"
-
-ACE_RCSID(tao, POA, "$Id$")
-
-TAO_Active_Object_Map::Map_Entry::Map_Entry (void)
-  : user_id_ (),
-    system_id_ (),
-    servant_ (0),
-    reference_count_ (1),
-    deactivated_ (0)
-{
-}
-
-/* static */
-size_t TAO_Active_Object_Map::system_id_size_ = 0;
-
-void
-TAO_Active_Object_Map::set_system_id_size
-  (const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters)
-{
-  if (TAO_Active_Object_Map::system_id_size_ == 0)
-    {
-      if (creation_parameters.allow_reactivation_of_system_ids_)
-        {
-          switch (creation_parameters.object_lookup_strategy_for_system_id_policy_)
-            {
-            case TAO_LINEAR:
-              TAO_Active_Object_Map::system_id_size_ =
-                sizeof (CORBA::ULong);
-              break;
-
-            case TAO_DYNAMIC_HASH:
-            default:
-              TAO_Active_Object_Map::system_id_size_ = sizeof (CORBA::ULong);
-              break;
-            }
-
-          size_t hint_size = 0;
-
-          if (creation_parameters.use_active_hint_in_ids_)
-            hint_size = ACE_Active_Map_Manager_Key::size ();
-
-          TAO_Active_Object_Map::system_id_size_ += hint_size;
-        }
-      else
-        {
-          switch (creation_parameters.object_lookup_strategy_for_system_id_policy_)
-            {
-            case TAO_LINEAR:
-              TAO_Active_Object_Map::system_id_size_ =
-                sizeof (CORBA::ULong);
-              break;
-
-            case TAO_DYNAMIC_HASH:
-              TAO_Active_Object_Map::system_id_size_ =
-                sizeof (CORBA::ULong);
-              break;
-
-            case TAO_ACTIVE_DEMUX:
-            default:
-              TAO_Active_Object_Map::system_id_size_ =
-                ACE_Active_Map_Manager_Key::size ();
-              break;
-            }
-        }
-    }
-}
-
-TAO_Active_Object_Map::TAO_Active_Object_Map (int user_id_policy,
-                                              int unique_id_policy,
-                                              int persistent_id_policy,
-                                              const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters,
-                                              CORBA_Environment &ACE_TRY_ENV)
-  : user_id_map_ (0),
-    servant_map_ (0),
-    id_uniqueness_strategy_ (0),
-    lifespan_strategy_ (0),
-    id_assignment_strategy_ (0),
-    id_hint_strategy_ (0)
-{
-  TAO_Active_Object_Map::set_system_id_size (creation_parameters);
-
-  TAO_Id_Uniqueness_Strategy *id_uniqueness_strategy = 0;
-
-  if (unique_id_policy)
-    {
-      ACE_NEW_THROW_EX (id_uniqueness_strategy,
-                        TAO_Unique_Id_Strategy,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_NEW_THROW_EX (id_uniqueness_strategy,
-                        TAO_Multiple_Id_Strategy,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-    }
-
-  // Give ownership to the auto pointer.
-  auto_ptr<TAO_Id_Uniqueness_Strategy> new_id_uniqueness_strategy (id_uniqueness_strategy);
-
-  TAO_Lifespan_Strategy *lifespan_strategy = 0;
-
-  if (persistent_id_policy)
-    {
-      ACE_NEW_THROW_EX (lifespan_strategy,
-                        TAO_Persistent_Strategy,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_NEW_THROW_EX (lifespan_strategy,
-                        TAO_Transient_Strategy,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-    }
-
-  // Give ownership to the auto pointer.
-  auto_ptr<TAO_Lifespan_Strategy> new_lifespan_strategy (lifespan_strategy);
-
-  TAO_Id_Assignment_Strategy *id_assignment_strategy = 0;
-
-  if (user_id_policy)
-    {
-      ACE_NEW_THROW_EX (id_assignment_strategy,
-                        TAO_User_Id_Strategy,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-    }
-  else if (unique_id_policy)
-    {
-      ACE_NEW_THROW_EX (id_assignment_strategy,
-                        TAO_System_Id_With_Unique_Id_Strategy,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_NEW_THROW_EX (id_assignment_strategy,
-                        TAO_System_Id_With_Multiple_Id_Strategy,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-    }
-
-  // Give ownership to the auto pointer.
-  auto_ptr<TAO_Id_Assignment_Strategy> new_id_assignment_strategy (id_assignment_strategy);
-
-  TAO_Id_Hint_Strategy *id_hint_strategy = 0;
-  if ((user_id_policy
-       || creation_parameters.allow_reactivation_of_system_ids_)
-      && creation_parameters.use_active_hint_in_ids_)
-    {
-      ACE_NEW_THROW_EX (id_hint_strategy,
-                        TAO_Active_Hint_Strategy (creation_parameters.active_object_map_size_),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_NEW_THROW_EX (id_hint_strategy,
-                        TAO_No_Hint_Strategy,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-    }
-
-  // Give ownership to the auto pointer.
-  auto_ptr<TAO_Id_Hint_Strategy> new_id_hint_strategy (id_hint_strategy);
-
-  servant_map *sm = 0;
-  if (unique_id_policy)
-    {
-      switch (creation_parameters.reverse_object_lookup_strategy_for_unique_id_policy_)
-        {
-        case TAO_LINEAR:
-          ACE_NEW_THROW_EX (sm,
-                            servant_linear_map (creation_parameters.active_object_map_size_),
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK;
-          break;
-
-        case TAO_DYNAMIC_HASH:
-        default:
-          ACE_NEW_THROW_EX (sm,
-                            servant_hash_map (creation_parameters.active_object_map_size_),
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK;
-          break;
-        }
-    }
-
-  // Give ownership to the auto pointer.
-  auto_ptr<servant_map> new_servant_map (sm);
-
-  user_id_map *uim = 0;
-  if (user_id_policy
-      || creation_parameters.allow_reactivation_of_system_ids_)
-    {
-      switch (creation_parameters.object_lookup_strategy_for_user_id_policy_)
-        {
-        case TAO_LINEAR:
-          ACE_NEW_THROW_EX (uim,
-                            user_id_linear_map (creation_parameters.active_object_map_size_),
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK;
-          break;
-
-        case TAO_DYNAMIC_HASH:
-        default:
-          ACE_NEW_THROW_EX (uim,
-                            user_id_hash_map (creation_parameters.active_object_map_size_),
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK;
-          break;
-        }
-    }
-  else
-    {
-      switch (creation_parameters.object_lookup_strategy_for_system_id_policy_)
-        {
-        case TAO_LINEAR:
-          ACE_NEW_THROW_EX (uim,
-                            user_id_linear_map (creation_parameters.active_object_map_size_),
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK;
-          break;
-
-        case TAO_DYNAMIC_HASH:
-          ACE_NEW_THROW_EX (uim,
-                            user_id_hash_map (creation_parameters.active_object_map_size_),
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK;
-          break;
-
-        case TAO_ACTIVE_DEMUX:
-        default:
-          ACE_NEW_THROW_EX (uim,
-                            user_id_active_map (creation_parameters.active_object_map_size_),
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK;
-          break;
-        }
-    }
-
-  // Give ownership to the auto pointer.
-  auto_ptr<user_id_map> new_user_id_map (uim);
-
-  id_uniqueness_strategy->set_active_object_map (this);
-  lifespan_strategy->set_active_object_map (this);
-  id_assignment_strategy->set_active_object_map (this);
-
-  // Finally everything is fine.  Make sure to take ownership away
-  // from the auto pointer.
-  this->id_uniqueness_strategy_ = new_id_uniqueness_strategy.release ();
-  this->lifespan_strategy_ = new_lifespan_strategy.release ();
-  this->id_assignment_strategy_ = new_id_assignment_strategy.release ();
-  this->id_hint_strategy_ = new_id_hint_strategy.release ();
-  this->servant_map_ = new_servant_map.release ();
-  this->user_id_map_ = new_user_id_map.release ();
-}
-
-TAO_Active_Object_Map::~TAO_Active_Object_Map (void)
-{
-  user_id_map::iterator iterator = this->user_id_map_->begin ();
-  user_id_map::iterator end = this->user_id_map_->end ();
-
-  for (;
-       iterator != end;
-       ++iterator)
-    {
-      user_id_map::value_type map_entry = *iterator;
-      delete map_entry.second ();
-    }
-
-  delete this->id_uniqueness_strategy_;
-  delete this->lifespan_strategy_;
-  delete this->id_assignment_strategy_;
-  delete this->id_hint_strategy_;
-  delete this->servant_map_;
-  delete this->user_id_map_;
-}
-
-int
-TAO_Active_Object_Map::is_user_id_in_map (const PortableServer::ObjectId &user_id,
-                                          int &deactivated)
-{
-  Map_Entry *entry = 0;
-  int result = this->user_id_map_->find (user_id,
-                                         entry);
-  if (result == 0)
-    {
-      if (entry->servant_ == 0)
-        {
-          result = 0;
-        }
-      else
-        {
-          result = 1;
-          if (entry->deactivated_)
-            {
-              deactivated = 1;
-            }
-        }
-    }
-  else
-    {
-      result = 0;
-    }
-
-  return result;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-TAO_Id_Uniqueness_Strategy::~TAO_Id_Uniqueness_Strategy (void)
-{
-}
-
-void
-TAO_Id_Uniqueness_Strategy::set_active_object_map (TAO_Active_Object_Map *active_object_map)
-{
-  this->active_object_map_ = active_object_map;
-}
-
-int
-TAO_Unique_Id_Strategy::is_servant_in_map (PortableServer::Servant servant,
-                                           int &deactivated)
-{
-  TAO_Active_Object_Map::Map_Entry *entry = 0;
-  int result = this->active_object_map_->servant_map_->find (servant,
-                                                             entry);
-  if (result == 0)
-    {
-      result = 1;
-      if (entry->deactivated_)
-        {
-          deactivated = 1;
-        }
-    }
-  else
-    {
-      result = 0;
-    }
-
-  return result;
-}
-
-int
-TAO_Unique_Id_Strategy::bind_using_user_id (PortableServer::Servant servant,
-                                            const PortableServer::ObjectId &user_id,
-                                            TAO_Active_Object_Map::Map_Entry *&entry)
-{
-  int result = this->active_object_map_->user_id_map_->find (user_id,
-                                                             entry);
-  if (result == 0)
-    {
-      if (servant != 0)
-        {
-          entry->servant_ = servant;
-
-          result = this->active_object_map_->servant_map_->bind (entry->servant_,
-                                                                 entry);
-        }
-    }
-  else
-    {
-      ACE_NEW_RETURN (entry,
-                      TAO_Active_Object_Map::Map_Entry,
-                      -1);
-      entry->user_id_ = user_id;
-      entry->servant_ = servant;
-
-      result = this->active_object_map_->id_hint_strategy_->bind (*entry);
-
-      if (result == 0)
-        {
-          result = this->active_object_map_->user_id_map_->bind (entry->user_id_,
-                                                                 entry);
-          if (result == 0)
-            {
-              if (servant != 0)
-                result = this->active_object_map_->servant_map_->bind (entry->servant_,
-                                                                       entry);
-              if (result != 0)
-                {
-                  this->active_object_map_->user_id_map_->unbind (entry->user_id_);
-                  this->active_object_map_->id_hint_strategy_->unbind (*entry);
-                  delete entry;
-                }
-            }
-          else
-            {
-              this->active_object_map_->id_hint_strategy_->unbind (*entry);
-              delete entry;
-            }
-        }
-      else
-        delete entry;
-    }
-
-  return result;
-}
-
-int
-TAO_Unique_Id_Strategy::unbind_using_user_id (const PortableServer::ObjectId &user_id)
-{
-  TAO_Active_Object_Map::Map_Entry *entry = 0;
-  int result = this->active_object_map_->user_id_map_->unbind (user_id,
-                                                               entry);
-  if (result == 0)
-    {
-      if (entry->servant_ != 0)
-        result = this->active_object_map_->servant_map_->unbind (entry->servant_);
-
-      if (result == 0)
-        result =
-          this->active_object_map_->id_hint_strategy_->unbind (*entry);
-
-      if (result == 0)
-        delete entry;
-    }
-  return result;
-}
-
-int
-TAO_Unique_Id_Strategy::find_user_id_using_servant (PortableServer::Servant servant,
-                                                    PortableServer::ObjectId_out user_id)
-{
-  TAO_Active_Object_Map::Map_Entry *entry = 0;
-  int result = this->active_object_map_->servant_map_->find (servant,
-                                                             entry);
-  if (result == 0)
-    {
-      if (entry->deactivated_)
-        result = -1;
-      else
-        ACE_NEW_RETURN (user_id,
-                        PortableServer::ObjectId (entry->user_id_),
-                        -1);
-    }
-
-  return result;
-}
-
-int
-TAO_Unique_Id_Strategy::find_system_id_using_servant (PortableServer::Servant servant,
-                                                      PortableServer::ObjectId_out system_id)
-{
-  TAO_Active_Object_Map::Map_Entry *entry = 0;
-  int result = this->active_object_map_->servant_map_->find (servant,
-                                                             entry);
-  if (result == 0)
-    {
-      if (entry->deactivated_)
-        result = -1;
-      else
-        result = this->active_object_map_->id_hint_strategy_->system_id (system_id,
-                                                                         *entry);
-    }
-
-  return result;
-}
-
-CORBA::Boolean
-TAO_Unique_Id_Strategy::remaining_activations (PortableServer::Servant servant)
-{
-  ACE_UNUSED_ARG (servant);
-
-  // Since servant are always unique here, return false.
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-int
-TAO_Multiple_Id_Strategy::is_servant_in_map (PortableServer::Servant,
-                                             int &)
-{
-  return -1;
-}
-
-int
-TAO_Multiple_Id_Strategy::bind_using_user_id (PortableServer::Servant servant,
-                                              const PortableServer::ObjectId &user_id,
-                                              TAO_Active_Object_Map::Map_Entry *&entry)
-{
-  int result = this->active_object_map_->user_id_map_->find (user_id,
-                                                             entry);
-  if (result == 0)
-    {
-      if (servant != 0)
-        entry->servant_ = servant;
-    }
-  else
-    {
-      ACE_NEW_RETURN (entry,
-                      TAO_Active_Object_Map::Map_Entry,
-                      -1);
-      entry->user_id_ = user_id;
-      entry->servant_ = servant;
-
-      result =
-        this->active_object_map_->id_hint_strategy_->bind (*entry);
-
-      if (result == 0)
-        {
-          result = this->active_object_map_->user_id_map_->bind (entry->user_id_,
-                                                                 entry);
-          if (result != 0)
-            {
-              this->active_object_map_->id_hint_strategy_->unbind (*entry);
-              delete entry;
-            }
-        }
-      else
-        delete entry;
-    }
-
-  return result;
-}
-
-int
-TAO_Multiple_Id_Strategy::unbind_using_user_id (const PortableServer::ObjectId &user_id)
-{
-  TAO_Active_Object_Map::Map_Entry *entry = 0;
-  int result = this->active_object_map_->user_id_map_->unbind (user_id,
-                                                               entry);
-  if (result == 0)
-    {
-      result = this->active_object_map_->id_hint_strategy_->unbind (*entry);
-
-      if (result == 0)
-        delete entry;
-    }
-
-  return result;
-}
-
-int
-TAO_Multiple_Id_Strategy::find_user_id_using_servant (PortableServer::Servant servant,
-                                                      PortableServer::ObjectId_out user_id)
-{
-  ACE_UNUSED_ARG (servant);
-  ACE_UNUSED_ARG (user_id);
-
-  return -1;
-}
-
-int
-TAO_Multiple_Id_Strategy::find_system_id_using_servant (PortableServer::Servant servant,
-                                                        PortableServer::ObjectId_out system_id)
-{
-  ACE_UNUSED_ARG (servant);
-  ACE_UNUSED_ARG (system_id);
-
-  return -1;
-}
-
-CORBA::Boolean
-TAO_Multiple_Id_Strategy::remaining_activations (PortableServer::Servant servant)
-{
-  TAO_Active_Object_Map::user_id_map::iterator end
-    = this->active_object_map_->user_id_map_->end ();
-
-  for (TAO_Active_Object_Map::user_id_map::iterator iter
-         = this->active_object_map_->user_id_map_->begin ();
-       iter != end;
-       ++iter)
-    {
-      TAO_Active_Object_Map::user_id_map::value_type map_pair = *iter;
-      TAO_Active_Object_Map::Map_Entry *entry = map_pair.second ();
-
-      if (entry->servant_ == servant)
-        return 1;
-    }
-
-  return 0;
-}
-
-TAO_Lifespan_Strategy::~TAO_Lifespan_Strategy (void)
-{
-}
-
-void
-TAO_Lifespan_Strategy::set_active_object_map (TAO_Active_Object_Map *active_object_map)
-{
-  this->active_object_map_ = active_object_map;
-}
-
-int
-TAO_Transient_Strategy::find_servant_using_system_id_and_user_id (const PortableServer::ObjectId &system_id,
-                                                                  const PortableServer::ObjectId &user_id,
-                                                                  PortableServer::Servant &servant,
-                                                                  TAO_Active_Object_Map::Map_Entry *&entry)
-{
-  int result = this->active_object_map_->id_hint_strategy_->find (system_id,
-                                                                  entry);
-  if (result == 0)
-    {
-      if (entry->deactivated_)
-        result = -1;
-      else if (entry->servant_ == 0)
-        result = -1;
-      else
-        servant = entry->servant_;
-    }
-  else
-    {
-      result = this->active_object_map_->user_id_map_->find (user_id,
-                                                             entry);
-      if (result == 0)
-        {
-          if (entry->deactivated_)
-            result = -1;
-          else if (entry->servant_ == 0)
-            result = -1;
-          else
-            servant = entry->servant_;
-        }
-    }
-
-  return result;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-int
-TAO_Persistent_Strategy::find_servant_using_system_id_and_user_id (const PortableServer::ObjectId &system_id,
-                                                                   const PortableServer::ObjectId &user_id,
-                                                                   PortableServer::Servant &servant,
-                                                                   TAO_Active_Object_Map::Map_Entry *&entry)
-{
-  int result = this->active_object_map_->id_hint_strategy_->find (system_id,
-                                                                  entry);
-  if (result == 0
-      && user_id == entry->user_id_)
-    {
-      if (entry->deactivated_)
-        result = -1;
-      else if (entry->servant_ == 0)
-        result = -1;
-      else
-        servant = entry->servant_;
-    }
-  else
-    {
-      result = this->active_object_map_->user_id_map_->find (user_id,
-                                                             entry);
-      if (result == 0)
-        {
-          if (entry->deactivated_)
-            result = -1;
-          else if (entry->servant_ == 0)
-            result = -1;
-          else
-            servant = entry->servant_;
-        }
-    }
-
-  return result;
-}
-
-TAO_Id_Assignment_Strategy::~TAO_Id_Assignment_Strategy (void)
-{
-}
-
-void
-TAO_Id_Assignment_Strategy::set_active_object_map (TAO_Active_Object_Map *active_object_map)
-{
-  this->active_object_map_ = active_object_map;
-}
-
-int
-TAO_User_Id_Strategy::bind_using_system_id (PortableServer::Servant,
-                                            TAO_Active_Object_Map::Map_Entry *&)
-{
-  return -1;
-}
-
-int
-TAO_System_Id_With_Unique_Id_Strategy::bind_using_system_id (PortableServer::Servant servant,
-                                                             TAO_Active_Object_Map::Map_Entry *&entry)
-{
-  ACE_NEW_RETURN (entry,
-                  TAO_Active_Object_Map::Map_Entry,
-                  -1);
-
-  int result = this->active_object_map_->user_id_map_->bind_create_key (entry,
-                                                                        entry->user_id_);
-  if (result == 0)
-    {
-      entry->servant_ = servant;
-
-      result = this->active_object_map_->id_hint_strategy_->bind (*entry);
-
-      if (result == 0)
-        {
-          if (servant != 0)
-            result = this->active_object_map_->servant_map_->bind (entry->servant_,
-                                                                   entry);
-
-          if (result != 0)
-            {
-              this->active_object_map_->user_id_map_->unbind (entry->user_id_);
-              this->active_object_map_->id_hint_strategy_->unbind (*entry);
-              delete entry;
-            }
-        }
-      else
-        {
-          this->active_object_map_->user_id_map_->unbind (entry->user_id_);
-          delete entry;
-        }
-    }
-  else
-    delete entry;
-
-  return result;
-}
-
-int
-TAO_System_Id_With_Multiple_Id_Strategy::bind_using_system_id (PortableServer::Servant servant,
-                                                               TAO_Active_Object_Map::Map_Entry *&entry)
-{
-  ACE_NEW_RETURN (entry,
-                  TAO_Active_Object_Map::Map_Entry,
-                  -1);
-  int result = this->active_object_map_->user_id_map_->bind_create_key (entry,
-                                                                        entry->user_id_);
-  if (result == 0)
-    {
-      entry->servant_ = servant;
-
-      result = this->active_object_map_->id_hint_strategy_->bind (*entry);
-
-      if (result != 0)
-        {
-          this->active_object_map_->user_id_map_->unbind (entry->user_id_);
-          delete entry;
-        }
-    }
-  else
-    delete entry;
-
-  return result;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-TAO_Id_Hint_Strategy::~TAO_Id_Hint_Strategy (void)
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-TAO_Active_Hint_Strategy::TAO_Active_Hint_Strategy (CORBA::ULong map_size)
-  : system_id_map_ (map_size)
-{
-}
-
-TAO_Active_Hint_Strategy::~TAO_Active_Hint_Strategy (void)
-{
-}
-
-int
-TAO_Active_Hint_Strategy::recover_key (const PortableServer::ObjectId &system_id,
-                                       PortableServer::ObjectId &user_id)
-{
-  return this->system_id_map_.recover_key (system_id,
-                                           user_id);
-}
-
-int
-TAO_Active_Hint_Strategy::bind (TAO_Active_Object_Map::Map_Entry &entry)
-{
-  entry.system_id_ = entry.user_id_;
-
-  return this->system_id_map_.bind_modify_key (&entry,
-                                               entry.system_id_);
-}
-
-int
-TAO_Active_Hint_Strategy::unbind (TAO_Active_Object_Map::Map_Entry &entry)
-{
-  return this->system_id_map_.unbind (entry.system_id_);
-}
-
-int
-TAO_Active_Hint_Strategy::find (const PortableServer::ObjectId &system_id,
-                                TAO_Active_Object_Map::Map_Entry *&entry)
-{
-  return this->system_id_map_.find (system_id,
-                                    entry);
-}
-
-size_t
-TAO_Active_Hint_Strategy::hint_size (void)
-{
-  return ACE_Active_Map_Manager_Key::size ();
-}
-
-int
-TAO_Active_Hint_Strategy::system_id (PortableServer::ObjectId_out system_id,
-                                     TAO_Active_Object_Map::Map_Entry &entry)
-{
-  ACE_NEW_RETURN (system_id,
-                  PortableServer::ObjectId (entry.system_id_),
-                  -1);
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-TAO_No_Hint_Strategy::~TAO_No_Hint_Strategy (void)
-{
-}
-
-int
-TAO_No_Hint_Strategy::recover_key (const PortableServer::ObjectId &system_id,
-                                   PortableServer::ObjectId &user_id)
-{
-  // Smartly copy all the data; <user_id does not own the data>.
-  user_id.replace (system_id.maximum (),
-                   system_id.length (),
-                   ACE_const_cast (CORBA::Octet *,
-                                   system_id.get_buffer ()),
-                   0);
-
-  return 0;
-}
-
-int
-TAO_No_Hint_Strategy::bind (TAO_Active_Object_Map::Map_Entry &entry)
-{
-  ACE_UNUSED_ARG (entry);
-
-  return 0;
-}
-
-int
-TAO_No_Hint_Strategy::unbind (TAO_Active_Object_Map::Map_Entry &entry)
-{
-  ACE_UNUSED_ARG (entry);
-
-  return 0;
-}
-
-int
-TAO_No_Hint_Strategy::find (const PortableServer::ObjectId &system_id,
-                            TAO_Active_Object_Map::Map_Entry *&entry)
-{
-  ACE_UNUSED_ARG (system_id);
-  ACE_UNUSED_ARG (entry);
-
-  return -1;
-}
-
-size_t
-TAO_No_Hint_Strategy::hint_size (void)
-{
-  return 0;
-}
-
-int
-TAO_No_Hint_Strategy::system_id (PortableServer::ObjectId_out system_id,
-                                 TAO_Active_Object_Map::Map_Entry &entry)
-{
-  ACE_NEW_RETURN (system_id,
-                  PortableServer::ObjectId (entry.user_id_),
-                  -1);
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class auto_ptr<TAO_Id_Uniqueness_Strategy>;
-template class auto_ptr<TAO_Lifespan_Strategy>;
-template class auto_ptr<TAO_Id_Assignment_Strategy>;
-template class auto_ptr<TAO_Id_Hint_Strategy>;
-template class auto_ptr<TAO_Active_Object_Map::servant_map>;
-template class auto_ptr<TAO_Active_Object_Map::user_id_map>;
-
-template class ACE_Auto_Basic_Ptr<TAO_Id_Uniqueness_Strategy>;
-template class ACE_Auto_Basic_Ptr<TAO_Lifespan_Strategy>;
-template class ACE_Auto_Basic_Ptr<TAO_Id_Assignment_Strategy>;
-template class ACE_Auto_Basic_Ptr<TAO_Id_Hint_Strategy>;
-template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map::servant_map>;
-template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map::user_id_map>;
-
-// Common typedefs.
-typedef PortableServer::ObjectId id;
-typedef PortableServer::Servant servant;
-typedef TAO_Active_Object_Map::Map_Entry *value;
-
-typedef ACE_Pair<id, value> id_expanded_value;
-typedef ACE_Reference_Pair<const id, value> id_value_type;
-typedef ACE_Reference_Pair<const servant, value> servant_value_type;
-typedef ACE_Equal_To<id> id_compare_keys;
-typedef ACE_Equal_To<servant> servant_compare_keys;
-typedef TAO_ObjectId_Hash id_hash;
-typedef TAO_Servant_Hash servant_hash;
-typedef ACE_Noop_Key_Generator<servant> noop_servant_key_generator;
-
-template class ACE_Noop_Key_Generator<servant>;
-
-// Common
-template class ACE_Reference_Pair<const id, value>;
-template class ACE_Reference_Pair<const servant, value>;
-
-// Map and iterator classes.
-template class ACE_Map<id, value>;
-template class ACE_Map<servant, value>;
-template class ACE_Iterator<id_value_type>;
-template class ACE_Iterator<servant_value_type>;
-template class ACE_Reverse_Iterator<id_value_type>;
-template class ACE_Reverse_Iterator<servant_value_type>;
-
-// Iterator base classes.
-template class ACE_Iterator_Impl<id_value_type>;
-template class ACE_Iterator_Impl<servant_value_type>;
-template class ACE_Reverse_Iterator_Impl<id_value_type>;
-template class ACE_Reverse_Iterator_Impl<servant_value_type>;
-
-// Active Map Manager related.
-template class ACE_Pair<id, value>;
-template class ACE_Active_Map_Manager_Adapter<id, value, TAO_Ignore_Original_Key_Adapter>;
-template class ACE_Active_Map_Manager_Adapter<id, value, TAO_Preserve_Original_Key_Adapter>;
-template class ACE_Active_Map_Manager_Iterator_Adapter<id_value_type, id_expanded_value>;
-template class ACE_Active_Map_Manager_Reverse_Iterator_Adapter<id_value_type, id_expanded_value>;
-template class ACE_Active_Map_Manager<id_expanded_value>;
-template class ACE_Map_Manager<ACE_Active_Map_Manager_Key, id_expanded_value, ACE_Null_Mutex>;
-template class ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, id_expanded_value, ACE_Null_Mutex>;
-template class ACE_Map_Iterator<ACE_Active_Map_Manager_Key, id_expanded_value, ACE_Null_Mutex>;
-template class ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, id_expanded_value, ACE_Null_Mutex>;
-template class ACE_Map_Entry<ACE_Active_Map_Manager_Key, id_expanded_value>;
-
-// Hash Map Manager related.
-template class ACE_Hash_Map_Manager_Ex_Adapter<id, value, id_hash, id_compare_keys, TAO_Incremental_Key_Generator>;
-template class ACE_Hash_Map_Manager_Ex_Adapter<servant, value, servant_hash, servant_compare_keys, noop_servant_key_generator>;
-template class ACE_Hash_Map_Manager_Ex_Iterator_Adapter<id_value_type, id, value, id_hash, id_compare_keys>;
-template class ACE_Hash_Map_Manager_Ex_Iterator_Adapter<servant_value_type, servant, value, servant_hash, servant_compare_keys>;
-template class ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<id_value_type, id, value, id_hash, id_compare_keys>;
-template class ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<servant_value_type, servant, value, servant_hash, servant_compare_keys>;
-template class ACE_Hash_Map_Manager_Ex<id, value, id_hash, id_compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<servant, value, servant_hash, servant_compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<id, value, id_hash, id_compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<servant, value, servant_hash, servant_compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<id, value, id_hash, id_compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<servant, value, servant_hash, servant_compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<id, value, id_hash, id_compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<servant, value, servant_hash, servant_compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<id, value>;
-template class ACE_Hash_Map_Entry<servant, value>;
-template class ACE_Equal_To<id>;
-template class ACE_Equal_To<servant>;
-
-// Map Manager related.
-template class ACE_Map_Manager_Iterator_Adapter<id_value_type, id, value>;
-template class ACE_Map_Manager_Iterator_Adapter<servant_value_type, servant, value>;
-template class ACE_Map_Manager_Reverse_Iterator_Adapter<id_value_type, id, value>;
-template class ACE_Map_Manager_Reverse_Iterator_Adapter<servant_value_type, servant, value>;
-template class ACE_Map_Manager_Adapter<id, value, TAO_Incremental_Key_Generator>;
-template class ACE_Map_Manager_Adapter<servant, value, noop_servant_key_generator>;
-template class ACE_Map_Manager<id, value, ACE_Null_Mutex>;
-template class ACE_Map_Manager<servant, value, ACE_Null_Mutex>;
-template class ACE_Map_Iterator_Base<id, value, ACE_Null_Mutex>;
-template class ACE_Map_Iterator_Base<servant, value, ACE_Null_Mutex>;
-template class ACE_Map_Iterator<id, value, ACE_Null_Mutex>;
-template class ACE_Map_Iterator<servant, value, ACE_Null_Mutex>;
-template class ACE_Map_Reverse_Iterator<id, value, ACE_Null_Mutex>;
-template class ACE_Map_Reverse_Iterator<servant, value, ACE_Null_Mutex>;
-template class ACE_Map_Entry<id, value>;
-template class ACE_Map_Entry<servant, value>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate auto_ptr<TAO_Id_Uniqueness_Strategy>
-#pragma instantiate auto_ptr<TAO_Lifespan_Strategy>
-#pragma instantiate auto_ptr<TAO_Id_Assignment_Strategy>
-#pragma instantiate auto_ptr<TAO_Id_Hint_Strategy>
-#pragma instantiate auto_ptr<TAO_Active_Object_Map::servant_map>
-#pragma instantiate auto_ptr<TAO_Active_Object_Map::user_id_map>
-
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Id_Uniqueness_Strategy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Lifespan_Strategy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Id_Assignment_Strategy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Id_Hint_Strategy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map::servant_map>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map::user_id_map>
-
-// Common typedefs.
-typedef PortableServer::ObjectId id;
-typedef PortableServer::Servant servant;
-typedef TAO_Active_Object_Map::Map_Entry * value;
-
-typedef ACE_Pair<id, value> id_expanded_value;
-typedef ACE_Reference_Pair<const id, value> id_value_type;
-typedef ACE_Reference_Pair<const servant, value> servant_value_type;
-typedef ACE_Equal_To<id> id_compare_keys;
-typedef ACE_Equal_To<servant> servant_compare_keys;
-typedef TAO_ObjectId_Hash id_hash;
-typedef TAO_Servant_Hash servant_hash;
-typedef ACE_Noop_Key_Generator<servant> noop_servant_key_generator;
-
-#pragma instantiate ACE_Noop_Key_Generator<servant>
-
-// Common
-#pragma instantiate ACE_Reference_Pair<const id, value>
-#pragma instantiate ACE_Reference_Pair<const servant, value>
-
-// Map and iterator classes.
-#pragma instantiate ACE_Map<id, value>
-#pragma instantiate ACE_Map<servant, value>
-#pragma instantiate ACE_Iterator<id_value_type>
-#pragma instantiate ACE_Iterator<servant_value_type>
-#pragma instantiate ACE_Reverse_Iterator<id_value_type>
-#pragma instantiate ACE_Reverse_Iterator<servant_value_type>
-
-// Iterator base classes.
-#pragma instantiate ACE_Iterator_Impl<id_value_type>
-#pragma instantiate ACE_Iterator_Impl<servant_value_type>
-#pragma instantiate ACE_Reverse_Iterator_Impl<id_value_type>
-#pragma instantiate ACE_Reverse_Iterator_Impl<servant_value_type>
-
-// Active Map Manager related.
-#pragma instantiate ACE_Pair<id, value>
-#pragma instantiate ACE_Active_Map_Manager_Adapter<id, value, TAO_Ignore_Original_Key_Adapter>
-#pragma instantiate ACE_Active_Map_Manager_Adapter<id, value, TAO_Preserve_Original_Key_Adapter>
-#pragma instantiate ACE_Active_Map_Manager_Iterator_Adapter<id_value_type, id_expanded_value>
-#pragma instantiate ACE_Active_Map_Manager_Reverse_Iterator_Adapter<id_value_type, id_expanded_value>
-#pragma instantiate ACE_Active_Map_Manager<id_expanded_value>
-#pragma instantiate ACE_Map_Manager<ACE_Active_Map_Manager_Key, id_expanded_value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, id_expanded_value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator<ACE_Active_Map_Manager_Key, id_expanded_value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, id_expanded_value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Entry<ACE_Active_Map_Manager_Key, id_expanded_value>
-
-// Hash Map Manager related.
-#pragma instantiate ACE_Hash_Map_Manager_Ex_Adapter<id, value, id_hash, id_compare_keys, TAO_Incremental_Key_Generator>
-#pragma instantiate ACE_Hash_Map_Manager_Ex_Adapter<servant, value, servant_hash, servant_compare_keys, noop_servant_key_generator>
-#pragma instantiate ACE_Hash_Map_Manager_Ex_Iterator_Adapter<id_value_type, id, value, id_hash, id_compare_keys>
-#pragma instantiate ACE_Hash_Map_Manager_Ex_Iterator_Adapter<servant_value_type, servant, value, servant_hash, servant_compare_keys>
-#pragma instantiate ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<id_value_type, id, value, id_hash, id_compare_keys>
-#pragma instantiate ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<servant_value_type, servant, value, servant_hash, servant_compare_keys>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<id, value, id_hash, id_compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<servant, value, servant_hash, servant_compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<id, value, id_hash, id_compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<servant, value, servant_hash, servant_compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<id, value, id_hash, id_compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<servant, value, servant_hash, servant_compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<id, value, id_hash, id_compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<servant, value, servant_hash, servant_compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<id, value>
-#pragma instantiate ACE_Hash_Map_Entry<servant, value>
-#pragma instantiate ACE_Equal_To<id>
-#pragma instantiate ACE_Equal_To<servant>
-
-// Map Manager related.
-#pragma instantiate ACE_Map_Manager_Iterator_Adapter<id_value_type, id, value>
-#pragma instantiate ACE_Map_Manager_Iterator_Adapter<servant_value_type, servant, value>
-#pragma instantiate ACE_Map_Manager_Reverse_Iterator_Adapter<id_value_type, id, value>
-#pragma instantiate ACE_Map_Manager_Reverse_Iterator_Adapter<servant_value_type, servant, value>
-#pragma instantiate ACE_Map_Manager_Adapter<id, value, TAO_Incremental_Key_Generator>
-#pragma instantiate ACE_Map_Manager_Adapter<servant, value, noop_servant_key_generator>
-#pragma instantiate ACE_Map_Manager<id, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Manager<servant, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator_Base<id, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator_Base<servant, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator<id, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator<servant, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<id, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<servant, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Entry<id, value>
-#pragma instantiate ACE_Map_Entry<servant, value>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Active_Object_Map.h b/TAO/tao/Active_Object_Map.h
deleted file mode 100644
index b33613a59ce..00000000000
--- a/TAO/tao/Active_Object_Map.h
+++ /dev/null
@@ -1,589 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Active_Object_Map.h
-//
-// = AUTHOR
-//    Irfan Pyarali
-//
-// ============================================================================
-
-#ifndef TAO_ACTIVE_OBJECT_MAP_H
-#define TAO_ACTIVE_OBJECT_MAP_H
-
-#include "tao/Key_Adapters.h"
-#include "tao/Server_Strategy_Factory.h"
-#include "tao/Servant_Base.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// Forward declarations.
-class TAO_Id_Uniqueness_Strategy;
-class TAO_Lifespan_Strategy;
-class TAO_Id_Assignment_Strategy;
-class TAO_Id_Hint_Strategy;
-
-class TAO_Active_Object_Map
-{
-  // = TITLE
-  //     Map of object ids to servants.
-  //
-  // = DESCRIPTION
-  //     Implementation to be used by the POA.
-public:
-
-  struct Map_Entry
-  {
-    // = TITLE
-    //     Value field of the active object map.
-    //
-    // = DESCRIPTION
-    //     We need a mapping from and to all of the following fields:
-    //     <user_id>, <system_id>, and <servant>.  Therefore, we keep
-    //     all the fields together in the map.
-
-    Map_Entry (void);
-    // Default constructor.
-
-    PortableServer::ObjectId user_id_;
-    // User id.
-
-    PortableServer::ObjectId system_id_;
-    // System id.
-
-    PortableServer::Servant servant_;
-    // Servant.
-
-    CORBA::UShort reference_count_;
-    // Reference count on outstanding requests on this servant.
-
-    CORBA::Boolean deactivated_;
-    // Has this servant been deactivated already?
-  };
-
-  TAO_Active_Object_Map (int user_id_policy,
-                         int unique_id_policy,
-                         int persistent_id_policy,
-                         const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters,
-                         CORBA_Environment &ACE_TRY_ENV);
-  // Constructor.
-
-  ~TAO_Active_Object_Map (void);
-  // Destructor.
-
-  int is_servant_in_map (PortableServer::Servant servant,
-                         int &deactivated);
-  // Must be used with UNIQUE_ID policy.
-
-  int is_user_id_in_map (const PortableServer::ObjectId &user_id,
-                         int &deactivated);
-  // Can be used with any policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
-
-  int bind_using_system_id_returning_system_id (PortableServer::Servant servant,
-                                                PortableServer::ObjectId_out system_id);
-  // Must be used with SYSTEM_ID policy.
-
-  int bind_using_system_id_returning_user_id (PortableServer::Servant servant,
-                                              PortableServer::ObjectId_out user_id);
-  // Must be used with SYSTEM_ID policy.
-
-  int bind_using_user_id (PortableServer::Servant servant,
-                          const PortableServer::ObjectId &user_id);
-  // Can be used with any policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
-
-  int find_system_id_using_user_id (const PortableServer::ObjectId &user_id,
-                                    PortableServer::ObjectId_out system_id);
-  // Can be used with any policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
-
-  int rebind_using_user_id_and_system_id (PortableServer::Servant servant,
-                                          const PortableServer::ObjectId &user_id,
-                                          const PortableServer::ObjectId &system_id,
-                                          TAO_Active_Object_Map::Map_Entry *&entry);
-  // Can be used with any policy.
-
-  int unbind_using_user_id (const PortableServer::ObjectId &user_id);
-  // Can be used with any policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
-
-  int find_user_id_using_servant (PortableServer::Servant servant,
-                                  PortableServer::ObjectId_out user_id);
-  // Must be used with UNIQUE_ID policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
-
-  int find_system_id_using_servant (PortableServer::Servant servant,
-                                    PortableServer::ObjectId_out system_id);
-  // Must be used with UNIQUE_ID policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
-
-  int find_servant_using_user_id (const PortableServer::ObjectId &user_id,
-                                  PortableServer::Servant &servant);
-  // Can be used with any policy. With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
-
-  int find_servant_using_system_id_and_user_id (const PortableServer::ObjectId &system_id,
-                                                const PortableServer::ObjectId &user_id,
-                                                PortableServer::Servant &servant,
-                                                TAO_Active_Object_Map::Map_Entry *&entry);
-  // Can be used with any policy.
-
-  int find_servant_and_system_id_using_user_id (const PortableServer::ObjectId &user_id,
-                                                PortableServer::Servant &servant,
-                                                PortableServer::ObjectId_out system_id);
-  // Can be used with any policy.  With the SYSTEM_ID policy,
-  // <user_id> is identical to <system_id>.
-
-  int find_servant_and_system_id_using_user_id (const PortableServer::ObjectId &user_id,
-                                                TAO_Active_Object_Map::Map_Entry *&entry);
-  // Can be used with any policy.  With the SYSTEM_ID policy,
-  // <user_id> is identical to <system_id>.
-
-  int find_user_id_using_system_id (const PortableServer::ObjectId &system_id,
-                                    PortableServer::ObjectId_out user_id);
-  // Can be used with any policy.  When the SYSTEM_ID policy is used,
-  // the <system_id> is identical to <user_id>.
-
-  int find_user_id_using_system_id (const PortableServer::ObjectId &system_id,
-                                    PortableServer::ObjectId &user_id);
-  // Can be used with any policy.  When the SYSTEM_ID policy is used,
-  // the <system_id> is identical to <user_id>.
-
-  CORBA::Boolean remaining_activations (PortableServer::Servant servant);
-  // Are there any remaining activations of <servant> in the active
-  // object map?  Can be used with any policy.
-
-  size_t current_size (void);
-  // Size of the map.
-
-  static size_t system_id_size (void);
-  // Can be used with any policy.
-
-  static void set_system_id_size (const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters);
-  // Set the system id size.
-
-  typedef ACE_Map<
-  PortableServer::ObjectId,
-    Map_Entry *> user_id_map;
-  // Base class of the id map.
-
-  typedef ACE_Hash_Map_Manager_Ex_Adapter<
-  PortableServer::ObjectId,
-    Map_Entry *,
-    TAO_ObjectId_Hash,
-    ACE_Equal_To<PortableServer::ObjectId>,
-    TAO_Incremental_Key_Generator> user_id_hash_map;
-  // Id hash map.
-
-  typedef ACE_Map_Manager_Adapter<
-  PortableServer::ObjectId,
-    Map_Entry *,
-    TAO_Incremental_Key_Generator> user_id_linear_map;
-  // Id linear map.
-
-  typedef ACE_Active_Map_Manager_Adapter<
-  PortableServer::ObjectId,
-    Map_Entry *,
-    TAO_Ignore_Original_Key_Adapter> user_id_active_map;
-  // Id active map.
-
-  typedef ACE_Map<
-  PortableServer::Servant,
-    Map_Entry *> servant_map;
-  // Base class of the servant map.
-
-  typedef ACE_Hash_Map_Manager_Ex_Adapter<
-  PortableServer::Servant,
-    Map_Entry *,
-    TAO_Servant_Hash,
-    ACE_Equal_To<PortableServer::Servant>,
-    ACE_Noop_Key_Generator<PortableServer::Servant> > servant_hash_map;
-  // Servant hash map.
-
-  typedef ACE_Map_Manager_Adapter<
-  PortableServer::Servant,
-    Map_Entry *,
-    ACE_Noop_Key_Generator<PortableServer::Servant> > servant_linear_map;
-  // Servant linear map.
-
-  user_id_map *user_id_map_;
-  // Id map.
-
-  servant_map *servant_map_;
-  // Servant map.
-
-  TAO_Id_Uniqueness_Strategy *id_uniqueness_strategy_;
-  // Id uniqueness strategy.
-
-  TAO_Lifespan_Strategy *lifespan_strategy_;
-  // Lifespan strategy.
-
-  TAO_Id_Assignment_Strategy *id_assignment_strategy_;
-  // Id assignment strategy.
-
-  TAO_Id_Hint_Strategy *id_hint_strategy_;
-  // Id hint strategy.
-
-  static size_t system_id_size_;
-  // Size of the system id produced by the map.
-};
-
-class TAO_Id_Uniqueness_Strategy
-{
-  // = TITLE
-  //     Id uniqueness strategy.
-  //
-  // = DESCRIPTION
-  //     Strategy for implementing points of variation between the
-  //     UNIQUE_ID and the MULTIPLE_ID policies.
-public:
-  virtual ~TAO_Id_Uniqueness_Strategy (void);
-  // Virtual destructor.
-
-  virtual int is_servant_in_map (PortableServer::Servant servant,
-                                 int &deactivated) = 0;
-  // Must be used with UNIQUE_ID policy.
-
-  virtual int unbind_using_user_id (const PortableServer::ObjectId &user_id) = 0;
-  // Can be used with any policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
-
-  virtual int find_user_id_using_servant (PortableServer::Servant servant,
-                                          PortableServer::ObjectId_out user_id) = 0;
-  // Must be used with UNIQUE_ID policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
-
-  virtual int find_system_id_using_servant (PortableServer::Servant servant,
-                                            PortableServer::ObjectId_out system_id) = 0;
-  // Must be used with UNIQUE_ID policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
-
-  virtual int bind_using_user_id (PortableServer::Servant servant,
-                                  const PortableServer::ObjectId &user_id,
-                                  TAO_Active_Object_Map::Map_Entry *&entry) = 0;
-  // Can be used with any policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
-
-  virtual CORBA::Boolean remaining_activations (PortableServer::Servant servant) = 0;
-  // Are there any remaining activations of <servant> in the active
-  // object map?  Can be used with any policy.
-
-  void set_active_object_map (TAO_Active_Object_Map *active_object_map);
-  // Set the active map.
-
-protected:
-
-  TAO_Active_Object_Map *active_object_map_;
-  // Pointer to the active map.
-};
-
-class TAO_Unique_Id_Strategy : public TAO_Id_Uniqueness_Strategy
-{
-  // = TITLE
-  //     Unique id strategy.
-  //
-  // = DESCRIPTION
-  //     Strategy for the UNIQUE_ID policy.
-public:
-
-  virtual int is_servant_in_map (PortableServer::Servant servant,
-                                 int &deactivated);
-  // Must be used with UNIQUE_ID policy.
-
-  virtual int unbind_using_user_id (const PortableServer::ObjectId &user_id);
-  // Can be used with any policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
-
-  virtual int find_user_id_using_servant (PortableServer::Servant servant,
-                                          PortableServer::ObjectId_out user_id);
-  // Must be used with UNIQUE_ID policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
-
-  virtual int find_system_id_using_servant (PortableServer::Servant servant,
-                                            PortableServer::ObjectId_out system_id);
-  // Must be used with UNIQUE_ID policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
-
-  virtual int bind_using_user_id (PortableServer::Servant servant,
-                                  const PortableServer::ObjectId &user_id,
-                                  TAO_Active_Object_Map::Map_Entry *&entry);
-  // Can be used with any policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
-
-  virtual CORBA::Boolean remaining_activations (PortableServer::Servant servant);
-  // Are there any remaining activations of <servant> in the active
-  // object map?  Can be used with any policy.
-};
-
-class TAO_Multiple_Id_Strategy : public TAO_Id_Uniqueness_Strategy
-{
-  // = TITLE
-  //     Multiple id strategy.
-  //
-  // = DESCRIPTION
-  //     Strategy for the MULTIPLE_ID policy.
-public:
-
-  virtual int is_servant_in_map (PortableServer::Servant servant,
-                                 int &deactivated);
-  // Must be used with UNIQUE_ID policy.
-
-  virtual int unbind_using_user_id (const PortableServer::ObjectId &user_id);
-  // Can be used with any policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
-
-  virtual int find_user_id_using_servant (PortableServer::Servant servant,
-                                          PortableServer::ObjectId_out user_id);
-  // Must be used with UNIQUE_ID policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
-
-  virtual int find_system_id_using_servant (PortableServer::Servant servant,
-                                            PortableServer::ObjectId_out system_id);
-  // Must be used with UNIQUE_ID policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
-
-  virtual int bind_using_user_id (PortableServer::Servant servant,
-                                  const PortableServer::ObjectId &user_id,
-                                  TAO_Active_Object_Map::Map_Entry *&entry);
-  // Can be used with any policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
-
-  virtual CORBA::Boolean remaining_activations (PortableServer::Servant servant);
-  // Are there any remaining activations of <servant> in the active
-  // object map?  Can be used with any policy.
-};
-
-class TAO_Lifespan_Strategy
-{
-  // = TITLE
-  //     Lifespan strategy.
-  //
-  // = DESCRIPTION
-  //     Strategy for implementing points of variation between the
-  //     TRANSIENT and the PERSISTENT policies.
-public:
-
-  virtual ~TAO_Lifespan_Strategy (void);
-  // Virtual destructor.
-
-  virtual int find_servant_using_system_id_and_user_id (const PortableServer::ObjectId &system_id,
-                                                        const PortableServer::ObjectId &user_id,
-                                                        PortableServer::Servant &servant,
-                                                        TAO_Active_Object_Map::Map_Entry *&entry) = 0;
-  // Can be used with any policy.
-
-  void set_active_object_map (TAO_Active_Object_Map *active_object_map);
-  // Set the active map.
-
-protected:
-
-  TAO_Active_Object_Map *active_object_map_;
-  // Pointer to the active map.
-};
-
-class TAO_Transient_Strategy : public TAO_Lifespan_Strategy
-{
-  // = TITLE
-  //     Transient strategy.
-  //
-  // = DESCRIPTION
-  //     Strategy for the TRANSIENT policy.
-public:
-  virtual int find_servant_using_system_id_and_user_id (const PortableServer::ObjectId &system_id,
-                                                        const PortableServer::ObjectId &user_id,
-                                                        PortableServer::Servant &servant,
-                                                        TAO_Active_Object_Map::Map_Entry *&entry);
-  // Can be used with any policy.
-};
-
-class TAO_Persistent_Strategy : public TAO_Lifespan_Strategy
-{
-  // = TITLE
-  //     Persistent strategy.
-  //
-  // = DESCRIPTION
-  //     Strategy for the PERSISTENT policy.
-public:
-  virtual int find_servant_using_system_id_and_user_id (const PortableServer::ObjectId &system_id,
-                                                        const PortableServer::ObjectId &user_id,
-                                                        PortableServer::Servant &servant,
-                                                        TAO_Active_Object_Map::Map_Entry *&entry);
-  // Can be used with any policy.
-
-};
-
-class TAO_Id_Assignment_Strategy
-{
-  // = TITLE
-  //     Id uniqueness strategy.
-  //
-  // = DESCRIPTION
-  //     Strategy for implementing points of variation between the
-  //     USER_ID and the SYSTEM_ID policies.
-public:
-  virtual ~TAO_Id_Assignment_Strategy (void);
-  // Virtual destructor.
-
-  virtual int bind_using_system_id (PortableServer::Servant servant,
-                                    TAO_Active_Object_Map::Map_Entry *&entry) = 0;
-  // Must be used with SYSTEM_ID policy.
-
-  void set_active_object_map (TAO_Active_Object_Map *active_object_map);
-  // Set the active map.
-
-protected:
-
-  TAO_Active_Object_Map *active_object_map_;
-  // Pointer to the active map.
-};
-
-class TAO_User_Id_Strategy : public TAO_Id_Assignment_Strategy
-{
-  // = TITLE
-  //     User id strategy.
-  //
-  // = DESCRIPTION
-  //     Strategy for the USER_ID policy.
-public:
-  virtual int bind_using_system_id (PortableServer::Servant servant,
-                                    TAO_Active_Object_Map::Map_Entry *&entry);
-  // Must be used with SYSTEM_ID policy.
-};
-
-class TAO_System_Id_With_Unique_Id_Strategy : public TAO_Id_Assignment_Strategy
-{
-  // = TITLE
-  //     System id strategy.
-  //
-  // = DESCRIPTION
-  //     Strategy for the SYSTEM_ID policy (with UNIQUE_ID policy).
-public:
-  virtual int bind_using_system_id (PortableServer::Servant servant,
-                                    TAO_Active_Object_Map::Map_Entry *&entry);
-  // Must be used with SYSTEM_ID policy.
-};
-
-class TAO_System_Id_With_Multiple_Id_Strategy : public TAO_Id_Assignment_Strategy
-{
-  // = TITLE
-  //     System id strategy.
-  //
-  // = DESCRIPTION
-  //     Strategy for the SYSTEM_ID policy (with MULTIPLE_ID policy).
-public:
-  virtual int bind_using_system_id (PortableServer::Servant servant,
-                                    TAO_Active_Object_Map::Map_Entry *&entry);
-  // Must be used with SYSTEM_ID policy.
-};
-
-class TAO_Id_Hint_Strategy
-{
-  // = TITLE
-  //     Id uniqueness strategy.
-  //
-  // = DESCRIPTION
-  //     Strategy for implementing points of variation between the
-  //     active hint and the no hint policies.
-public:
-  virtual ~TAO_Id_Hint_Strategy (void);
-  // Virtual destructor.
-
-  virtual int recover_key (const PortableServer::ObjectId &system_id,
-                           PortableServer::ObjectId &user_id) = 0;
-  // Find the user id from the system id.
-
-  virtual int bind (TAO_Active_Object_Map::Map_Entry &entry) = 0;
-  // Add to map.
-
-  virtual int unbind (TAO_Active_Object_Map::Map_Entry &entry) = 0;
-  // Remove from map.
-
-  virtual int find (const PortableServer::ObjectId &system_id,
-                    TAO_Active_Object_Map::Map_Entry *&entry) = 0;
-  // Find system id.
-
-  virtual size_t hint_size (void) = 0;
-  // How big is the hint generated by this strategy?
-
-  virtual int system_id (PortableServer::ObjectId_out system_id,
-                         TAO_Active_Object_Map::Map_Entry &entry) = 0;
-  // Get the system id associated with this entry.
-};
-
-class TAO_Active_Hint_Strategy : public TAO_Id_Hint_Strategy
-{
-  // = TITLE
-  //     Active hint strategy.
-  //
-  // = DESCRIPTION
-  //     Strategy for adding active hints to ids.
-public:
-  TAO_Active_Hint_Strategy (CORBA::ULong map_size);
-
-  virtual ~TAO_Active_Hint_Strategy (void);
-  // Virtual destructor.
-
-  virtual int recover_key (const PortableServer::ObjectId &system_id,
-                           PortableServer::ObjectId &user_id);
-
-  virtual int bind (TAO_Active_Object_Map::Map_Entry &entry);
-
-  virtual int unbind (TAO_Active_Object_Map::Map_Entry &entry);
-
-  virtual int find (const PortableServer::ObjectId &system_id,
-                    TAO_Active_Object_Map::Map_Entry *&entry);
-
-  virtual size_t hint_size (void);
-
-  virtual int system_id (PortableServer::ObjectId_out system_id,
-                         TAO_Active_Object_Map::Map_Entry &entry);
-
-  typedef ACE_Active_Map_Manager_Adapter<
-  PortableServer::ObjectId,
-    TAO_Active_Object_Map::Map_Entry *,
-    TAO_Preserve_Original_Key_Adapter> system_id_map;
-
-  system_id_map system_id_map_;
-};
-
-class TAO_No_Hint_Strategy : public TAO_Id_Hint_Strategy
-{
-  // = TITLE
-  //     No hint strategy.
-  //
-  // = DESCRIPTION
-  //     Strategy for not adding active hints to ids.
-public:
-  virtual ~TAO_No_Hint_Strategy (void);
-  // Virtual destructor.
-
-  virtual int recover_key (const PortableServer::ObjectId &system_id,
-                           PortableServer::ObjectId &user_id);
-
-  virtual int bind (TAO_Active_Object_Map::Map_Entry &entry);
-
-  virtual int unbind (TAO_Active_Object_Map::Map_Entry &entry);
-
-  virtual int find (const PortableServer::ObjectId &system_id,
-                    TAO_Active_Object_Map::Map_Entry *&entry);
-
-  virtual size_t hint_size (void);
-
-  virtual int system_id (PortableServer::ObjectId_out system_id,
-                         TAO_Active_Object_Map::Map_Entry &entry);
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Active_Object_Map.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_ACTIVE_OBJECT_MAP_H */
diff --git a/TAO/tao/Active_Object_Map.i b/TAO/tao/Active_Object_Map.i
deleted file mode 100644
index bd51f904236..00000000000
--- a/TAO/tao/Active_Object_Map.i
+++ /dev/null
@@ -1,205 +0,0 @@
-// $Id$
-
-ACE_INLINE int
-TAO_Active_Object_Map::is_servant_in_map (PortableServer::Servant servant,
-                                          int &deactivated)
-{
-  return this->id_uniqueness_strategy_->is_servant_in_map (servant,
-                                                           deactivated);
-}
-
-ACE_INLINE int
-TAO_Active_Object_Map::bind_using_system_id_returning_system_id (PortableServer::Servant servant,
-                                                                 PortableServer::ObjectId_out system_id)
-{
-  Map_Entry *entry = 0;
-
-  int result = this->id_assignment_strategy_->bind_using_system_id (servant,
-                                                                    entry);
-
-  if (result == 0)
-    result = this->id_hint_strategy_->system_id (system_id,
-                                                 *entry);
-  return result;
-}
-
-ACE_INLINE int
-TAO_Active_Object_Map::bind_using_system_id_returning_user_id (PortableServer::Servant servant,
-                                                               PortableServer::ObjectId_out user_id)
-{
-  Map_Entry *entry = 0;
-
-  int result = this->id_assignment_strategy_->bind_using_system_id (servant,
-                                                                    entry);
-  if (result == 0)
-    ACE_NEW_RETURN (user_id,
-                    PortableServer::ObjectId (entry->user_id_),
-                    -1);
-  return result;
-}
-
-ACE_INLINE int
-TAO_Active_Object_Map::bind_using_user_id (PortableServer::Servant servant,
-                                           const PortableServer::ObjectId &user_id)
-{
-  Map_Entry *entry = 0;
-  return this->id_uniqueness_strategy_->bind_using_user_id (servant,
-                                                            user_id,
-                                                            entry);
-}
-
-ACE_INLINE int
-TAO_Active_Object_Map::find_system_id_using_user_id (const PortableServer::ObjectId &user_id,
-                                                     PortableServer::ObjectId_out system_id)
-{
-  Map_Entry *entry = 0;
-  int result = this->id_uniqueness_strategy_->bind_using_user_id (0,
-                                                                  user_id,
-                                                                  entry);
-  if (result == 0)
-    result = this->id_hint_strategy_->system_id (system_id,
-                                                 *entry);
-  return result;
-}
-
-ACE_INLINE int
-TAO_Active_Object_Map::rebind_using_user_id_and_system_id (PortableServer::Servant servant,
-                                                           const PortableServer::ObjectId &user_id,
-                                                           const PortableServer::ObjectId &system_id,
-                                                           TAO_Active_Object_Map::Map_Entry *&entry)
-{
-  ACE_UNUSED_ARG (system_id);
-
-  return this->id_uniqueness_strategy_->bind_using_user_id (servant,
-                                                            user_id,
-                                                            entry);
-}
-
-ACE_INLINE int
-TAO_Active_Object_Map::unbind_using_user_id (const PortableServer::ObjectId &user_id)
-{
-  return this->id_uniqueness_strategy_->unbind_using_user_id (user_id);
-}
-
-ACE_INLINE int
-TAO_Active_Object_Map::find_user_id_using_servant (PortableServer::Servant servant,
-                                                   PortableServer::ObjectId_out user_id)
-{
-  return this->id_uniqueness_strategy_->find_user_id_using_servant (servant,
-                                                                    user_id);
-}
-
-ACE_INLINE int
-TAO_Active_Object_Map::find_system_id_using_servant (PortableServer::Servant servant,
-                                                     PortableServer::ObjectId_out system_id)
-{
-  return this->id_uniqueness_strategy_->find_system_id_using_servant (servant,
-                                                                      system_id);
-}
-
-ACE_INLINE int
-TAO_Active_Object_Map::find_servant_using_user_id (const PortableServer::ObjectId &user_id,
-                                                   PortableServer::Servant &servant)
-{
-  Map_Entry *entry = 0;
-  int result = this->user_id_map_->find (user_id,
-                                         entry);
-  if (result == 0)
-    {
-      if (entry->deactivated_)
-        result = -1;
-      else if (entry->servant_ == 0)
-        result = -1;
-      else
-        servant = entry->servant_;
-    }
-
-  return result;
-}
-
-ACE_INLINE int
-TAO_Active_Object_Map::find_servant_using_system_id_and_user_id (const PortableServer::ObjectId &system_id,
-                                                                 const PortableServer::ObjectId &user_id,
-                                                                 PortableServer::Servant &servant,
-                                                                 TAO_Active_Object_Map::Map_Entry *&entry)
-{
-  return this->lifespan_strategy_->find_servant_using_system_id_and_user_id (system_id,
-                                                                             user_id,
-                                                                             servant,
-                                                                             entry);
-}
-
-ACE_INLINE int
-TAO_Active_Object_Map::find_servant_and_system_id_using_user_id (const PortableServer::ObjectId &user_id,
-                                                                 PortableServer::Servant &servant,
-                                                                 PortableServer::ObjectId_out system_id)
-{
-  Map_Entry *entry = 0;
-  int result = this->user_id_map_->find (user_id,
-                                         entry);
-
-  if (result == 0)
-    {
-      if (entry->deactivated_)
-        result = -1;
-      else if (entry->servant_ == 0)
-        result = -1;
-      else
-        {
-          servant = entry->servant_;
-          result = this->id_hint_strategy_->system_id (system_id,
-                                                       *entry);
-        }
-    }
-
-  return result;
-}
-
-ACE_INLINE int
-TAO_Active_Object_Map::find_servant_and_system_id_using_user_id (const PortableServer::ObjectId &user_id,
-                                                                 TAO_Active_Object_Map::Map_Entry *&entry)
-{
-  return this->user_id_map_->find (user_id,
-                                   entry);
-}
-
-ACE_INLINE int
-TAO_Active_Object_Map::find_user_id_using_system_id (const PortableServer::ObjectId &system_id,
-                                                     PortableServer::ObjectId_out user_id)
-{
-  PortableServer::ObjectId id;
-  int result = this->id_hint_strategy_->recover_key (system_id,
-                                                     id);
-  if (result == 0)
-    ACE_NEW_RETURN (user_id,
-                    PortableServer::ObjectId (id),
-                    -1);
-  return 0;
-}
-
-ACE_INLINE int
-TAO_Active_Object_Map::find_user_id_using_system_id (const PortableServer::ObjectId &system_id,
-                                                     PortableServer::ObjectId &user_id)
-{
-  return this->id_hint_strategy_->recover_key (system_id,
-                                               user_id);
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_Active_Object_Map::remaining_activations (PortableServer::Servant servant)
-{
-  return this->id_uniqueness_strategy_->remaining_activations (servant);
-}
-
-ACE_INLINE size_t
-TAO_Active_Object_Map::current_size (void)
-{
-  return this->user_id_map_->current_size ();
-}
-
-/* static */
-ACE_INLINE size_t
-TAO_Active_Object_Map::system_id_size (void)
-{
-  return TAO_Active_Object_Map::system_id_size_;
-}
diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp
deleted file mode 100644
index 07f9bd16a39..00000000000
--- a/TAO/tao/Any.cpp
+++ /dev/null
@@ -1,1464 +0,0 @@
-// @ (#) $Id$
-
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// ORB:         Implementation of CORBA_Any
-//
-// This includes three constructors, a destructor, and a "replace"
-// method for the "Any" data type.  "Any" values pair a pointer to a
-// data structure in the native binary representation (e.g. C struct)
-// with a TypeCode that describes that data structure.
-//
-// The copy constructor and the destructor each use the TypeCode
-// interpreter with specialized "visit" callback routines.  The
-// "visit" routines are used respectively to make "deep copies" and
-// perform "deep frees" of the aritrary values as described by the
-// "Any" value's typecode.
-//
-// Note that these "visit" routines are called directly, and they
-// choose whether or not to use the TypeCode interpreter to examine
-// constituents.  In the simple cases, the "visit" routines can do
-// their work without any further calls; only for constructed types is
-// the interpreter's knowledge really required.
-//
-// THREADING NOTE: "Any" is a data structure which must be protected
-// by external critical sections.  Like simpler numeric types, "Any"
-// instances are accessed and modified atomically.  This
-// implementation is reentrant, so that independent "Any" values may
-// be manipulated concurrently when the underlying programming
-// environment is itself reentrant.
-//
-
-#include "tao/Any.h"
-#include "tao/Typecode.h"
-#include "tao/Marshal.h"
-#include "tao/ORB_Core.h"
-#include "tao/Object.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Any.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, Any, "$Id$")
-
-CORBA::TypeCode_ptr
-CORBA_Any::type (void) const
-{
-  return CORBA::TypeCode::_duplicate (this->type_);
-}
-
-// Will replace if the typecode arg is an alias for the existing one -
-// otherwise raises an exception.
-
-void
-CORBA_Any::type (CORBA::TypeCode_ptr tc,
-                 CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Boolean equiv = this->type_->equivalent (tc,
-                                                  ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (equiv)
-    {
-      CORBA::release (this->type_);
-      this->type_ = CORBA::TypeCode::_duplicate (tc);
-    }
-  else
-    {
-      ACE_THROW (CORBA::BAD_TYPECODE ());
-    }
-}
-
-// TAO doesn't give any guarantees if the value returned by value can
-// be cast to the desired type. This is a deprecated routine and its
-// use must be avoided. Use the >>= operators.
-
-const void *
-CORBA_Any::value (void) const
-{
-  return this->value_;
-}
-
-// Default "Any" constructor -- initializes to nulls per the
-// OMG C++ mapping.
-
-// NOTE: null (zero) typecode pointers are also treated as the null
-// typecode ...
-
-CORBA_Any::CORBA_Any (void)
-  : type_ (CORBA::TypeCode::_duplicate (CORBA::_tc_null)),
-    value_ (0),
-    cdr_ (0),
-    any_owns_data_ (0)
-{
-}
-
-// The more common "Any" constructor has its own copy of a typecode,
-// and either holds or "consumes" an arbitrary data value satisfying
-// the normal binary interface rules.
-
-CORBA_Any::CORBA_Any (CORBA::TypeCode_ptr tc,
-                      void *value,
-                      CORBA::Boolean any_owns_data)
-  : type_ (CORBA::TypeCode::_duplicate (tc)),
-    value_ (value),
-    cdr_ (0),
-    any_owns_data_ (any_owns_data)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      if (this->value_ != 0)
-        {
-          TAO_OutputCDR stream;
-
-          // Encode the value.
-          stream.encode (this->type_,
-                         this->value_,
-                         0,
-                         ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          // Retrieve the start of the message block chain and save it.
-          this->cdr_ = stream.begin ()->clone ();
-        }
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-// Constructor using a message block.
-CORBA_Any::CORBA_Any (CORBA::TypeCode_ptr type,
-                      CORBA::UShort,
-                      const ACE_Message_Block* mb)
-  : type_ (CORBA::TypeCode::_duplicate (type)),
-    value_ (0),
-    cdr_ (ACE_Message_Block::duplicate (mb)),
-    any_owns_data_ (0)
-{
-}
-
-// Copy constructor for "Any".
-CORBA_Any::CORBA_Any (const CORBA_Any &src)
-  : value_ (0),
-    cdr_ (0),
-    any_owns_data_ (0)
-{
-  if (src.type_ != 0)
-    this->type_ =
-      CORBA::TypeCode::_duplicate (src.type_);
-  else
-    this->type_ =
-      CORBA::TypeCode::_duplicate (CORBA::_tc_null);
-
-  // CDR stream always contains encoded object, if any holds anything
-  // at all.
-  this->cdr_ = ACE_Message_Block::duplicate (src.cdr_);
-
-  // No need to copy src's value_.  We can always get that from cdr.
-}
-
-// assignment operator
-
-CORBA_Any &
-CORBA_Any::operator= (const CORBA_Any &src)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      // check if it is a self assignment
-      if (this == &src)
-        {
-          return *this;
-        }
-
-      // Decrement the refcount on the Message_Block we hold, it does not
-      // matter if we own the data or not, because we always own the
-      // message block (i.e. it is always cloned or duplicated.
-      ACE_Message_Block::release ((ACE_Message_Block *) this->cdr_);
-      this->cdr_ = 0;
-
-      // If we own any previous data, deallocate it.
-      this->free_value (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (this->type_ != 0)
-        {
-          CORBA::release (this->type_);
-        }
-
-      // Now copy the contents of the source to ourselves.
-      if (src.type_ != 0)
-        {
-          this->type_ =
-            CORBA::TypeCode::_duplicate (src.type_);
-        }
-      else
-        {
-          this->type_ =
-            CORBA::TypeCode::_duplicate (CORBA::_tc_null);
-        }
-
-      this->any_owns_data_ = 0;
-
-      this->cdr_ = ACE_Message_Block::duplicate (src.cdr_);
-      // Simply duplicate the cdr string here.  We can save the decode
-      // operation if there's no need to extract the object.
-    }
-  ACE_CATCHANY
-    {
-      return *this;
-    }
-  ACE_ENDTRY;
-
-  return *this;
-}
-
-// Destructor for an "Any" deep-frees memory if needed.
-
-CORBA_Any::~CORBA_Any (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      // decrement the refcount on the Message_Block we hold, it does not
-      // matter if we own the data or not, because we always own the
-      // message block (i.e. it is always cloned or duplicated.
-
-      ACE_Message_Block::release (this->cdr_);
-      this->cdr_ = 0;
-
-      this->free_value (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (this->type_)
-        CORBA::release (this->type_);
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-// All-at-once replacement of the contents of an "Any."
-
-void
-CORBA_Any::replace (CORBA::TypeCode_ptr tc,
-                    const void *value,
-                    CORBA::Boolean any_owns_data,
-                    CORBA::Environment &ACE_TRY_ENV)
-{
-  // Decrement the refcount on the Message_Block we hold, it does not
-  // matter if we own the data or not, because we always own the
-  // message block (i.e. it is always cloned or duplicated).
-  ACE_Message_Block::release (this->cdr_);
-  this->cdr_ = 0;
-
-  this->free_value (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // Duplicate tc and then release this->type_, just in case tc and
-  // type_ are the same thing.
-  CORBA::TypeCode_ptr tmp =
-    CORBA::TypeCode::_duplicate (tc);
-  CORBA::release (this->type_);
-  this->type_ = tmp;
-
-  // @@ NW: I think an Any should alway owns the CDR stream, so I removed the
-  //     check here.
-  // if the Any owns the data, we encode the "value" into a CDR stream
-  // and store it. We also destroy the "value" since we own it.
-  TAO_OutputCDR stream;
-  stream.encode (tc,
-                 value,
-                 0,
-                 ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->value_ = ACE_const_cast (void *, value);
-  this->any_owns_data_ = any_owns_data;
-  this->cdr_ = 0;
-
-  // Retrieve the start of the message block chain and duplicate it.
-  this->cdr_ = ACE_Message_Block::duplicate (stream.begin ());
-}
-
-void
-CORBA_Any::_tao_replace (CORBA::TypeCode_ptr tc,
-                         const ACE_Message_Block *mb,
-                         CORBA::Environment &ACE_TRY_ENV)
-{
-  // Decrement the refcount on the Message_Block we hold, it does not
-  // matter if we own the data or not, because we always own the
-  // message block (i.e. it is always cloned or duplicated).
-  ACE_Message_Block::release (this->cdr_);
-  this->cdr_ = 0;
-
-  this->free_value (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // Duplicate tc and then release this->type_, just in case tc and
-  // type_ are the same thing.
-  CORBA::TypeCode_ptr tmp = CORBA::TypeCode::_duplicate (tc);
-  CORBA::release (this->type_);
-  this->type_ = tmp;
-
-  this->any_owns_data_ = 0;
-
-  this->cdr_ = ACE_Message_Block::duplicate (mb);
-  // We can save the decode operation if there's no need to extract
-  // the object.
- }
-
-void
-CORBA_Any::_tao_replace (CORBA::TypeCode_ptr tc,
-                         const ACE_Message_Block *mb,
-                         CORBA::Boolean any_owns_data,
-                         void* value,
-                         CORBA::Environment &ACE_TRY_ENV)
-{
-  // Decrement the refcount on the Message_Block we hold, it does not
-  // matter if we own the data or not, because we always own the
-  // message block (i.e. it is always cloned or duplicated).
-  ACE_Message_Block::release (this->cdr_);
-  this->cdr_ = 0;
-
-  this->free_value (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->value_ = value;
-
-  // Duplicate tc and then release this->type_, just in case tc and
-  // type_ are the same thing.
-  CORBA::TypeCode_ptr tmp = CORBA::TypeCode::_duplicate (tc);
-  CORBA::release (this->type_);
-  this->type_ = tmp;
-
-  this->any_owns_data_ = any_owns_data;
-
-  this->cdr_ = ACE_Message_Block::duplicate (mb);
-  // We can save the decode operation if there's no need to extract
-  // the object.
-}
-
-void
-CORBA_Any::_tao_replace (CORBA::TypeCode_ptr tc,
-                         CORBA::Boolean any_owns_data,
-                         void* value,
-                         CORBA::Environment &ACE_TRY_ENV)
-{
-  this->free_value (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->value_ = value;
-
-  // Duplicate tc and then release this->type_, just in case tc and
-  // type_ are the same thing.
-  CORBA::TypeCode_ptr tmp = CORBA::TypeCode::_duplicate (tc);
-  CORBA::release (this->type_);
-  this->type_ = tmp;
-
-  this->any_owns_data_ = any_owns_data;
-}
-
-// Free internal data.
-
-void
-CORBA_Any::free_value (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (this->any_owns_data_ && this->value_ != 0)
-    {
-      // This is not exception safe.
-      DEEP_FREE (this->type_, this->value_, 0, ACE_TRY_ENV);
-      ACE_CHECK;
-      ::operator delete (this->value_);
-    }
-  this->value_ = 0;
-}
-
-// Insertion of typecode.
-
-void
-CORBA_Any::operator<<= (CORBA::TypeCode_ptr tc)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::TypeCode_ptr *_tao_tc;
-
-      ACE_NEW (_tao_tc,
-               CORBA::TypeCode_ptr);
-
-      *_tao_tc = CORBA::TypeCode::_duplicate (tc);
-      this->replace (CORBA::_tc_TypeCode,
-                     _tao_tc,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing...
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-void
-CORBA_Any::operator<<= (const CORBA_Exception &exception)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      TAO_OutputCDR stream;
-      stream.encode (exception._type (),
-                     &exception, 0,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      this->_tao_replace (exception._type (),
-                          stream.begin (),
-                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing...
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-// Insertion of CORBA object - copying.
-
-void
-CORBA::Any::operator<<= (const CORBA::Object_ptr obj)
-{
-  CORBA::Object_ptr objptr =
-    CORBA::Object::_duplicate (obj);
-
-  (*this) <<= &objptr;
-}
-
-// Insertion of CORBA object - non-copying.
-
-void
-CORBA::Any::operator<<= (CORBA::Object_ptr *objptr)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Object_ptr *_tao_object_ptr;
-
-      ACE_NEW (_tao_object_ptr,
-               CORBA::Object_ptr);
-
-      *_tao_object_ptr = *objptr;
-      this->replace (CORBA::_tc_Object,
-                     _tao_object_ptr,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing...
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-// Insertion of from_string.
-
-void
-CORBA_Any::operator<<= (from_string s)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      // If the inserted string is bounded, we create a typecode.
-      static CORBA::Long _oc_string [] =
-      {
-        // CDR typecode octets
-        TAO_ENCAP_BYTE_ORDER,   // native endian + padding; "tricky"
-        0                       // ... unbounded string to start with
-      };
-
-      CORBA::TypeCode_ptr tc = 0;
-
-      if (s.bound_ > 0)
-        {
-          // Bounded string.
-          _oc_string [1] = s.bound_;
-          ACE_NEW (tc,
-                   CORBA::TypeCode (CORBA::tk_string,
-                                    sizeof _oc_string,
-                                    (char *) &_oc_string,
-                                    1,
-                                    sizeof (CORBA::String_var)));
-        }
-      else
-        {
-          tc = CORBA::_tc_string; // unbounded.
-        }
-
-      char **tmp;
-      // Non-copying.
-      if (s.nocopy_)
-        {
-          ACE_NEW(tmp,
-                  char* (s.val_));
-        }
-      // Copying.
-      else
-        {
-          ACE_NEW(tmp,
-                  char* (CORBA::string_dup (s.val_)));
-        }
-
-      this->replace (tc,
-                     tmp,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing...
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-// 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
-
-CORBA::Boolean
-CORBA_Any::operator>>= (CORBA::Short &s) const
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_short,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
-        {
-          if (this->any_owns_data_ && this->value_)
-            {
-              s = *(CORBA::Short *) this->value_;
-              return 1;
-            }
-          else
-            {
-              TAO_InputCDR stream (this->cdr_);
-              return stream.read_short (s);
-            }
-        }
-      else
-        {
-          return 0;
-        }
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-CORBA::Boolean
-CORBA_Any::operator>>= (CORBA::UShort &s) const
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_ushort,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
-        {
-          if (this->any_owns_data_ && this->value_)
-            {
-              s = *(CORBA::UShort *) this->value_;
-              return 1;
-            }
-          else
-            {
-              TAO_InputCDR stream (this->cdr_);
-              return stream.read_ushort (s);
-            }
-        }
-      else
-        {
-          return 0;
-        }
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-CORBA::Boolean
-CORBA_Any::operator>>= (CORBA::Long &l) const
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_long,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
-        {
-          if (this->any_owns_data_ && this->value_)
-            {
-              l = *(CORBA::Long *) this->value_;
-              return 1;
-            }
-          else
-            {
-              TAO_InputCDR stream (this->cdr_);
-              return stream.read_long (l);
-            }
-        }
-      else
-        {
-          return 0;
-        }
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-CORBA::Boolean
-CORBA_Any::operator>>= (CORBA::ULong &l) const
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_ulong,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
-        {
-          if (this->any_owns_data_ && this->value_)
-            {
-              l = *(CORBA::ULong *) this->value_;
-              return 1;
-            }
-          else
-            {
-              TAO_InputCDR stream (this->cdr_);
-              return stream.read_ulong (l);
-            }
-        }
-      else
-        {
-          return 0;
-        }
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-CORBA::Boolean
-CORBA_Any::operator>>= (CORBA::LongLong &l) const
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_longlong,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
-        {
-          if (this->any_owns_data_ && this->value_)
-            {
-              l = *(CORBA::LongLong *) this->value_;
-              return 1;
-            }
-          else
-            {
-              TAO_InputCDR stream (this->cdr_);
-              return stream.read_longlong (l);
-            }
-        }
-      else
-        {
-          return 0;
-        }
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-CORBA::Boolean
-CORBA_Any::operator>>= (CORBA::ULongLong &l) const
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_ulonglong,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
-        {
-          if (this->any_owns_data_ && this->value_)
-            {
-              l = *(CORBA::ULongLong *) this->value_;
-              return 1;
-            }
-          else
-            {
-              TAO_InputCDR stream (this->cdr_);
-              return stream.read_ulonglong (l);
-            }
-        }
-      else
-        {
-          return 0;
-        }
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-CORBA::Boolean
-CORBA_Any::operator>>= (CORBA::Float &f) const
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_float,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
-        {
-          if (this->any_owns_data_ && this->value_)
-            {
-              f = *(CORBA::Float *) this->value_;
-              return 1;
-            }
-          else
-            {
-              TAO_InputCDR stream (this->cdr_);
-              return stream.read_float (f);
-            }
-        }
-      else
-        {
-          return 0;
-        }
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-CORBA::Boolean
-CORBA_Any::operator>>= (CORBA::Double &d) const
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_double,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
-        {
-          if (this->any_owns_data_ && this->value_)
-            {
-              d = *(CORBA::Double *) this->value_;
-              return 1;
-            }
-          else
-            {
-              TAO_InputCDR stream (this->cdr_);
-              return stream.read_double (d);
-            }
-        }
-      else
-        {
-          return 0;
-        }
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-CORBA::Boolean
-CORBA_Any::operator>>= (CORBA::Any &a) const
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_any,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
-        {
-          if (this->any_owns_data_ && this->value_)
-            {
-              a = *(CORBA::Any *) this->value_;
-              return 1;
-            }
-          else
-            {
-              TAO_InputCDR stream (this->cdr_);
-              // decode the CDR
-              CORBA::TypeCode::traverse_status retval =
-                stream.decode (CORBA::_tc_any,
-                               &a,
-                               0,
-                               ACE_TRY_ENV);
-             return (retval == CORBA::TypeCode::TRAVERSE_CONTINUE) ? 1 : 0;
-            }
-        }
-      else
-        {
-          return 0;
-        }
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-CORBA::Boolean
-CORBA_Any::operator>>= (char *&s) const
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_string,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
-        {
-          if (this->any_owns_data_ && this->value_)
-            {
-              s = *(char **) this->value_;
-              return 1;
-            }
-          else
-            {
-              TAO_InputCDR stream (this->cdr_);
-              if (stream.read_string (s))
-                {
-                  ACE_const_cast (CORBA_Any *,
-                                  this)->any_owns_data_ = 1;
-
-                  char **tmp;
-
-                  ACE_NEW_RETURN (tmp,
-                                  char *,
-                                  0);
-
-                  *tmp = s;
-
-                  ACE_const_cast (CORBA_Any *,
-                                  this)->value_ = tmp;
-
-                  return 1;
-                }
-              return 0;
-            }
-        }
-      else
-        {
-          return 0;
-        }
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-CORBA::Boolean
-CORBA_Any::operator>>= (CORBA::TypeCode_ptr &tc) const
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_TypeCode,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
-        {
-          if (this->any_owns_data_ && this->value_)
-            {
-              tc = *(CORBA::TypeCode_ptr *) this->value_;
-              return 1;
-            }
-          else
-            {
-              TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_);
-              CORBA::TypeCode::traverse_status retval =
-                stream.decode (CORBA::_tc_TypeCode,
-                               &tc,
-                               0,
-                               ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-              return (retval == CORBA::TypeCode::TRAVERSE_CONTINUE) ? 1 : 0;
-            }
-        }
-      else
-        {
-          return 0;
-        }
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-// = extraction into the special types
-
-CORBA::Boolean
-CORBA_Any::operator>>= (to_boolean b) const
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_boolean,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
-        {
-          if (this->any_owns_data_ && this->value_)
-            {
-              b.ref_ = *(CORBA::Boolean *) this->value_;
-              return 1;
-            }
-          else
-            {
-              TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_);
-              return stream.read_boolean (b.ref_);
-            }
-        }
-      else
-        {
-          return 0;
-        }
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-CORBA::Boolean
-CORBA_Any::operator>>= (to_octet o) const
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_octet,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
-        {
-          if (this->any_owns_data_ && this->value_)
-            {
-              o.ref_ = *(CORBA::Octet *) this->value_;
-              return 1;
-            }
-          else
-            {
-              TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_);
-              return stream.read_octet (o.ref_);
-            }
-        }
-      else
-        {
-          return 0;
-        }
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-CORBA::Boolean
-CORBA_Any::operator>>= (to_char c) const
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_char,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
-        {
-          if (this->any_owns_data_ && this->value_)
-            {
-              c.ref_ = *(CORBA::Char *) this->value_;
-              return 1;
-            }
-          else
-            {
-              TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_);
-              return stream.read_char (c.ref_);
-            }
-        }
-      else
-        {
-          return 0;
-        }
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-CORBA::Boolean
-CORBA_Any::operator>>= (to_wchar wc) const
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_wchar,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
-        {
-          if (this->any_owns_data_ && this->value_)
-            {
-              wc.ref_ = *(CORBA::WChar *) this->value_;
-              return 1;
-            }
-          else
-            {
-              TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_);
-              return stream.read_wchar (wc.ref_);
-            }
-        }
-      else
-        {
-          return 0;
-        }
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-CORBA::Boolean
-CORBA_Any::operator>>= (to_string s) const
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_string,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
-        {
-          CORBA::ULong bound = this->type_->length (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          if (s.bound_ == bound) // bounds are same
-            {
-              if (this->any_owns_data_ && this->value_)
-                {
-                  s.val_ = *(char **) this->value_;
-                  return 1;
-                }
-              else
-                {
-                  TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_);
-                  if (stream.read_string (s.val_))
-                    {
-                      ACE_const_cast (CORBA_Any *,
-                                      this)->any_owns_data_ = 1;
-                      return 1;
-                    }
-                  else
-                    {
-                      return 0;
-                    }
-                }
-            }
-          else
-            {
-              return 0;
-            }
-        }
-      else
-        {
-          return 0;
-        }
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-CORBA::Boolean
-CORBA_Any::operator>>= (to_object obj) const
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_Object,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (result)
-        {
-          if (this->any_owns_data_ && this->value_)
-            {
-              // CORBA 2.3 has changed the behavior of this operator. Caller
-              // is now responsible for release.
-              obj.ref_ =
-                CORBA::Object::_duplicate (*(CORBA::Object_ptr *) this->value_);
-
-              return 1;
-            }
-          else
-            {
-              // @@ This uses ORB_Core instance because we need one to
-              // demarshal objects (to create the right profiles for that
-              // object), but the Any does not belong to any ORB.
-              TAO_InputCDR stream (this->cdr_,
-                                  ACE_CDR_BYTE_ORDER,
-                                  TAO_ORB_Core_instance ());
-
-              CORBA::TypeCode::traverse_status status =
-                stream.decode (CORBA::_tc_Object,
-                               &obj.ref_,
-                               0,
-                               ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-
-              // Because of the CORBA 2.3 change mentioned above, there is no
-              // need to assign to this->value_.
-              return (status == CORBA::TypeCode::TRAVERSE_CONTINUE) ? 1 : 0;;
-            }
-        }
-      else
-        {
-          return 0;
-        }
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-// this is a copying version for unbounded strings Not inline, to
-// avoid use in Any.i before definition in ORB.i.
-
-void
-CORBA_Any::operator<<= (const char* s)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      char **tmp;
-
-      ACE_NEW (tmp,
-               char * (CORBA::string_dup (s)));
-
-      this->replace (CORBA::_tc_string,
-                     tmp,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-// ----------------------------------------------------------------------
-// Any_var type
-// ----------------------------------------------------------------------
-
-CORBA::Any_var &
-CORBA_Any_var::operator= (CORBA::Any *p)
-{
-  if (this->ptr_ != p)
-    {
-      if (this->ptr_ != 0)
-        delete (this->ptr_);
-
-      this->ptr_ = p;
-    }
-  return *this;
-}
-
-CORBA::Any_var &
-CORBA_Any_var::operator= (const CORBA::Any_var& r)
-{
-  CORBA_Any_ptr tmp;
-
-  ACE_NEW_RETURN (tmp,
-                  CORBA::Any (*r.ptr_),
-                  *this);
-
-  if (this->ptr_ != 0)
-    delete this->ptr_;
-
-  this->ptr_ = tmp;
-
-  return *this;
-}
-
-// = Debugging method.
-
-// Prints the type and the value of the any value. Dumping is
-// supported only for standard data types.
-
-void
-CORBA_Any::dump (const CORBA::Any &any_value)
-{
-  // Get the typecode kind.
-  CORBA::TypeCode_var type = any_value.type ();
-  CORBA::TCKind kind = type->kind ();
-
-  switch (kind)
-    {
-      case CORBA::tk_null:
-        ACE_DEBUG ((LM_DEBUG,
-                    "Null\n"));
-        break;
-      case CORBA::tk_void:
-        ACE_DEBUG ((LM_DEBUG,
-                    "Void\n"));
-        break;
-      case CORBA::tk_short:
-        {
-          CORBA::Short s;
-          any_value >>= s;
-          ACE_DEBUG ((LM_DEBUG,
-                      "Short %d\n",
-                     s));
-          break;
-        }
-      case CORBA::tk_long:
-        {
-          CORBA::Long l;
-          any_value >>= l;
-          ACE_DEBUG ((LM_DEBUG,
-                      "Long %d\n",
-                      l));
-          break;
-        }
-      case CORBA::tk_ushort:
-        {
-          CORBA::UShort s;
-          any_value >>= s;
-          ACE_DEBUG ((LM_DEBUG,
-                      "UShort %d\n",
-                      s));
-          break;
-        }
-      case CORBA::tk_ulong:
-        {
-          CORBA::ULong l;
-          any_value >>= l;
-          ACE_DEBUG ((LM_DEBUG,
-                      "ULong %d\n",
-                      l));
-          break;
-        }
-      case CORBA::tk_float:
-        {
-          CORBA::Float f;
-          any_value >>= f;
-          ACE_DEBUG ((LM_DEBUG,
-                      "Float %f\n",
-                      f));
-          break;
-        }
-      case CORBA::tk_double:
-        {
-          CORBA::Double d;
-          any_value >>= d;
-          ACE_DEBUG ((LM_DEBUG,
-                      "Double %f\n",
-                      d));
-          break;
-        }
-      case CORBA::tk_boolean:
-        {
-          CORBA::Boolean b;
-          to_boolean tb (b);
-          any_value >>= tb;
-          if (b == 1)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "Boolean TRUE\n"));
-            }
-          else
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "Boolean FALSE\n"));
-            }
-          break;
-        }
-      case CORBA::tk_char:
-        {
-          CORBA::Char ch;
-          to_char tch (ch);
-          any_value >>= tch;
-          ACE_DEBUG ((LM_DEBUG,
-                      "Char %c\n",
-                      ch));
-          break;
-        }
-      case CORBA::tk_string:
-        {
-          CORBA::String str;
-          any_value >>= str;
-          ACE_DEBUG ((LM_DEBUG,
-                      "String %s\n",
-                      str));
-          break;
-        }
-      default:
-        ACE_DEBUG ((LM_DEBUG,
-                    "TCKind %d\n",
-                    kind));
-        break;
-    }
-}
diff --git a/TAO/tao/Any.h b/TAO/tao/Any.h
deleted file mode 100644
index f036e6cc5ed..00000000000
--- a/TAO/tao/Any.h
+++ /dev/null
@@ -1,536 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Any.h
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems, Inc.
-//     and Aniruddha Gokhale.
-//
-// ============================================================================
-
-#ifndef TAO_ANY_H
-#define TAO_ANY_H
-
-#include "tao/CDR.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Environment.h"
-#include "tao/Object.h"
-
-class TAO_Export CORBA_Any
-{
-  // = TITLE
-  //   Class "Any" can wrap values of any type, with the assistance
-  //   of a TypeCode to describe that type.
-  //
-  // = DESCRIPTION
-  //   This includes three constructors, a destructor, and a "replace"
-  //   method for the "Any" data type.  "Any" values pair a pointer to
-  //   a data structure in the native binary representation (e.g. C
-  //   struct) with a TypeCode that describes that data structure.
-  //
-  //   The copy constructor and the destructor each use the TypeCode
-  //   interpreter with specialized "visit" callback routines.  The
-  //   "visit" routines are used respectively to make "deep copies"
-  //   and perform "deep frees" of the aritrary values as described by
-  //   the "Any" value's typecode.
-  //
-  //   Note that these "visit" routines are called directly, and they
-  //   choose whether or not to use the TypeCode interpreter to
-  //   examine constituents.  In the simple cases, the "visit"
-  //   routines can do their work without any further calls; only for
-  //   constructed types is the interpreter's knowledge really
-  //   required.
-  //
-  //   THREADING NOTE: "Any" is a data structure which must be
-  //   protected by external critical sections.  Like simpler numeric
-  //   types, "Any" instances are accessed and modified atomically.
-  //   This implementation is reentrant, so that independent "Any"
-  //   values may be manipulated concurrently when the underlying
-  //   programming environment is itself reentrant.
-public:
-
-  // = Minor codes for exceptional returns
-  enum
-  {
-    UNINITIALIZED_type = 0xf000,
-    VALUE_WITHOUT_TYPE,
-    UNSUPPORTED_OPERATION
-  };
-
-  // = Initialization and termination operations.
-
-  CORBA_Any (void);
-  // Default constructor.
-
-  CORBA_Any (CORBA::TypeCode_ptr type,
-             void *value = 0,
-             CORBA::Boolean any_owns_data = 0);
-  // Constructor. The any_owns_data flag determines if the Any owns the value
-
-  // = TAO extension
-  CORBA_Any (CORBA::TypeCode_ptr type,
-             CORBA::UShort dummy,
-             const ACE_Message_Block* mb);
-  // Constructor. Used by DynAny and others to optimize Any activities
-  // by using CDR. The dummy arg is to keep calls like CORBA_Any foo
-  // (CORBA::TypeCode_ptr bar (NULL), NULL) from being confused with
-  // the constructor above.
-
-  CORBA_Any (const CORBA_Any &a);
-  // Copy constructor.
-
-  ~CORBA_Any (void);
-  // Destructor.
-
-  CORBA_Any &operator= (const CORBA_Any &);
-  // assignment operator
-
-  // = NOTE: 94-9-14 has assignment operator plus many insertion, as
-  // specified below.
-
-  // =type safe insertion
-
-  void operator<<= (CORBA::Short);
-  // insert a short
-
-  void operator<<= (CORBA::UShort);
-  // insert an unsigned short
-
-  void operator<<= (CORBA::Long);
-  // insert a long
-
-  void operator<<= (CORBA::ULong);
-  // insert an unsigned long
-
-  void operator<<= (CORBA::LongLong);
-  // insert a long long
-
-  void operator<<= (CORBA::ULongLong);
-  // insert an unsigned long long
-
-  void operator<<= (CORBA::Float);
-  // insert a float
-
-  void operator<<= (CORBA::Double);
-  // insert a double
-
-  void operator<<= (const CORBA_Any&);
-  // insert an Any, copying
-
-  void operator<<= (CORBA_Any_ptr);
-  // insert an Any, non-copying
-
-  void operator<<= (const char*);
-  // insert unbounded strings
-
-  void operator<<= (CORBA::TypeCode_ptr);
-  // insert a TypeCode
-
-  void operator<<= (const CORBA::Object_ptr);
-  // insert an object reference, copying.
-
-  void operator<<= (CORBA::Object_ptr *);
-  // insert an object reference, non-copying.  Any assumes the ownership
-  // of the object.
-
-  // =type safe extraction
-
-  CORBA::Boolean operator>>= (CORBA::Short&) const;
-  // extract a short
-
-  CORBA::Boolean operator>>= (CORBA::UShort&) const;
-  // extract an unsigned short
-
-  CORBA::Boolean operator>>= (CORBA::Long&) const;
-  // extract a long
-
-  CORBA::Boolean operator>>= (CORBA::ULong&) const;
-  // extract an unsigned long
-
-  CORBA::Boolean operator>>= (CORBA::LongLong&) const;
-  // extract a long long
-
-  CORBA::Boolean operator>>= (CORBA::ULongLong&) const;
-  // extract an unsigned long long
-
-  CORBA::Boolean operator>>= (CORBA::Float&) const;
-  // extract a float
-
-  CORBA::Boolean operator>>= (CORBA::Double&) const;
-  // extract a double
-
-  CORBA::Boolean operator>>= (CORBA_Any&) const;
-  // extract an Any
-
-  CORBA::Boolean operator>>= (CORBA::TypeCode_ptr&) const;
-  // extract a TypeCode
-
-  CORBA::Boolean operator>>= (char*&) const;
-  // extract an unbounded string
-
-  // = Special types.
-
-  // These are needed for insertion and extraction of booleans,
-  // octets, chars, and bounded strings. CORBA spec requires
-  // that they be here, we just typedef to the already-defined
-  // ACE_OutputCDR types.
-
-  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;
-
-  void operator<<= (from_boolean);
-  // insert a boolean
-
-  void operator<<= (from_char);
-  // insert a char
-
-  void operator<<= (from_wchar);
-  // insert a wchar
-
-  void operator<<= (from_octet);
-  // insert an octet
-
-  void operator<<= (from_string);
-  // insert a bounded string
-
-  void operator<<= (const CORBA_Exception &exception);
-  // insert an exception into the Any
-
-  // = Special types.
-
-  // 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;
-
-  // This one's not in ACE.
-  struct TAO_Export to_object
-  {
-    // This signature reflects the change seet out in
-    // issue 154 of the 1.3 RTF.
-    to_object (CORBA_Object_out obj);
-    CORBA::Object_ptr &ref_;
-  };
-
-  // extraction of the special types
-
-  CORBA::Boolean operator>>= (to_boolean) const;
-  // extract a boolean
-
-  CORBA::Boolean operator>>= (to_octet) const;
-  // extract an octet
-
-  CORBA::Boolean operator>>= (to_char) const;
-  // extract a char
-
-  CORBA::Boolean operator>>= (to_wchar) const;
-  // extract a wchar
-
-  CORBA::Boolean operator>>= (to_string) const;
-  // extract a bounded string
-
-  CORBA::Boolean operator>>= (to_object) const;
-  // extract an object reference
-
-  // the following are unsafe operations
-  // ORBOS/90-01-11, pg 672: For C++ mapping using the CORBA_Environment
-  // parameter, two forms of the replace method are provided.
-
-  void replace (CORBA::TypeCode_ptr type,
-                const void *value,
-                CORBA::Boolean any_owns_data,
-                CORBA_Environment &ACE_TRY_ENV =
-                  TAO_default_environment ());
-  // Replace the current typecode and data with the specified one -
-  // unsafe.
-
-  void replace (CORBA::TypeCode_ptr type,
-                const void *value,
-                CORBA_Environment &ACE_TRY_ENV =
-                  TAO_default_environment ());
-  // Replace the current typecode and data with the specified one -
-  // unsafe. This uses a default value for the "any_owns_data" parameter
-
-  CORBA::TypeCode_ptr type (void) const;
-  // Return TypeCode of the element stored in the Any.
-
-  void type (CORBA::TypeCode_ptr type,
-             CORBA_Environment &ACE_TRY_ENV =
-               TAO_default_environment ());
-  // For use along with <<= of a value of aliased type when the alias must
-  // be preserved.
-
-  const void *value (void) const;
-  // Returns 0 if the Any has not been assigned a value, following the
-  // CORBA spec (ORBOS/98-01-11) it returns a non-zero value
-  // otherwise. TAO does *not* guarantee that this value may be casted
-  // to the contained type safely.
-
-  // = Debugging method.
-
-  static void dump (const CORBA::Any &any_value);
-  // Prints the type and the value of the any value. Dumping is
-  // supported only for standard data types.
-
-  // = TAO extensions
-  CORBA::Boolean any_owns_data (void) const;
-  // Reports whether the Any own the data or not. This is used by the
-  // >>= operators generated by the IDL compiler. The >>= operator
-  // checks if the Any owns the data. If it does, then it will simply
-  // retrieve the data from internal cache.  Otherwise, the operator
-  // will have to decode the cdr string.
-
-  ACE_Message_Block* _tao_get_cdr (void) const;
-  // Message block accessor.
-
-  void _tao_replace (CORBA::TypeCode_ptr,
-                     const ACE_Message_Block *mb,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-  // Replace via message block instead of <value_>.
-
-  void _tao_replace (CORBA::TypeCode_ptr type,
-                     const ACE_Message_Block *mb,
-                     CORBA::Boolean any_owns_data,
-                     void* value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-  // Replace all the contents of the any, used in the <<= operators.
-
-  void _tao_replace (CORBA::TypeCode_ptr type,
-                     CORBA::Boolean any_owns_data,
-                     void* value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-  // Replace the value of the Any, used in the >>= operators.
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_Any_ptr _ptr_type;
-  typedef CORBA_Any_var _var_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
-protected:
-  void free_value (CORBA::Environment &ACE_TRY_ENV);
-  // Release the <value_>.
-
-private:
-  CORBA::TypeCode_ptr type_;
-  // Typecode for the <Any>.
-
-  void *value_;
-  // Value for the <Any>.
-
-  ACE_Message_Block *cdr_;
-  // encoded value.
-
-  CORBA::Boolean any_owns_data_;
-  // Flag that indicates the ORB is responsible for deleting the data.
-
-  // 94-9-14 hides unsigned char insert/extract
-  void operator<<= (unsigned char);
-  CORBA::Boolean operator>>= (unsigned char&) const;
-
-  friend class TAO_Stub;
-  friend class TAO_Marshal_Any;
-  friend class CORBA_NVList;
-};
-
-class TAO_Export CORBA_Any_var
-{
-  // = TITLE
-  //   Provide for automatic storage deallocation on going out of
-  //   scope.
-public:
-  CORBA_Any_var (void);
-  // default constructor
-
-  CORBA_Any_var (CORBA_Any *a);
-  // construct from an Any pointer
-
-  CORBA_Any_var (const CORBA_Any_var &a);
-  // copy constructor
-
-  ~CORBA_Any_var (void);
-  // destructor
-
-  CORBA_Any_var &operator= (CORBA_Any *a);
-  // assignment from a pointer to Any
-
-  CORBA_Any_var &operator= (const CORBA_Any_var &a);
-  // assignment from an Any_var
-  // This operation requires memory allocation.
-  // If the allocation fails, *this is returned
-  // unmodified.
-
-  CORBA_Any *operator-> (void);
-  // arrow operator (smart pointer)
-
-  operator const CORBA_Any *() const;
-  // cast
-
-  operator CORBA_Any *&();
-  // cast
-
-  const CORBA_Any &in (void) const;
-  // for in Any parameter
-
-  CORBA_Any &inout (void);
-  // for inout Any parameter
-
-  CORBA_Any *&out (void);
-  // for out Any parameter
-
-  CORBA_Any *_retn (void);
-  // for Any return types
-
-private:
-  CORBA_Any *ptr_;
-  // Holds the Any.
-};
-
-class TAO_Export CORBA_Any_out
-{
-  // = TITLE
-  //   CORBA_Any_out
-  //
-  // = DESCRIPTION
-  //   The _out class for CORBA_Any. This is used to help in
-  //   managing the out parameters.
-public:
-  // = operations.
-
-  CORBA_Any_out (CORBA_Any *&p);
-  // construction from a reference to a CORBA_Any
-
-  CORBA_Any_out (CORBA_Any_var &p);
-  // construction from a var
-
-  CORBA_Any_out (const CORBA_Any_out &s);
-  // copy constructor
-
-  CORBA_Any_out &operator= (const CORBA_Any_out &s);
-  // assignment from a CORBA_Any_out
-
-  CORBA_Any_out &operator= (CORBA_Any *p);
-  // assignment from a CORBA_Any
-
-  CORBA_Any_out &operator= (const CORBA_Any *p);
-  // assignment from a const CORBA_Any
-
-  operator CORBA_Any *&();
-  // cast
-
-  CORBA_Any *& ptr (void);
-  // return underlying instance
-
-  CORBA_Any *operator-> (void);
-
-private:
-  CORBA_Any *&ptr_;
-  // Instance
-
-  void operator= (const CORBA_Any_var &);
-  // assignment from _var disallowed
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Any.i"
-#else
-
-// Copying versions of insertion
-// operators which are defined as members of the Any class
-// must also be defined for Any_var.
-extern TAO_Export void operator<<= (CORBA_Any_var,
-                                    CORBA::Short);
-extern TAO_Export void operator<<= (CORBA_Any_var,
-                                    CORBA::UShort);
-extern TAO_Export void operator<<= (CORBA_Any_var,
-                                    CORBA::Long);
-extern TAO_Export void operator<<= (CORBA_Any_var,
-                                    CORBA::ULong);
-extern TAO_Export void operator<<= (CORBA_Any_var,
-                                    CORBA::LongLong);
-extern TAO_Export void operator<<= (CORBA_Any_var,
-                                    CORBA::ULongLong);
-extern TAO_Export void operator<<= (CORBA_Any_var,
-                                    CORBA::Float);
-extern TAO_Export void operator<<= (CORBA_Any_var,
-                                    CORBA::Double);
-extern TAO_Export void operator<<= (CORBA_Any_var,
-                                    const CORBA_Any&);
-extern TAO_Export void operator<<= (CORBA_Any_var,
-                                    const char*);
-extern TAO_Export void operator<<= (CORBA_Any_var,
-                                    CORBA::TypeCode_ptr);
-extern TAO_Export void operator<<= (CORBA_Any_var,
-                                    const CORBA::Object_ptr);
-extern TAO_Export void operator<<= (CORBA_Any_var,
-                                    CORBA::Any::from_boolean);
-extern TAO_Export void operator<<= (CORBA_Any_var,
-                                    CORBA::Any::from_char);
-extern TAO_Export void operator<<= (CORBA_Any_var,
-                                    CORBA::Any::from_wchar);
-extern TAO_Export void operator<<= (CORBA_Any_var,
-                                    CORBA::Any::from_octet);
-extern TAO_Export void operator<<= (CORBA_Any_var,
-                                    CORBA::Any::from_string);
-
-// These are not required by the spec, but will make users
-// of other ORBs that are used to them more comfortable.
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
-                                              CORBA::Short&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
-                                              CORBA::UShort&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
-                                              CORBA::Long&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
-                                              CORBA::ULong&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
-                                              CORBA::LongLong&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
-                                              CORBA::ULongLong&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
-                                              CORBA::Float&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
-                                              CORBA::Double&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
-                                              CORBA_Any&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
-                                              CORBA::TypeCode_ptr&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
-                                              char*&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
-                                              CORBA::Any::to_boolean);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
-                                              CORBA::Any::to_octet);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
-                                              CORBA::Any::to_char);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
-                                              CORBA::Any::to_wchar);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
-                                              CORBA::Any::to_string);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var,
-                                              CORBA::Any::to_object);
-
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_ANY_H */
diff --git a/TAO/tao/Any.i b/TAO/tao/Any.i
deleted file mode 100644
index 29f52e4f9fb..00000000000
--- a/TAO/tao/Any.i
+++ /dev/null
@@ -1,725 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// Insertion from special types.
-
-ACE_INLINE 
-void
-CORBA_Any::replace (CORBA::TypeCode_ptr type,
-                    const void *value,
-                    CORBA::Environment &ACE_TRY_ENV)
-{
-  // Invoke the first form of the replace method and pass the default
-  // value (FALSE) for the "any_owns_data" parameter
-  this->replace (type,
-                 value,
-                 0,
-                 ACE_TRY_ENV);
-}
-
-ACE_INLINE 
-CORBA::Boolean
-CORBA_Any::any_owns_data (void) const
-{
-  return (this->any_owns_data_ != 0 && this->value_ != 0);
-}
-
-ACE_INLINE 
-ACE_Message_Block*
-CORBA_Any::_tao_get_cdr (void) const
-{
-  return this->cdr_;
-}
-
-// insertion operators
-
-ACE_INLINE 
-void
-CORBA_Any::operator<<= (CORBA::Short s)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      CORBA::Short *ns;
-      ACE_NEW (ns,
-               CORBA::Short (s));
-      this->replace (CORBA::_tc_short,
-                     ns,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-ACE_INLINE 
-void
-CORBA_Any::operator<<= (CORBA::UShort s)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      CORBA::UShort *ns;
-      ACE_NEW (ns,
-               CORBA::UShort (s));
-      this->replace (CORBA::_tc_ushort,
-                     ns,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-ACE_INLINE 
-void
-CORBA_Any::operator<<= (CORBA::Long l)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      CORBA::Long *nl;
-      ACE_NEW (nl,
-               CORBA::Long (l));
-      this->replace (CORBA::_tc_long,
-                     nl,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-ACE_INLINE 
-void
-CORBA_Any::operator<<= (CORBA::ULong l)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      CORBA::ULong *nl;
-      ACE_NEW (nl,
-               CORBA::ULong (l));
-      this->replace (CORBA::_tc_ulong,
-                     nl,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-ACE_INLINE 
-void
-CORBA_Any::operator<<= (CORBA::LongLong l)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      CORBA::LongLong *nl;
-      ACE_NEW (nl,
-               CORBA::LongLong (l));
-      this->replace (CORBA::_tc_longlong,
-                     nl,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-ACE_INLINE 
-void
-CORBA_Any::operator<<= (CORBA::ULongLong l)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      CORBA::ULongLong *nl;
-      ACE_NEW (nl,
-               CORBA::ULongLong (l));
-      this->replace (CORBA::_tc_ulonglong,
-                     nl,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-ACE_INLINE 
-void
-CORBA_Any::operator<<= (CORBA::Float f)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      CORBA::Float *nf;
-      ACE_NEW (nf,
-               CORBA::Float (f));
-      this->replace (CORBA::_tc_float,
-                     nf,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-ACE_INLINE void
-CORBA_Any::operator<<= (CORBA::Double d)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      CORBA::Double *nd;
-      ACE_NEW (nd,
-               CORBA::Double (d));
-      this->replace (CORBA::_tc_double,
-                     nd,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-// insertion of Any - copying
-ACE_INLINE void
-CORBA_Any::operator<<= (const CORBA_Any& a)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      CORBA_Any_ptr na;
-      ACE_NEW (na,
-               CORBA::Any (a));
-      this->replace (CORBA::_tc_any,
-                     na,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-// insertion of Any - non-copying
-ACE_INLINE 
-void
-CORBA::Any::operator<<= (CORBA::Any_ptr anyptr)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->replace (CORBA::_tc_any,
-                     anyptr,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-// implementing the special types
-ACE_INLINE
-CORBA_Any::to_object::to_object (CORBA_Object_out obj)
-  : ref_ (obj.ptr ())
-{
-}
-
-ACE_INLINE 
-void
-CORBA_Any::operator<<= (from_boolean b)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      CORBA::Boolean *nb;
-      ACE_NEW (nb,
-               CORBA::Boolean (b.val_));
-      this->replace (CORBA::_tc_boolean,
-                     nb,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-ACE_INLINE 
-void
-CORBA_Any::operator<<= (from_octet o)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      CORBA::Octet *no;
-      ACE_NEW (no,
-               CORBA::Octet (o.val_));
-      this->replace (CORBA::_tc_octet,
-                     no,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-ACE_INLINE 
-void
-CORBA_Any::operator<<= (from_char c)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      CORBA::Char *nc;
-      ACE_NEW (nc,
-               CORBA::Char (c.val_));
-      this->replace (CORBA::_tc_char,
-                     nc,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-ACE_INLINE 
-void
-CORBA_Any::operator<<= (from_wchar wc)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      CORBA::WChar *nwc;
-      ACE_NEW (nwc,
-               CORBA::WChar (wc.val_));
-      this->replace (CORBA::_tc_wchar,
-                     nwc,
-                     1,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_Any_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_Any_var::CORBA_Any_var (void)
-  : ptr_ (0)
-{
-}
-
-ACE_INLINE
-CORBA_Any_var::CORBA_Any_var (CORBA_Any *p)
-  : ptr_ (p)
-{
-}
-
-ACE_INLINE
-CORBA_Any_var::CORBA_Any_var (const CORBA_Any_var& r)
-{
-  CORBA_Any_ptr nptr;
-  ACE_NEW (nptr,
-           CORBA::Any (*r.ptr_));
-  this->ptr_ = nptr;
-}
-
-ACE_INLINE
-CORBA_Any_var::~CORBA_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;
-}
-
-// *************************************************************
-// 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;
-}
-
-// *************************************************************
-// CORBA_Any_var extraction operators
-// *************************************************************
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, CORBA::Short &rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, CORBA::UShort &rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, CORBA::Long &rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, CORBA::ULong &rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, CORBA::LongLong &rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, CORBA::ULongLong &rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, CORBA::Float &rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, CORBA::Double &rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, CORBA_Any &rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, CORBA::TypeCode_ptr &rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, char* &rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, CORBA::Any::to_boolean rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, CORBA::Any::to_octet rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, CORBA::Any::to_char rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, CORBA::Any::to_wchar rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, CORBA::Any::to_string rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, CORBA::Any::to_object rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_Any_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_Any_out::CORBA_Any_out (CORBA_Any *&s)
-  : ptr_ (s)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_Any_out::CORBA_Any_out (CORBA_Any_var &s)
-  : ptr_ (s.out ())
-{
-}
-
-ACE_INLINE
-CORBA_Any_out::CORBA_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 &
-CORBA_Any_out::operator= (const CORBA_Any *s)
-{
-  this->ptr_ = new CORBA::Any (*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/Asynch_Invocation.cpp b/TAO/tao/Asynch_Invocation.cpp
deleted file mode 100644
index 204805dd43e..00000000000
--- a/TAO/tao/Asynch_Invocation.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-// $Id$
-
-#include "tao/Asynch_Invocation.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_POLLER)
-
-#include "tao/Timeprobe.h"
-#include "tao/Stub.h"
-#include "tao/Principal.h"
-#include "tao/Object_KeyC.h"
-#include "tao/debug.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Asynch_Invocation.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, Asynch_Invocation, "$Id$")
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-
-static const char *TAO_Asynch_Invocation_Timeprobe_Description[] =
-  {
-    "GIOP_Asynch_Invocation::invoke - start",
-    "GIOP_Asynch_Invocation::invoke - end",
-
-    "GIOP_Asynch_Invocation::start - enter",
-    "GIOP_Asynch_Invocation::start - leave",
-    "GIOP_Asynch_Invocation::start - connect",
-    "GIOP_Asynch_Invocation::start - start_msg",
-    "GIOP_Asynch_Invocation::start - request_hdr"
-  };
-
-enum
-  {
-    TAO_GIOP_ASYNCH_INVOCATION_INVOKE_START = 1000,
-    TAO_GIOP_ASYNCH_INVOCATION_INVOKE_END,
-
-    TAO_GIOP_ASYNCH_INVOCATION_START_ENTER,
-    TAO_GIOP_ASYNCH_INVOCATION_START_LEAVE,
-    TAO_GIOP_ASYNCH_INVOCATION_START_CONNECT,
-    TAO_GIOP_ASYNCH_INVOCATION_START_START_MSG,
-    TAO_GIOP_ASYNCH_INVOCATION_START_REQUEST_HDR
-  };
-
-
-// Setup Timeprobes
-ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Asynch_Invocation_Timeprobe_Description,
-                                  TAO_GIOP_ASYNCH_INVOCATION_INVOKE_START);
-
-#endif /* ACE_ENABLE_TIMEPROBES */
-
-void
-TAO_GIOP_Twoway_Asynch_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->TAO_GIOP_Invocation::start (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->transport_->start_request (this->orb_core_,
-                                   this->profile_,
-                                   this->opname_,
-                                   this->request_id_,
-                                   1,
-                                   this->out_stream_,
-                                   ACE_TRY_ENV);
-}
-
-int
-TAO_GIOP_Twoway_Asynch_Invocation::invoke (CORBA::ExceptionList &exceptions,
-                                           CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,CORBA::UnknownUserException))
-{
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_GIOP_ASYNCH_INVOCATION_INVOKE_START);
-  
-  int retval = this->invoke_i (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  return retval;
-}
-
-int
-TAO_GIOP_Twoway_Asynch_Invocation::invoke (TAO_Exception_Data *excepts,
-                                           CORBA::ULong except_count,
-                                           CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::Exception))
-{
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_GIOP_ASYNCH_INVOCATION_INVOKE_START);
-  
-  int retval = this->invoke_i (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  return retval;
-}
-
-int
-TAO_GIOP_Twoway_Asynch_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Register a reply dispatcher for this Asynch_Invocation. Use the
-  // heap allocated reply dispatcher.
-  
-  int retval = this->transport_->bind_reply_dispatcher (this->request_id_,
-                                                        this->rd_);
-  if (retval == -1)
-    {
-      // @@ What is the right way to handle this error?
-      this->close_connection ();
-      ACE_THROW_RETURN (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE,
-                                         CORBA::COMPLETED_NO),
-                        TAO_INVOKE_EXCEPTION);
-    }
-
-  // Just send the request, without trying to wait for the reply.
-  retval = TAO_GIOP_Invocation::invoke (1, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (retval != TAO_INVOKE_OK)
-    return retval;
-
-  // We do not wait for the reply. Let us return. 
-
-  return TAO_INVOKE_OK;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_POLLER */
diff --git a/TAO/tao/Asynch_Invocation.h b/TAO/tao/Asynch_Invocation.h
deleted file mode 100644
index d0206890101..00000000000
--- a/TAO/tao/Asynch_Invocation.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Asynch_Invocation.h
-//
-// = DESCRIPTION
-//    Encapsulate the logic for remote Asynchronous Invocations.
-//
-// = AUTHOR
-//   Carlos O'Ryan <coryan@cs.wustl.edu> and Alexander Babu Arulanthu
-//   <alex@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_ASYNCH_INVOCATION_H
-#define TAO_ASYNCH_INVOCATION_H
-
-#include "tao/Invocation.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_POLLER)
-#include "tao/MessagingC.h"
-
-class TAO_Export TAO_GIOP_Twoway_Asynch_Invocation : public TAO_GIOP_Invocation
-{
-  // = TITLE
-  //   Sends a two-way request does not expect the reply.
-  //
-  // = DESCRIPTION
-  //   This class connects (or lookups a connection from the cache) to
-  //   the remote server, builds the CDR stream for the Request, send
-  //   the CDR stream and returns.
-  //
-public:
-  TAO_GIOP_Twoway_Asynch_Invocation (TAO_Stub *data,
-                                     const char *operation,
-                                     TAO_ORB_Core* orb_core,
-                                     const TAO_Reply_Handler_Skeleton &reply_handler_skel,
-                                     Messaging::ReplyHandler_ptr reply_handler_ptr);
-  // Constructor.
-
-  void start (CORBA_Environment &TAO_IN_ENV =
-              TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Calls TAO_GIOP_Asynch_Invocation::start.
-
-  int invoke (CORBA::ExceptionList &exceptions,
-              CORBA_Environment &TAO_IN_ENV =
-                    TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,CORBA::UnknownUserException));
-  // Send request, block until any reply comes back, and unmarshal
-  // reply parameters as appropriate.
-
-  int invoke (TAO_Exception_Data *excepts,
-              CORBA::ULong except_count,
-              CORBA_Environment &TAO_IN_ENV =
-                    TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::Exception));
-  // Special purpose invoke method used by the interpretive stubs. This
-  // accomplishes the same task as the normal invoke except that
-  // Exceptions are allocated and decoded here. This reduces the
-  // footprint of the generated stubs.
-
-  //   TAO_InputCDR &inp_stream (void);
-  //   // Return the underlying input stream.
-  //
-  //   void get_value (CORBA::TypeCode_ptr tc,
-  //                   void *value,
-  //                   CORBA_Environment &TAO_IN_ENV =
-  //                         TAO_default_environment ());
-  //   // No CORBA::Context support (deprecated).
-
-private:
-  int invoke_i (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Implementation of the invoke() methods, handles the basic
-  // send/reply code and the system exceptions.
-
-private:
-  TAO_Asynch_Reply_Dispatcher *rd_;
-  // Reply dispatcher for the current synchronous Asynch_Invocation.
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Asynch_Invocation.i"
-#endif /* __ACE_INLINE__ */
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_POLLER */
-#endif /* TAO_ASYNCH_INVOCATION_H */
diff --git a/TAO/tao/Asynch_Invocation.i b/TAO/tao/Asynch_Invocation.i
deleted file mode 100644
index 800b5f14595..00000000000
--- a/TAO/tao/Asynch_Invocation.i
+++ /dev/null
@@ -1,34 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-//
-// $Id$
-//
-
-ACE_INLINE
-TAO_GIOP_Twoway_Asynch_Invocation::
-TAO_GIOP_Twoway_Asynch_Invocation (TAO_Stub *stub,
-                                   const char *operation,
-                                   TAO_ORB_Core *orb_core,
-                                   const TAO_Reply_Handler_Skeleton &reply_handler_skel,
-                                   Messaging::ReplyHandler_ptr reply_handler_ptr)
-  : TAO_GIOP_Invocation (stub, operation, orb_core),
-    rd_ (0)
-{
-  // New Reply Dispatcher.
-  ACE_NEW (rd_,
-           TAO_Asynch_Reply_Dispatcher (reply_handler_skel,
-                                        reply_handler_ptr));
-}
-
-// ACE_INLINE TAO_InputCDR &
-// TAO_GIOP_Twoway_Asynch_Invocation::inp_stream (void)
-// {
-//   return this->message_state_->cdr;
-// }
-// 
-// ACE_INLINE void
-// TAO_GIOP_Twoway_Asynch_Invocation::get_value (CORBA::TypeCode_ptr tc,
-//                                               void *value,
-//                                               CORBA::Environment &ACE_TRY_ENV)
-// {
-//   (void) this->inp_stream ().decode (tc, value, 0, ACE_TRY_ENV);
-// }
diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp
deleted file mode 100644
index b16c3708661..00000000000
--- a/TAO/tao/CDR.cpp
+++ /dev/null
@@ -1,335 +0,0 @@
-// $Id$
-
-// Portions of this file are:
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-
-// CDR:         Encode/Decode basic machine data types
-//
-// Implementation of OMG "Common Data Representation" (CDR) ... there
-// are one routine each for byte/halfword/word/doubleword put/get,
-// which adjust to establish "natural" alignment (the bulk of the
-// code) and then put or get with byteswapping as needed.
-//
-// The implementation knows that native data formats are conformant
-// with OMG-IDL's (and hence CDR's) size requirements, and relies on
-// the fact that (for example) CORBA_Long is always four bytes long
-// even if the environment's "int" is a different size.
-//
-//      char, octet                       8 bits (1 byte)
-//      short, unsigned short            16 bits (2 bytes)
-//      long, unsigned long, float       32 bits (4 bytes)
-//      double, (unsigned) long long     64 bits (8 bytes)
-//      long double                     128 bits (16 bytes)
-//
-// Moreover, this "knows" that the native 'char' represents ISO
-// Latin/1 characters (an ASCII superset addressing Western European
-// characters) and that "double" and "float" comply with the IEEE
-// standards. (The "long double" may not be a native data type,
-// though.)
-//
-// THREADING NOTE: "CDR" is a data structure which must be protected
-// by external critical sections.
-
-#include "tao/Timeprobe.h"
-#include "tao/CDR.h"
-#include "tao/ORB_Core.h"
-#include "tao/singletons.h"
-#include "tao/Environment.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/CDR.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, CDR, "$Id$")
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-
-static const char *TAO_CDR_Timeprobe_Description[] =
-{
-  "OutputCDR::ctor[1] - enter",
-  "OutputCDR::ctor[1] - leave",
-  "OutputCDR::ctor[2] - enter",
-  "OutputCDR::ctor[2] - leave",
-  "OutputCDR::ctor[3] - enter",
-  "OutputCDR::ctor[3] - leave"
-};
-
-enum
-{
-  TAO_OUTPUT_CDR_CTOR1_ENTER = 2000,
-  TAO_OUTPUT_CDR_CTOR1_LEAVE,
-  TAO_OUTPUT_CDR_CTOR2_ENTER,
-  TAO_OUTPUT_CDR_CTOR2_LEAVE,
-  TAO_OUTPUT_CDR_CTOR3_ENTER,
-  TAO_OUTPUT_CDR_CTOR3_LEAVE
-};
-
-// Setup Timeprobes
-ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_CDR_Timeprobe_Description,
-                                  TAO_OUTPUT_CDR_CTOR1_ENTER);
-
-#endif /* ACE_ENABLE_TIMEPROBES */
-
-TAO_OutputCDR::TAO_OutputCDR (size_t size,
-                              int byte_order,
-                              ACE_Allocator *buffer_allocator,
-                              ACE_Allocator *data_block_allocator,
-                              size_t memcpy_tradeoff,
-                              ACE_Char_Codeset_Translator *char_translator,
-                              ACE_WChar_Codeset_Translator *wchar_translator)
-  :  ACE_OutputCDR (size,
-                    byte_order,
-                    buffer_allocator,
-                    data_block_allocator,
-                    memcpy_tradeoff)
-{
-  ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR1_ENTER);
-  this->char_translator_ = char_translator;
-  this->wchar_translator_ = wchar_translator;
-}
-
-TAO_OutputCDR::TAO_OutputCDR (char *data,
-                              size_t size,
-                              int byte_order,
-                              ACE_Allocator *buffer_allocator,
-                              ACE_Allocator *data_block_allocator,
-                              size_t memcpy_tradeoff,
-                              ACE_Char_Codeset_Translator *char_translator,
-                              ACE_WChar_Codeset_Translator *wchar_translator)
-  :  ACE_OutputCDR (data,
-                    size,
-                    byte_order,
-                    buffer_allocator,
-                    data_block_allocator,
-                    memcpy_tradeoff)
-{
-  ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR2_ENTER);
-  this->char_translator_ = char_translator;
-  this->wchar_translator_ = wchar_translator;
-}
-
-TAO_OutputCDR::TAO_OutputCDR (ACE_Message_Block *data,
-                              int byte_order,
-                              size_t memcpy_tradeoff,
-                              ACE_Char_Codeset_Translator *char_translator,
-                              ACE_WChar_Codeset_Translator *wchar_translator)
-  :  ACE_OutputCDR (data,
-                    byte_order,
-                    memcpy_tradeoff)
-{
-  ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR3_ENTER);
-  this->char_translator_ = char_translator;
-  this->wchar_translator_ = wchar_translator;
-}
-
-CORBA::TypeCode::traverse_status
-TAO_OutputCDR::encode (CORBA::TypeCode_ptr tc,
-                       const void *data,
-                       const void *data2,
-                       CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Marshal_Object *mobj =
-    TAO_MARSHAL_FACTORY::instance ()->make_marshal_object 
-    (tc, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  if (!mobj)
-    return CORBA::TypeCode::TRAVERSE_STOP;
-
-  return mobj->encode (tc,
-                       data,
-                       data2,
-                       this,
-                       ACE_TRY_ENV);
-}
-
-CORBA::Boolean
-operator<< (TAO_OutputCDR& cdr,
-            const CORBA::Any &x)
-{
-  // @@ This function should *not* use the interpreter, there must be
-  // a way to do this with just CDR operations!!!!
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::TypeCode::traverse_status status =
-        TAO_MARSHAL_ANY::instance ()->encode (0,
-                                              &x,
-                                              0,
-                                              &cdr,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (status== CORBA::TypeCode::TRAVERSE_CONTINUE)
-        return 1;
-      // else return 0 at the end of the function
-    }
-  ACE_CATCH (CORBA_Exception, ex)
-    {
-      return 0;
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-CORBA::Boolean
-operator<< (TAO_OutputCDR& cdr, const CORBA::TypeCode *x)
-{
-  ACE_TRY_NEW_ENV
-    {
-      // @@ This function should *not* use the interpreter, there must
-      // be a way to do this with just CDR operations!!!!
-      CORBA::TypeCode::traverse_status status =
-        TAO_MARSHAL_TYPECODE::instance ()->encode (0,
-                                                   &x,
-                                                   0,
-                                                   &cdr,
-                                                   ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (status == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        return 1;
-      // else return 0 at the end of the function
-    }
-  ACE_CATCH (CORBA_Exception, ex)
-    {
-      return 0;
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-CORBA::TypeCode::traverse_status
-TAO_OutputCDR::append (CORBA::TypeCode_ptr tc,
-                       TAO_InputCDR *src,
-                       CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Marshal_Object *mobj =
-    TAO_MARSHAL_FACTORY::instance ()->make_marshal_object (tc,
-                                                           ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  if (mobj == 0)
-    return CORBA::TypeCode::TRAVERSE_STOP;
-
-  return mobj->append (tc, src, this, ACE_TRY_ENV);
-}
-
-// ****************************************************************
-
-TAO_InputCDR::TAO_InputCDR (const TAO_OutputCDR& rhs,
-                            ACE_Allocator* buffer_allocator,
-                            ACE_Allocator* data_block_allocator,
-                            TAO_ORB_Core* orb_core)
-  : ACE_InputCDR (rhs,
-        buffer_allocator
-          ? buffer_allocator
-          : (orb_core ? orb_core->output_cdr_buffer_allocator () : 0),
-        data_block_allocator
-          ? data_block_allocator
-          : (orb_core ? orb_core->output_cdr_dblock_allocator () :
-             0)),
-    orb_core_ (orb_core)
-{
-  this->init_translators ();
-}
-
-void
-TAO_InputCDR::init_translators (void)
-{
-  if (this->orb_core_ != 0)
-    {
-      this->char_translator_ = this->orb_core_->from_iso8859 ();
-      this->wchar_translator_ = this->orb_core_->from_unicode ();
-    }
-}
-
-CORBA::TypeCode::traverse_status
-TAO_InputCDR::decode (CORBA::TypeCode_ptr tc,
-                      const void *data,
-                      const void *data2,
-                      CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Marshal_Object *mobj =
-    TAO_MARSHAL_FACTORY::instance ()->make_marshal_object 
-    (tc, ACE_TRY_ENV);
-
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  if (!mobj)
-    return CORBA::TypeCode::TRAVERSE_STOP;
-
-  return mobj->decode (tc,
-                       data,
-                       data2,
-                       this,
-                       ACE_TRY_ENV);
-}
-
-CORBA::TypeCode::traverse_status
-TAO_InputCDR::skip (CORBA::TypeCode_ptr tc,
-                    CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Marshal_Object *mobj =
-    TAO_MARSHAL_FACTORY::instance ()->make_marshal_object 
-    (tc, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  if (mobj == 0)
-    return CORBA::TypeCode::TRAVERSE_STOP;
-
-  return mobj->skip (tc,
-                     this,
-                     ACE_TRY_ENV);
-}
-
-CORBA::Boolean
-operator>> (TAO_InputCDR &cdr,
-            CORBA::Any &x)
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::TypeCode::traverse_status status =
-        TAO_MARSHAL_ANY::instance ()->decode (0,
-                                              &x,
-                                              0,
-                                              &cdr,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
-        return 0;
-    }
-  ACE_CATCH (CORBA_Exception, ex)
-    {
-      return 0;
-    }
-  ACE_ENDTRY;
-
-  return 1;
-}
-
-CORBA::Boolean
-operator>> (TAO_InputCDR& cdr, CORBA::TypeCode *&x)
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::TypeCode::traverse_status status =
-        TAO_MARSHAL_TYPECODE::instance ()->decode (0,
-                                                   &x,
-                                                   0,
-                                                   &cdr,
-                                                   ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
-        return 0;
-    }
-  ACE_CATCH (CORBA_Exception, ex)
-    {
-      return 0;
-    }
-  ACE_ENDTRY;
-
-  return 1;
-}
diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h
deleted file mode 100644
index 5023c0284a4..00000000000
--- a/TAO/tao/CDR.h
+++ /dev/null
@@ -1,311 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    CDR.h
-//
-// = DESCRIPTION
-//     Common Data Representation (CDR) marshaling streams.
-//
-//     This implementation assumes that the native numeric
-//     representation is two's complement for integers, IEEE
-//     single/double for floats.  Also that characters are in ISO
-//     Latin/1.
-//
-//     Note that CDR itself makes no such assumptions, but this
-//     implementation makes such assumptions for reasons of
-//     efficiency.  Careful enhancements could preserve that
-//     efficiency where the assumptions are true, yet still allow the
-//     code to work when they aren't true.
-//
-//     The implementation expects that buffers are aligned according
-//     to the strongest CDR alignment restriction.
-//
-//     NOTE: this does everything "CDR 1.1" does ... that is, it
-//     supports the five extended OMG-IDL data types in UNO Appendix
-//     A, which provide richer arithmetic types (64 bit integers,
-//     "quad precision" FP) and UNICODE-based characters and strings.
-//     Those types are not standard parts of OMG-IDL at this time.
-//
-//     THREADING NOTE: CDR data structures must be protected against
-//     concurrent access by their owning thread.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems, Inc.
-//     Many enhancements added by Aniruddha Gokhale and Carlos O'Ryan.
-//
-// ============================================================================
-
-#ifndef TAO_CDR_H
-#define TAO_CDR_H
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Typecode.h"
-
-class TAO_ORB_Core;
-
-class TAO_Export TAO_OutputCDR : public ACE_OutputCDR
-{
-  //
-  // = TITLE
-  //   A CDR stream for writing, i.e. for marshalling.
-  //
-  // = DESCRIPTION
-  //   This class is based on the the CORBA spec for Java (98-02-29),
-  //   java class omg.org.CORBA.portable.OutputStream.
-  //   It diverts in a few ways:
-  //     + Operations taking arrays don't have offsets, because in C++
-  //     it is easier to describe an array starting from x+offset.
-  //     + Operations return an error status, because exceptions are
-  //     not widely available in C++ (yet).
-  //
-  //   A particularly useful static member function for this buffer is
-  //   an interpretive encoding routine, usable as a typecode
-  //   interpreter callback.  Ditto for decoding.  These are used to
-  //   support all OMG-IDL datatypes, even those not supported
-  //   directly by put/get primitives.
-  //
-public:
-  friend class TAO_InputCDR;
-  // For reading from a output CDR stream.
-
-  // The default values for the allocators and memcpy_tradeoff
-  // in these constructors are not 0, but are generated by the
-  // ORB. Refer to the constructor bodies in CDR.cpp for the
-  // code that supplies these values to the base class constructor.
-
-  TAO_OutputCDR (size_t size = 0,
-                 int byte_order = ACE_CDR_BYTE_ORDER,
-                 ACE_Allocator* buffer_allocator = 0,
-                 ACE_Allocator* data_block_allocator = 0,
-                 size_t memcpy_tradeoff = 0,
-                 ACE_Char_Codeset_Translator *char_translator = 0,
-                 ACE_WChar_Codeset_Translator *wchar_translator = 0);
-  // Default constructor, allocates <size> bytes in the internal
-  // buffer, if <size> == 0 it allocates the default size.
-
-  TAO_OutputCDR (char *data,
-                 size_t size,
-                 int byte_order = ACE_CDR_BYTE_ORDER,
-                 ACE_Allocator* buffer_allocator = 0,
-                 ACE_Allocator* data_block_allocator = 0,
-                 size_t memcpy_tradeoff = 0,
-                 ACE_Char_Codeset_Translator *char_translator = 0,
-                 ACE_WChar_Codeset_Translator *wchar_translator = 0);
-  // Build a CDR stream with an initial buffer, it will *not* remove
-  // <data>, since it did not allocated it.
-
-  TAO_OutputCDR (ACE_Message_Block *data,
-                 int byte_order = ACE_CDR_BYTE_ORDER,
-                 size_t memcpy_tradeoff = 0,
-                 ACE_Char_Codeset_Translator *char_translator = 0,
-                 ACE_WChar_Codeset_Translator *wchar_translator = 0);
-  // Build a CDR stream with an initial Message_Block chain, it will *not*
-  // remove <data>, since it did not allocate it.
-
-  ~TAO_OutputCDR (void);
-  // Destructor.
-
-  CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
-                                           TAO_InputCDR *src,
-                                           CORBA_Environment &ACE_TRY_ENV =
-                                           TAO_default_environment ());
-  // Append the contents of the CDR stream based on information
-  // described by <tc>; returning any errors in <ACE_TRY_ENV>.
-
-  // @@ TODO: do we want a special method to write an array of
-  // strings and wstrings?
-
-  // = TAO specific methods.
-
-  CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                           const void *data,
-                                           const void *,
-                                           CORBA_Environment &ACE_TRY_ENV =
-                                           TAO_default_environment ());
-  // Marshalls the contents of <data> as described by the TypeCode in
-  // <tc>. Any errors are reported though the <ACE_TRY_ENV> parameter.
-
-private:
-  TAO_OutputCDR (const TAO_OutputCDR& rhs);
-  TAO_OutputCDR& operator= (const TAO_OutputCDR& rhs);
-  // disallow copying...
-};
-
-class TAO_Export TAO_InputCDR : public ACE_InputCDR
-{
-  //
-  // = TITLE
-  //   A CDR stream for reading, i.e. for demarshalling.
-  //
-  // = DESCRIPTION
-  //   This class is based on the the CORBA spec for Java (98-02-29),
-  //   java class omg.org.CORBA.portable.InputStream.
-  //   It diverts in a few ways:
-  //     + Operations to retrieve basic types take parameters by
-  //     reference.
-  //     + Operations taking arrays don't have offsets, because in C++
-  //     it is easier to describe an array starting from x+offset.
-  //     + Operations return an error status, because exceptions are
-  //     not widely available in C++ (yet).
-  //
-  //   A particularly useful static member function for this buffer is
-  //   an interpretive encoding routine, usable as a typecode
-  //   interpreter callback.  Ditto for decoding.  These are used to
-  //   support all OMG-IDL datatypes, even those not supported
-  //   directly by put/get primitives.
-public:
-  TAO_InputCDR (const char* buf,
-                size_t bufsiz,
-                int byte_order = ACE_CDR_BYTE_ORDER,
-                TAO_ORB_Core* orb_core = 0);
-  // Create an input stream from an arbitrary buffer, care must be
-  // exercised wrt alignment, because this contructor will *not* work
-  // if the buffer is unproperly aligned.
-
-  TAO_InputCDR (size_t bufsiz,
-                int byte_order = ACE_CDR_BYTE_ORDER,
-                TAO_ORB_Core* orb_core = 0);
-  // Create an empty input stream. The caller is responsible for
-  // putting the right data and providing the right alignment.
-
-  TAO_InputCDR (const ACE_Message_Block *data,
-                int byte_order = ACE_CDR_BYTE_ORDER,
-                TAO_ORB_Core* orb_core = 0);
-  // Create an input stream from an ACE_Message_Block
-
-  TAO_InputCDR (ACE_Data_Block *data,
-                int byte_order = ACE_CDR_BYTE_ORDER,
-                TAO_ORB_Core* orb_core = 0);
-  // Create an input stream from an ACE_Data_Block
-
-  TAO_InputCDR (const TAO_InputCDR& rhs);
-  // Make a copy of the current stream state, but does not copy the
-  // internal buffer; so the same stream can be read multiple times
-  // efficiently.
-
-  TAO_InputCDR (const TAO_InputCDR& rhs,
-                size_t size,
-                ACE_CDR::Long offset);
-  // When interpreting indirected TypeCodes it is useful to make a
-  // "copy" of the stream starting in the new position.
-
-  TAO_InputCDR (const TAO_InputCDR& rhs,
-                size_t size);
-  // This creates an encapsulated stream, the first byte must be (per
-  // the spec) the byte order of the encapsulation.  The default
-  // values for the allocators in this constructor are not 0, but are
-  // generated by the ORB. Refer to the constructor body in CDR.cpp
-  // for the code that supplies these values to the base class
-  // constructor.
-
-  TAO_InputCDR (const TAO_OutputCDR& rhs,
-                ACE_Allocator* buffer_allocator = 0,
-                ACE_Allocator* data_block_allocator = 0,
-                TAO_ORB_Core* orb_core = 0);
-  // Create an input CDR from an output CDR.
-
-  ~TAO_InputCDR (void);
-  // destructor
-
-  // = TAO specific methods.
-
-  CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                           const void *data,
-                                           const void *,
-                                           CORBA_Environment &ACE_TRY_ENV =
-                                           TAO_default_environment ());
-  // Demarshall the contents of the CDR stream into <data> as
-  // described by <tc>; returning any errors in <ACE_TRY_ENV>.
-
-  CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                         CORBA_Environment &ACE_TRY_ENV =
-                                         TAO_default_environment ());
-  // Skip the contents of the CDR stream based on information
-  // described by <tc>; returning any errors in <ACE_TRY_ENV>.
-
-  TAO_ORB_Core *orb_core (void) const;
-  // Accessor
-
-private:
-  void init_translators (void);
-
-private:
-  TAO_ORB_Core* orb_core_;
-  // The ORB_Core, required to extract object references.
-};
-
-// This operators are too complex to be inline....
-extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR& cdr,
-                                             const CORBA::Any &x);
-extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR& cdr,
-                                             const CORBA::TypeCode *x);
-
-extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR& cdr,
-                                             CORBA::Any &x);
-extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR& cdr,
-                                             CORBA::TypeCode *&x);
-
-#if defined(__ACE_INLINE__)
-# include "tao/CDR.i"
-#else
-
-// CDR output operators for CORBA types
-
-extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                             CORBA::Short x);
-extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                             CORBA::UShort x);
-extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                             CORBA::Long x);
-extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                             CORBA::ULong x);
-extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                             CORBA::LongLong x);
-extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                             CORBA::ULongLong x);
-extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR& os,
-                                             CORBA::LongDouble x);
-extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                             CORBA::Float x);
-extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                             CORBA::Double x);
-extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                             const CORBA::Char* x);
-
-// CDR input operators for CORBA types
-
-extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                             CORBA::Short &x);
-extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                             CORBA::UShort &x);
-extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                             CORBA::Long &x);
-extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                             CORBA::ULong &x);
-extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                             CORBA::LongLong &x);
-extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                             CORBA::ULongLong &x);
-extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                             CORBA::LongDouble &x);
-extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                             CORBA::Float &x);
-extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                             CORBA::Double &x);
-extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                             CORBA::Char* &x);
-
-#endif /* __ACE_INLINE */
-
-#endif /* TAO_CDR_H */
diff --git a/TAO/tao/CDR.i b/TAO/tao/CDR.i
deleted file mode 100644
index f4d61111e5a..00000000000
--- a/TAO/tao/CDR.i
+++ /dev/null
@@ -1,218 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-ACE_INLINE
-TAO_OutputCDR::~TAO_OutputCDR (void)
-{
-}
-
-ACE_INLINE
-TAO_InputCDR::TAO_InputCDR (const char *buf,
-                            size_t bufsiz,
-                            int byte_order,
-                            TAO_ORB_Core* orb_core)
-  : ACE_InputCDR (buf,
-                  bufsiz,
-                  byte_order),
-    orb_core_ (orb_core)
-{
-  this->init_translators ();
-}
-
-ACE_INLINE
-TAO_InputCDR::TAO_InputCDR (size_t bufsiz,
-                            int byte_order,
-                            TAO_ORB_Core* orb_core)
-  : ACE_InputCDR (bufsiz,
-                  byte_order),
-    orb_core_ (orb_core)
-{
-  this->init_translators ();
-}
-
-ACE_INLINE
-TAO_InputCDR::TAO_InputCDR (const ACE_Message_Block *data,
-                            int byte_order,
-                            TAO_ORB_Core* orb_core)
-  : ACE_InputCDR (data,
-                  byte_order),
-    orb_core_ (orb_core)
-{
-  this->init_translators ();
-}
-
-ACE_INLINE
-TAO_InputCDR::TAO_InputCDR (ACE_Data_Block *data,
-                            int byte_order,
-                            TAO_ORB_Core* orb_core)
-  : ACE_InputCDR (data,
-                  byte_order),
-    orb_core_ (orb_core)
-{
-  this->init_translators ();
-}
-
-ACE_INLINE
-TAO_InputCDR::TAO_InputCDR (const TAO_InputCDR& rhs,
-                            size_t size,
-                            ACE_CDR::Long offset)
-  : ACE_InputCDR (rhs,
-                  size,
-                  offset),
-    orb_core_ (rhs.orb_core_)
-{
-  this->init_translators ();
-}
-
-ACE_INLINE
-TAO_InputCDR::TAO_InputCDR (const TAO_InputCDR& rhs,
-                            size_t size)
-  : ACE_InputCDR (rhs,
-                  size),
-    orb_core_ (rhs.orb_core_)
-{
-  this->init_translators ();
-}
-
-ACE_INLINE
-TAO_InputCDR::TAO_InputCDR (const TAO_InputCDR& rhs)
-  : ACE_InputCDR (rhs),
-    orb_core_ (rhs.orb_core_)
-{
-  this->init_translators ();
-}
-
-ACE_INLINE
-TAO_InputCDR::~TAO_InputCDR (void)
-{
-}
-
-ACE_INLINE TAO_ORB_Core*
-TAO_InputCDR::orb_core (void) const
-{
-  return this->orb_core_;
-}
-
-// ****************************************************************
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                      CORBA::Short x)
-{
-  return ACE_static_cast (ACE_OutputCDR &, os) << x;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                      CORBA::UShort x)
-{
-  return ACE_static_cast (ACE_OutputCDR &, os) << x;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                      CORBA::Long x)
-{
-  return ACE_static_cast (ACE_OutputCDR &, os) << x;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                      CORBA::ULong x)
-{
-  return ACE_static_cast (ACE_OutputCDR &, os) << x;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                      CORBA::LongLong x)
-{
-  return ACE_static_cast (ACE_OutputCDR &, os) << x;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                      CORBA::ULongLong x)
-{
-  return ACE_static_cast (ACE_OutputCDR &, os) << x;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR& os,
-                                      CORBA::LongDouble x)
-{
-  return ACE_static_cast (ACE_OutputCDR &, os) << x;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                      CORBA::Float x)
-{
-  return ACE_static_cast (ACE_OutputCDR &, os) << x;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                      CORBA::Double x)
-{
-  return ACE_static_cast (ACE_OutputCDR &, os) << x;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                      const CORBA::Char* x)
-{
-  return ACE_static_cast (ACE_OutputCDR &, os) << x;
-}
-
-// ****************************************************************
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                      CORBA::Short &x)
-{
-  return ACE_static_cast (ACE_InputCDR &, is) >> x;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                      CORBA::UShort &x)
-{
-  return ACE_static_cast (ACE_InputCDR &, is) >> x;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                      CORBA::Long &x)
-{
-  return ACE_static_cast(ACE_InputCDR&,is) >> x;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                      CORBA::ULong &x)
-{
-  return ACE_static_cast (ACE_InputCDR &, is) >> x;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                      CORBA::LongLong &x)
-{
-  return ACE_static_cast (ACE_InputCDR &, is) >> x;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                      CORBA::ULongLong &x)
-{
-  return ACE_static_cast (ACE_InputCDR &, is) >> x;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                      CORBA::LongDouble &x)
-{
-  return ACE_static_cast (ACE_InputCDR &, is) >> x;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                      CORBA::Float &x)
-{
-  return ACE_static_cast (ACE_InputCDR &, is) >> x;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                      CORBA::Double &x)
-{
-  return ACE_static_cast (ACE_InputCDR &, is) >> x;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                      CORBA::Char* &x)
-{
-  return ACE_static_cast (ACE_InputCDR &, is) >> x;
-}
diff --git a/TAO/tao/CDR_Interpreter.cpp b/TAO/tao/CDR_Interpreter.cpp
deleted file mode 100644
index 70e944d816b..00000000000
--- a/TAO/tao/CDR_Interpreter.cpp
+++ /dev/null
@@ -1,1191 +0,0 @@
-// $Id$
-
-// @(#)interp.cpp       1.4 95/11/04
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-
-// We need to include Sequence.h and Sequence_T.h before the
-// CDR_Interpreter to workaround a Greenhills (1.8.8 and 1.8.9)
-// compiler bug.
-#include "tao/Sequence.h"
-#include "tao/CDR_Interpreter.h"
-#include "tao/Any.h"
-#include "tao/varout.h"
-#include "tao/CDR.h"
-#include "tao/Typecode.h"
-#include "tao/Environment.h"
-#include "tao/Union.h"
-
-ACE_RCSID(tao, CDR_Interpreter, "$Id$")
-
-TAO_CDR_Interpreter::Table_Element
-TAO_CDR_Interpreter::table_[CORBA::TC_KIND_COUNT] =
-{
-  { 0, 1, 0, 0 },                         // CORBA::tk_null
-  { 0, 1, 0, 0 },                         // CORBA::tk_void
-
-  { 0, 1, 0, 0 },                         // CORBA::tk_short
-  { 0, 1, 0, 0 },                         // CORBA::tk_long
-  { 0, 1, 0, 0 },                         // CORBA::tk_ushort
-  { 0, 1, 0, 0 },                         // CORBA::tk_ulong
-
-  { 0, 1, 0, 0 },                         // CORBA::tk_float
-  { 0, 1, 0, 0 },                         // CORBA::tk_double
-
-  { 0, 1, 0, 0 },                         // CORBA::tk_boolean
-  { 0, 1, 0, 0 },                         // CORBA::tk_char
-  { 0, 1, 0, 0 },                         // CORBA::tk_octet
-  { 0, 1, 0, 0 },                         // CORBA::tk_any
-
-  { 0, 1, 0, 0 },                         // CORBA::tk_TypeCode
-  { 0, 1, 0, 0 },                         // CORBA::tk_Principal
-  { 0, 1, 0, skip_encapsulation },        // CORBA::tk_objref
-
-  { 0, 1, calc_struct_attributes, 0 },    // CORBA::tk_struct
-  { 0, 1, calc_union_attributes, 0 },     // CORBA::tk_union
-
-  { 0, 1, 0, skip_encapsulation },        // CORBA::tk_enum
-  { 0, 1, 0, skip_long },                 // CORBA::tk_string
-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-  { 0, 1, calc_seq_attributes, 0 },        // CORBA::tk_sequence
-#else
-  { 0, 1, 0, skip_encapsulation },        // CORBA::tk_sequence
-#endif
-  { 0, 1, calc_array_attributes, 0 },     // CORBA::tk_array
-
-  // = Two TCKind values added in 94-11-7
-  { 0, 1, calc_alias_attributes, 0 },     // CORBA::tk_alias
-  { 0, 1, calc_exception_attributes, 0 }, // CORBA::tk_except
-
-  // = Five extended IDL data types, defined in Appendix A of 94-9-32
-  // but here with different numeric TCKind codes.  These types
-  // represent extensions to CORBA (specifically, to IDL) which are
-  // not yet standardized.
-
-  { 0, 1, 0, 0 },                         // CORBA::tk_longlong
-  { 0, 1, 0, 0 },                         // CORBA::tk_ulonglong
-  { 0, 1, 0, 0 },                         // CORBA::tk_longdouble
-  { 0, 1, 0, 0 },                         // CORBA::tk_wchar
-  { 0, 1, 0, skip_long }                  // CORBA::tk_wstring
-};
-
-// Runtime initialization of the table above; note that this compiles
-// down to a set of assignment statements, with the real work done by
-// the C++ compiler when this file gets compiled.
-//
-// "Natural alignment" is a policy that the processor controls the
-// alignment of data based on its type.  There's variation; some CPUs
-// have a maximum alignment requirement of two or four bytes, others
-// have some type-specific exceptions to the normal "alignment ==
-// size" rule.
-//
-// "Fixed" alignment ignores data type when establishing alignment;
-// not all processors support such policies, and those which do often
-// pay a cost to do so (viz. RISC/CISC discussions).  The primary
-// example of an OS family that chose "fixed" alignment is Microsoft's
-// x86 systems, which normally align on one byte boundaries to promote
-// data space efficiency.
-//
-// NOTE: typical PC compiler options let you specify other alignments,
-// but none are "natural".  Also, they don't apply consistently to all
-// data types.  Change the "one byte" assumption with extreme caution!
-// And make sure all header files (e.g. generated by an IDL compiler)
-// make sure that alignment of IDL-defined data types is consistent
-// (one byte).
-
-typedef TAO_Object_Field_T<CORBA::Object,CORBA::Object_var> TAO_Object_Field_Class;
-
-enum TCKIND
-{
-  tk_null               = 0,
-  tk_void               = 1,
-  tk_short              = 2,
-  tk_long               = 3,
-  tk_ushort             = 4,
-  tk_ulong              = 5,
-  tk_float              = 6,
-  tk_double             = 7,
-  tk_boolean            = 8,
-  tk_char               = 9,
-  tk_octet              = 10,
-  tk_any                = 11,
-  tk_TypeCode           = 12,
-  tk_Principal          = 13,
-  tk_objref             = 14,
-  tk_struct             = 15,
-  tk_union              = 16,
-  tk_enum               = 17,
-  tk_string             = 18,
-  tk_sequence           = 19,
-  tk_array              = 20,
-  tk_alias              = 21,           // 94-11-7
-  tk_except             = 22,           // 94-11-7
-
-  // these five are OMG-IDL data type extensions
-  tk_longlong           = 23,           // 94-9-32 Appendix A (+ 2)
-  tk_ulonglong          = 24,           // 94-9-32 Appendix A (+ 2)
-  tk_longdouble         = 25,           // 94-9-32 Appendix A (+ 2)
-  tk_wchar              = 26,           // 94-9-32 Appendix A (+ 2)
-  tk_wstring            = 27,           // 94-9-32 Appendix A (+ 2)
-
-  // This symbol is not defined by CORBA 2.0.  It's used to speed up
-  // dispatch based on TCKind values, and lets many important ones
-  // just be table lookups.  It must always be the last enum value!!
-
-  TC_KIND_COUNT
-};
-
-#if defined (TAO_HAS_FIXED_BYTE_ALIGNMENT)
-// Have a bogus one
-#define declare_entry(x,t) struct align_struct_ ## t { }
-
-#define setup_entry(x,t) \
-    { \
-      TAO_CDR_Interpreter::table_ [t].size_ = sizeof (x); \
-      TAO_CDR_Interpreter::table_ [t].alignment_ = 1; \
-    }
-#else  /* ! TAO_HAS_FIXED_BYTE_ALIGNMENT */
-  // unix, ACE_WIN32, VXWORKS, __Lynx__, at least
-  #define declare_entry(x,t) \
-    struct align_struct_ ## t \
-    { \
-      x one; \
-      char dummy [TAO_MAXIMUM_NATIVE_TYPE_SIZE + 1 - sizeof(x)]; \
-      x two; \
-    }
-
-  #define setup_entry(x,t) \
-    { \
-      align_struct_ ## t align; \
-      TAO_CDR_Interpreter::table_ [t].size_ = sizeof (x); \
-      TAO_CDR_Interpreter::table_ [t].alignment_ = \
-      (char *) &align.two - (char *) &align.one - TAO_MAXIMUM_NATIVE_TYPE_SIZE; \
-    }
-#endif /* ! TAO_HAS_FIXED_BYTE_ALIGNMENT */
-
-// Fills in fixed size and alignment values.
-
-declare_entry (CORBA::Short, tk_short);
-declare_entry (CORBA::Long, tk_long);
-declare_entry (CORBA::UShort, tk_ushort);
-declare_entry (CORBA::ULong, tk_ulong);
-
-declare_entry (CORBA::Float, tk_float);
-declare_entry (CORBA::Double, tk_double);
-
-declare_entry (CORBA::Boolean, tk_boolean);
-declare_entry (CORBA::Char, tk_char);
-declare_entry (CORBA::Octet, tk_octet);
-declare_entry (CORBA::Any, tk_any);
-
-declare_entry (CORBA::TypeCode_ptr, tk_TypeCode);
-declare_entry (CORBA::Principal_ptr, tk_Principal);
-declare_entry (TAO_Object_Field_Class, tk_objref);
-
-declare_entry (CORBA::String, tk_string);
-#if !defined (TAO_NO_COPY_OCTET_SEQUENCES)
-declare_entry (TAO_opaque, tk_sequence);
-#endif
-
-declare_entry (CORBA::LongLong, tk_longlong);
-declare_entry (CORBA::ULongLong, tk_ulonglong);
-declare_entry (CORBA::LongDouble, tk_longdouble);
-declare_entry (CORBA::WChar, tk_wchar);
-declare_entry (CORBA::WChar*, tk_wstring);
-
-void
-TAO_CDR_Interpreter::init (void)
-{
-  setup_entry (CORBA::Short, tk_short);
-  setup_entry (CORBA::Long, tk_long);
-  setup_entry (CORBA::UShort, tk_ushort);
-  setup_entry (CORBA::ULong, tk_ulong);
-
-  setup_entry (CORBA::Float, tk_float);
-  setup_entry (CORBA::Double, tk_double);
-
-  setup_entry (CORBA::Boolean, tk_boolean);
-  setup_entry (CORBA::Char, tk_char);
-  setup_entry (CORBA::Octet, tk_octet);
-  setup_entry (CORBA::Any, tk_any);
-
-  setup_entry (CORBA::TypeCode_ptr, tk_TypeCode);
-  setup_entry (CORBA::Principal_ptr, tk_Principal);
-  setup_entry (CORBA::Object_ptr, tk_objref);
-  setup_entry (TAO_Object_Field_Class, tk_objref);
-
-  enum generic_enum {a, b, c, d};
-
-  // XXX workaround for G++ 2.6.3 bug
-  // setup_entry (generic_enum, CORBA::tk_enum);
-  TAO_CDR_Interpreter::table_ [CORBA::tk_enum].size_ =
-    sizeof (generic_enum);
-  TAO_CDR_Interpreter::table_ [CORBA::tk_enum].alignment_ =
-    sizeof (generic_enum);
-
-  setup_entry (CORBA::String, tk_string);
-#if !defined (TAO_NO_COPY_OCTET_SEQUENCES)
-  setup_entry (TAO_opaque, tk_sequence);
-#endif /* defined (TAO_NO_COPY_OCTET_SEQUENCES) */
-
-  setup_entry (CORBA::LongLong, tk_longlong);
-  setup_entry (CORBA::ULongLong, tk_ulonglong);
-  setup_entry (CORBA::LongDouble, tk_longdouble);
-  setup_entry (CORBA::WChar, tk_wchar);
-  setup_entry (CORBA::WChar*, tk_wstring);
-}
-
-#undef  setup
-
-CORBA::Boolean
-TAO_CDR_Interpreter::skip_encapsulation (TAO_InputCDR *stream)
-{
-  return stream->skip_string ();
-}
-
-CORBA::Boolean
-TAO_CDR_Interpreter::skip_long (TAO_InputCDR *stream)
-{
-  CORBA::ULong  scratch;
-
-  return stream->read_ulong (scratch);
-}
-
-// For a given typecode, figure out its size and alignment needs.
-// This version is used mostly when traversing other typecodes, and
-// follows these rules:
-//
-// - Some typecodes are illegal (can't be nested inside others);
-// - Indirections are allowed;
-// - The whole typecode (including TCKind enum) is in the stream
-//
-// When the routine returns, the stream has skipped this TypeCode.
-//
-// "size" is returned, "alignment" is an 'out' parameter.  If it is
-// non-null, "tc" is initialized to hold the contents of the TypeCode;
-// it depends on the contents of the original stream to be valid.
-//
-// XXX explore splitting apart returning the size/alignment data and
-// the TypeCode initialization; union traversal would benefit a bit,
-// but it would need more than that to make it as speedy as struct
-// traversal.
-
-size_t
-TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc,
-                                                       TAO_InputCDR *stream,
-                                                       CORBA::TCKind kind,
-                                                       size_t &alignment,
-                                                       CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::ULong temp;
-  // Just a temporary to retrieve CORBA::TCKind variables as ULong's
-
-  // Check for illegal TCKind enum values ... out of range, or which
-  // represent data values that can't be nested.  (Some can't even
-  // exist freestanding!)
-
-  if (kind >= CORBA::TC_KIND_COUNT
-      || kind <= CORBA::tk_void
-      || kind == CORBA::tk_except)
-    {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-    }
-
-  // Use attribute calculator routine if it exists; these are needed
-  // only for variable-sized data types, with encapsulated parameter
-  // lists that affect the size and alignment of "top level" memory
-  // needed to hold an instance of this type.
-
-  if (TAO_CDR_Interpreter::table_[kind].calc_ != 0)
-    {
-      assert (TAO_CDR_Interpreter::table_[kind].size_ == 0);
-
-      // Pull encapsulation length out of the stream.
-      if (stream->read_ulong (temp) == 0)
-        {
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-        }
-
-      // Initialize the TypeCode if requested
-      if (tc)
-        {
-          tc->kind_ = kind;
-          tc->buffer_ = stream->rd_ptr ();
-          tc->length_ = temp;
-        }
-
-      // Set up a separate stream for the parameters; it may easily
-      // have a different byte order, and this is as simple a way as
-      // any to ensure correctness.  Then use the calculator routine
-      // to calculate size and alignment.
-
-      assert (temp <= UINT_MAX);
-
-      TAO_InputCDR nested (*stream, temp);
-
-      if (nested.good_bit () == 0)
-        {
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-        }
-
-      size_t size = TAO_CDR_Interpreter::table_[kind].calc_ (&nested,
-                                                              alignment,
-                                                              ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      // Check for garbage at end of parameter lists, or other cases
-      // where parameters and the size allocated to them don't jive.
-
-      stream->skip_bytes (temp);
-
-      if (stream->rd_ptr () != nested.rd_ptr ())
-        {
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-        }
-      return size;
-    }
-  assert (TAO_CDR_Interpreter::table_[kind].size_ != 0);
-
-  // Reinitialize the TypeCode if requested; this consumes any
-  // TypeCode parameters in the stream.  They only exist for TCKind
-  // values that have parameters, but which represent fixed-size data
-  // types in the binary representation: CORBA::tk_string, CORBA::tk_wstring,
-  // CORBA::tk_objref, CORBA::tk_enum, and CORBA::tk_sequence.
-
-  if (tc)
-    {
-      CORBA::ULong len;
-
-      tc->kind_ = kind;
-      switch (kind)
-        {
-        default:
-          assert (TAO_CDR_Interpreter::table_[kind].skipper_ == 0);
-          break;
-
-        case CORBA::tk_string:
-        case CORBA::tk_wstring:
-          if (stream->read_ulong (len) == 0)
-            {
-              ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-            }
-          tc->length_ = len;
-          break;
-
-        case CORBA::tk_enum:
-        case CORBA::tk_objref:
-        case CORBA::tk_sequence:
-          if (stream->read_ulong (len) == 0)
-            {
-              ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-            }
-          tc->length_ = len;
-
-          assert (len < UINT_MAX);
-          tc->buffer_ = stream->rd_ptr ();
-          stream->skip_bytes (len);
-          break;
-        }
-
-      // Otherwise, consume any parameters without stuffing them into
-      // a temporary TypeCode.
-    }
-  else if (TAO_CDR_Interpreter::table_[kind].skipper_ != 0
-           && TAO_CDR_Interpreter::table_[kind].skipper_ (stream) == 0)
-    {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-    }
-
-  // Return statically known values.
-  alignment = TAO_CDR_Interpreter::table_[kind].alignment_;
-  return TAO_CDR_Interpreter::table_[kind].size_;
-}
-
-size_t
-TAO_CDR_Interpreter::calc_nested_size_and_alignment (CORBA::TypeCode_ptr tc,
-                                                     TAO_InputCDR *stream,
-                                                     size_t &alignment,
-                                                     CORBA::Environment &ACE_TRY_ENV)
-{
-  // Get the "kind" ... if this is an indirection, this is a guess
-  // which will soon be updated.
-  CORBA::ULong temp;
-  if (stream->read_ulong (temp) == 0)
-    {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-    }
-
-  CORBA::TCKind kind = (CORBA::TCKind) temp;
-
-  if (kind != (CORBA::TCKind) ~0u)
-    {
-      return TAO_CDR_Interpreter::calc_nested_size_and_alignment_i
-        (tc,
-         stream,
-         kind,
-         alignment,
-         ACE_TRY_ENV);
-    }
-
-  // Get indirection, sanity check it, set up new stream pointing
-  // there.
-  //
-  // XXX access to "real" size limit for this typecode and use it
-  // to check for errors before indirect and to limit the new
-  // stream's length.  ULONG_MAX is too much!
-
-  // @@ ASG @@ - comparison with -8 or -4. I think the spec says it must be
-  // larger than -4 (absolute value)
-  // 09/04/98 - check this
-  //
-
-  CORBA::Long offset;
-  if (!stream->read_long (offset)
-      || offset >= -4
-      || ((-offset) & 0x03) != 0)
-    {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-    }
-
-  // Notice how we change the sign of the offset to estimate the
-  // maximum size.
-  // Also note that the offset is computed starting from the offset
-  // field. However, by this time, we have already read the offset field i.e.,
-  // we have already moved ahead by 4 bytes (size of CORBA::Long). So we should
-  // increase our offset bythis much amount.
-  //  TAO_InputCDR indirected_stream (*stream, -1*(offset-4), offset-4);
-  ACE_Message_Block *mb = (ACE_Message_Block *)stream->start ();
-  TAO_InputCDR indirected_stream (mb->rd_ptr () + offset - 4,
-                                  -1 * (offset - 4));
-
-  // Fetch indirected-to TCKind.
-  if (!indirected_stream.read_ulong (temp))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-    }
-  kind = (CORBA::TCKind) temp;
-
-  return TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (tc,
-                                                &indirected_stream,
-                                                kind,
-                                                alignment,
-                                                ACE_TRY_ENV);
-}
-
-// Given typecode bytes for a structure (or exception), figure out its
-// alignment and size; return size, alignment is an 'out' parameter.
-// Only "CORBA::tk_struct" (or "CORBA::tk_except") has been taken out of the stream
-// parameter holding the bytes.
-//
-// We use a one-pass algorithm, calculating size and inter-element
-// padding while recording the strongest alignment restriction.  Then
-// we correct the size to account for tail-padding.
-//
-// This routine recognizes that exceptions are just structs with some
-// additional information.  Different environments may differ in what
-// that additional information is, so this routine may need to be
-// taught about compiler-specific representation of that additional
-// "RTTI" data.
-
-size_t
-TAO_CDR_Interpreter::calc_struct_and_except_attributes (TAO_InputCDR *stream,
-                                                        size_t &alignment,
-                                                        CORBA::Boolean is_exception,
-                                                        CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::ULong  members;
-  size_t size;
-
-  // Exceptions are like structs, with key additions (all of which
-  // might need to be be applied to structures!): vtable, typecode,
-  // and refcount.  The size must include these "hidden" members.
-  //
-  // NOTE: in environments with "true" C++ exceptions, there may need
-  // to be a slot for additional "RTTI" information; maybe it is part
-  // of the vtable, or maybe not.  Or, that information (needed to
-  // determine which 'catch' clauses apply) may only be provided by
-  // the compiler to the runtime support for the "throw" statement.
-
-  if (is_exception)
-    {
-      size = sizeof (CORBA::Exception);
-      alignment = TAO_CDR_Interpreter::table_[CORBA::tk_TypeCode].alignment_;
-    }
-  else
-    {
-      alignment = 1;
-      size = 0;
-    }
-
-  // skip rest of header (type ID and name) and collect the number of
-  // struct members
-
-  if (!stream->skip_string ()
-      || !stream->skip_string ()
-      || !stream->read_ulong (members))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-    }
-
-  // Iterate over all the members, skipping their names and looking
-  // only at type data.
-
-  for ( ; members != 0; members--)
-    {
-      size_t member_size;
-      size_t member_alignment;
-
-      // Skip name of the member.
-      if (!stream->skip_string ())
-        {
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-        }
-
-      // Get size and alignment of the member, accounting for
-      // indirection and the various kinds of parameter encoding.
-
-      member_size = calc_nested_size_and_alignment (0,
-                                                    stream,
-                                                    member_alignment,
-                                                    ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      // Round up the struct size to handle member alignment (by
-      // adding internal padding), then update the current size to
-      // handle the member's size.
-
-      size = (size_t) align_binary (size, member_alignment);
-      size += member_size;
-
-      // Finally update the overall structure alignment requirement,
-      // if this element must be more strongly aligned.
-
-      if (member_alignment > alignment)
-        alignment = member_alignment;
-    };
-
-  // Round up the structure size to match its overall alignment.  This
-  // adds tail padding, if needed.
-  return (size_t) align_binary (size, alignment);
-}
-
-// Calculate size and alignment for a structure.
-
-size_t
-TAO_CDR_Interpreter::calc_struct_attributes (TAO_InputCDR *stream,
-                                             size_t &alignment,
-                                             CORBA::Environment &ACE_TRY_ENV)
-{
-  return calc_struct_and_except_attributes (stream,
-                                            alignment,
-                                            0,
-                                            ACE_TRY_ENV);
-}
-
-// Calculate size and alignment for an exception.
-
-size_t
-TAO_CDR_Interpreter::calc_exception_attributes (TAO_InputCDR *stream,
-                                                size_t &alignment,
-                                                CORBA::Environment &ACE_TRY_ENV)
-{
-  return calc_struct_and_except_attributes (stream,
-                                            alignment,
-                                            1,
-                                            ACE_TRY_ENV);
-}
-
-// Calculate and return sizes for both parts of a union, as needed by
-// other code.  Return value is the overall size.  The padded size of
-// the discriminant is needed to traverse the two values separately.
-// Unfortunately that is not quite practical to do with a single pass
-// over the typecode: the inter-element padding changes depending on
-// the strictest alignment required by _any_ arm of the union.
-
-size_t
-TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream,
-                                                size_t &overall_alignment,
-                                                size_t &discrim_size_with_pad,
-                                                CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::ULong members;
-  CORBA::ULong temp;
-  size_t discrim_and_base_size;
-  size_t discrim_and_base_size_with_pad;
-  size_t value_alignment;
-  size_t value_size;
-
-  // Define a dummy structure to compute alignment of pointer type
-  struct align_ptr
-  {
-    void *one;
-    char dummy [TAO_MAXIMUM_NATIVE_TYPE_SIZE + 1 - sizeof (void*)];
-    void *two;
-  };
-  align_ptr ap;
-
-  // The first member of the union internal representation is the VPTR
-  // since every union inherits from TAO_Base_Union
-  overall_alignment =
-    (char *) &ap.two
-    - (char *) &ap.one
-    - TAO_MAXIMUM_NATIVE_TYPE_SIZE;
-
-  value_alignment = 1;
-  value_size = discrim_size_with_pad = 0;
-
-  // Skip initial optional members (type ID and name).
-
-  if (!stream->skip_string ()                   // type ID
-      || !stream->skip_string ())
-    {   // typedef name
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-    }
-
-  // Calculate discriminant size and alignment: it's the first member
-  // of the "struct" representing the union.  We detect illegal
-  // discriminant kinds a bit later.
-
-  CORBA::TypeCode discrim_tc (CORBA::tk_void);
-
-  discrim_and_base_size = sizeof (TAO_Base_Union) +
-    calc_nested_size_and_alignment (&discrim_tc,
-                                    stream,
-                                    value_alignment,
-                                    ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  if (value_alignment > overall_alignment)
-    overall_alignment = value_alignment;
-
-
-  // skip "default used" indicator, and save "member count"
-
-  if (!stream->read_ulong (temp)                 // default used
-      || !stream->read_ulong (members))
-    {   // member count
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-    }
-
-  // iterate over the tuples for all the members; all we care about is
-  // their types, which can affect either alignment or padding
-  // requirement for the union part of the construct.
-
-  value_alignment = 1;
-
-  for ( ; members != 0; members--) {
-    size_t member_size;
-    size_t member_alignment;
-
-    // Skip member label; its size varies with discriminant type, but
-    // here we don't care about its content.  This is where illegal
-    // discriminant kinds are detected.
-    //
-    // NOTE:  This modifies 94-9-32 Appendix A to stipulate that
-    // "long long" values are not legal as discriminants.
-
-    switch (discrim_tc.kind_)
-      {
-      case CORBA::tk_short:
-      case CORBA::tk_ushort:
-      case CORBA::tk_wchar:
-        {
-          CORBA::Short s;
-
-          if (!stream->read_short (s))
-            {
-              ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-            }
-        }
-      break;
-
-      case CORBA::tk_long:
-      case CORBA::tk_ulong:
-      case CORBA::tk_enum:
-        {
-          CORBA::Long l;
-
-          if (!stream->read_long (l))
-            {
-              ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-            }
-        }
-      break;
-
-      case CORBA::tk_boolean:
-      case CORBA::tk_char:
-        {
-          CORBA::Char c;
-
-          if (!stream->read_char (c))
-            {
-              ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-            }
-        }
-      break;
-
-      default:
-        ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-      }
-
-    // We also don't care about any member name.
-
-    if (!stream->skip_string ())
-      {
-        ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-      }
-
-    // Get the member size and alignment.
-    // However, for variable sized member types and types that have
-    // constructors, these become members of the pointer types. We need to
-    // determine if we are dealing with such a member and accordingly adjust
-    // the size and alignment
-    CORBA::Boolean var_sized_member = 0;
-    TAO_InputCDR temp (*stream);
-    if (calc_union_attr_is_var_sized_member (&temp, var_sized_member) == -1)
-      {
-        ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-     }
-
-    if (var_sized_member)
-      {
-        member_size = sizeof (void*);
-        member_alignment = (char *) &ap.two - (char *) &ap.one
-          - TAO_MAXIMUM_NATIVE_TYPE_SIZE;
-        (void) CORBA::TypeCode::skip_typecode (*stream);
-      }
-    else
-      // Proceed with the normal way of computing the size and alignment
-      member_size = calc_nested_size_and_alignment (0,
-                                                    stream,
-                                                    member_alignment,
-                                                    ACE_TRY_ENV);
-    ACE_CHECK_RETURN (0);
-
-    // Save the largest member and alignment.  They don't need to be
-    // changed in sync -- e.g. "long double" size is larger than its
-    // alignment restriction on SPARC, x86, and some m68k platforms.
-    if (member_size > value_size)
-      value_size = member_size;
-
-    if (member_alignment > value_alignment)
-      value_alignment = member_alignment;
-  }
-
-  // Round up the discriminator's size to include padding it needs in
-  // order to be followed by the value.
-  discrim_and_base_size_with_pad =
-    (size_t) align_binary (discrim_and_base_size, value_alignment);
-
-  discrim_size_with_pad = discrim_and_base_size_with_pad -
-    sizeof (TAO_Base_Union);
-
-  // Now calculate the overall size of the structure, which is the
-  // discriminator, inter-element padding, value, and tail padding.
-  // We know all of those except tail padding, which is a function of
-  // the overall alignment.  (Ensures that arrays of these can be
-  // safely allocated and accessed!)
-
-  if (value_alignment > overall_alignment)
-    overall_alignment = value_alignment;
-
-  return (size_t) align_binary (discrim_and_base_size_with_pad + value_size,
-                                overall_alignment);
-}
-
-// Calculate size and alignment for a CORBA discriminated union.
-//
-// Note that this is really a two-element structure.  The first
-// element is the discriminator; the second is the value.  All normal
-// structure padding/alignment rules apply.  In particular, all arms
-// of the union have the same initial address (adequately aligned for
-// any of the members).
-
-size_t
-TAO_CDR_Interpreter::calc_union_attributes (TAO_InputCDR *stream,
-                                            size_t &alignment,
-                                            CORBA::Environment &ACE_TRY_ENV)
-{
-  size_t scratch;
-
-  return calc_key_union_attributes (stream,
-                                    alignment,
-                                    scratch,
-                                    ACE_TRY_ENV);
-}
-
-// Calculate size and alignment for a typedeffed type.
-
-size_t
-TAO_CDR_Interpreter::calc_alias_attributes (TAO_InputCDR *stream,
-                                            size_t &alignment,
-                                            CORBA::Environment &ACE_TRY_ENV)
-{
-  // Skip type ID and name in the parameter stream
-
-  if (!stream->skip_string ()                   // type ID
-      || !stream->skip_string ())               // typedef name
-    {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-    }
-
-  // The typedef is identical to the type for which it stands.
-  return calc_nested_size_and_alignment (0,
-                                         stream,
-                                         alignment,
-                                         ACE_TRY_ENV);
-}
-
-// Calculate size and alignment of an array.  (All such arrays are
-// described as single dimensional, even though the IDL definition may
-// specify a multidimensional array ... such arrays are treated as
-// nested single dimensional arrays.)
-
-size_t
-TAO_CDR_Interpreter::calc_array_attributes (TAO_InputCDR *stream,
-                                            size_t &alignment,
-                                            CORBA::Environment &ACE_TRY_ENV)
-{
-  size_t member_size;
-  CORBA::ULong member_count;
-
-  // get size and alignment of the array member
-
-  member_size = calc_nested_size_and_alignment (0,
-                                                stream,
-                                                alignment,
-                                                ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  // Get and check count of members.
-
-  if (stream->read_ulong (member_count) == 0
-      || member_count > UINT_MAX)
-    {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-    }
-
-  // Array size is a function only of member number and count
-  return member_size * (size_t) member_count;
-}
-
-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-// Calculate size and alignment of a sequence.
-// If octet sequence optimizations are enabled the size of octet
-// sequences differ from the size of a regular sequence.
-
-size_t
-TAO_CDR_Interpreter::calc_seq_attributes (TAO_InputCDR *stream,
-                                          size_t &alignment,
-                                          CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind;
-
-  // Get the "kind" ... if this is an indirection, this is a guess
-  // which will soon be updated.
-  CORBA::ULong temp;
-
-  if (stream->read_ulong (temp) == 0)
-    {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-    }
-
-  if (temp == ~0u)
-    {
-      CORBA::Long offset;
-      if (!stream->read_long (offset)
-          || offset >= -4
-          || ((-offset) & 0x03) != 0)
-        {
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-        }
-
-      // Notice how we change the sign of the offset to estimate the
-      // maximum size.  Also note that the offset is computed starting
-      // from the offset field. However, by this time, we have already
-      // read the offset field i.e., we have already moved ahead by 4
-      // bytes (size of CORBA::Long). So we should increase our offset
-      // by this amount.
-      ACE_Message_Block *mb =
-        (ACE_Message_Block *) stream->start ();
-
-      TAO_InputCDR indirected_stream (mb->rd_ptr () + offset - 4,
-                                      -1 * (offset - 4));
-
-      // Fetch indirected-to TCKind.
-      if (!indirected_stream.read_ulong (temp))
-        {
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-        }
-    }
-
-  kind = ACE_static_cast (CORBA::TCKind, temp);
-
-  // Skip the rest of the stream because we don't use it.
-  if (stream->skip_bytes (stream->length ()) == 0)
-    {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-    }
-
-  size_t size;
-  if (kind == CORBA::tk_octet)
-    {
-      declare_entry (TAO_opaque, tk_sequence);
-      align_struct_tk_sequence align;
-      size = sizeof (TAO_opaque);
-#if defined (TAO_HAS_FIXED_BYTE_ALIGNMENT)
-      alignment = 1;
-#else
-      alignment =
-        (char *) &align.two
-        - (char *) &align.one
-        - TAO_MAXIMUM_NATIVE_TYPE_SIZE;
-#endif /* TAO_HAS_FIXED_BYTE_ALIGNMENT */
-    }
-  else
-    {
-      // Note: GHS can't handle TAO_Unbounded_Sequence<CORBA::Long>
-      // below.  Instead, use TAO_Unbounded_String_Sequence.
-      declare_entry (TAO_Unbounded_String_Sequence,
-                     tk_sequence);
-      size = sizeof (TAO_Unbounded_String_Sequence);
-      align_struct_tk_sequence align;
-#if defined (TAO_HAS_FIXED_BYTE_ALIGNMENT)
-      alignment = 1;
-#else
-      alignment =
-        (char *) &align.two
-        - (char *) &align.one
-        - TAO_MAXIMUM_NATIVE_TYPE_SIZE;
-#endif /* TAO_HAS_FIXED_BYTE_ALIGNMENT */
-    }
-  return size;
-}
-#endif /* defined (TAO_NO_COPY_OCTET_SEQUENCES) */
-
-// Cast the discriminant values to the right type and compare them.
-
-CORBA::Boolean
-TAO_CDR_Interpreter::match_value (CORBA::TCKind kind,
-                                  TAO_InputCDR *tc_stream,
-                                  const void *value,
-                                  CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Boolean retval = 0;
-
-  switch (kind)
-    {
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-      {
-        CORBA::UShort discrim;
-
-        if (tc_stream->read_ushort (discrim) != 0)
-          retval = (discrim == *(CORBA::UShort *)value);
-        else
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-      }
-    break;
-
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-      {
-        CORBA::ULong discrim;
-
-        if (tc_stream->read_ulong (discrim) != 0)
-          retval = (discrim == *(CORBA::ULong *)value);
-        else
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-      }
-    break;
-
-    case CORBA::tk_enum:
-      {
-        CORBA::ULong discrim;
-
-        if (tc_stream->read_ulong (discrim) != 0)
-          retval = (discrim == *(unsigned *)value);
-        else
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-      }
-    break;
-
-    case CORBA::tk_boolean:
-      {
-        CORBA::Boolean discrim;
-
-        if (tc_stream->read_boolean (discrim) != 0)
-          retval = (discrim == *(CORBA::Boolean *)value);
-        else
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-      }
-    break;
-
-    case CORBA::tk_char:
-      {
-        CORBA::Char discrim;
-
-        if (tc_stream->read_char (discrim) != 0)
-          retval = (discrim == *(CORBA::Char *)value);
-        else
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-      }
-    break;
-
-    case CORBA::tk_wchar:
-      {
-        CORBA::WChar discrim;
-
-        if (tc_stream->read_wchar (discrim) != 0)
-          retval = (discrim == *(CORBA::WChar *)value);
-        else
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-      }
-    break;
-
-    default:
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-    }
-
-  return retval;
-}
-
-int
-TAO_CDR_Interpreter::calc_union_attr_is_var_sized_member
-  (TAO_InputCDR *stream,
-   CORBA::Boolean &flag)
-{
-    CORBA::ULong temp;
-    flag = 0;
-
-    // Get the tk_ "kind"  field
-    if (stream->read_ulong (temp) == 0)
-      // Error.
-    return -1;
-
-  CORBA::TCKind kind = (CORBA::TCKind) temp;
-
-  switch (kind)
-    {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-      // error
-      return -1;
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-    case CORBA::tk_float:
-    case CORBA::tk_double:
-    case CORBA::tk_longdouble:
-    case CORBA::tk_boolean:
-    case CORBA::tk_char:
-    case CORBA::tk_wchar:
-    case CORBA::tk_octet:
-    case CORBA::tk_enum:
-    case CORBA::tk_Principal:
-      // not variable sized
-      return 0;
-    case CORBA::tk_any:
-    case CORBA::tk_TypeCode:
-    case CORBA::tk_objref:
-    case CORBA::tk_union:
-    case CORBA::tk_string:
-    case CORBA::tk_wstring:
-    case CORBA::tk_sequence:
-    case CORBA::tk_array:
-    case CORBA::tk_except:
-      // always variable sized
-      flag = 1;
-      return 0;
-    case CORBA::tk_alias:
-      // find out what its base says
-      {
-        CORBA::ULong encap;
-
-        // Pull encapsulation length out of the stream.
-        if (stream->read_ulong (encap) == 0)
-          return -1;
-
-        assert (encap <= UINT_MAX);
-
-        TAO_InputCDR nested (*stream, temp);
-
-        if (nested.good_bit () == 0)
-          return -1;
-
-        // Skip type ID and name in the parameter stream
-        if (!nested.skip_string ()                   // type ID
-            || !nested.skip_string ())               // typedef name
-          return -1;
-
-        //        stream->skip_bytes (encap);
-        return calc_union_attr_is_var_sized_member (&nested,
-                                                flag);
-      }
-      ACE_NOTREACHED (break);
-    case CORBA::tk_struct:
-      // explore further based on members
-      {
-        CORBA::ULong encap;
-
-        // Pull encapsulation length out of the stream.
-        if (stream->read_ulong (encap) == 0)
-          return -1;
-
-        assert (encap <= UINT_MAX);
-
-        TAO_InputCDR nested (*stream, temp);
-
-        if (nested.good_bit () == 0)
-          return -1;
-
-        //        stream.skip_bytes (encap);
-        // Skip type ID and name in the parameter stream
-        if (!nested.skip_string ()                   // type ID
-            || !nested.skip_string ())               // typedef name
-          return -1;
-
-        CORBA::ULong member_count;
-        if (nested.read_ulong (member_count) == 0)
-          return -1;
-
-        for (CORBA::ULong i = 0; i < member_count && !flag; i++)
-          {
-            // Stop this loop the moment we discover that a member is
-            // variable in size.
-
-            // skip the name
-            if (nested.skip_string () == 0)
-              return -1;
-
-            TAO_InputCDR member_tc (nested);
-            if (calc_union_attr_is_var_sized_member (&member_tc,
-                                                 flag) == -1)
-              return -1;
-
-            CORBA::TypeCode::skip_typecode (nested);
-          }
-
-        return flag;
-      }
-    ACE_NOTREACHED (break);
-    case ~0:
-      // TO-DO
-      return 0;
-    default:
-      // error
-      return -1;
-    }
-
-  // cannot reach here
-  ACE_NOTREACHED (return -1);
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class TAO_Unbounded_Sequence<CORBA::Long>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Unbounded_Sequence<CORBA::Long>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/CDR_Interpreter.h b/TAO/tao/CDR_Interpreter.h
deleted file mode 100644
index 027cf34ee02..00000000000
--- a/TAO/tao/CDR_Interpreter.h
+++ /dev/null
@@ -1,276 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    CDR_Interpreter.h
-//
-// = DESCRIPTION
-//    Header file for TAO's CDR interpreter.
-//
-// = AUTHOR
-//     Douglas C. Schmidt
-//
-// ============================================================================
-
-#ifndef TAO_CDR_INTERPRETER_H
-#define TAO_CDR_INTERPRETER_H
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// Useful typedefs.
-typedef size_t TAO_attribute_calculator (TAO_InputCDR *stream,
-                                         size_t &alignment,
-                                         CORBA_Environment &ACE_TRY_ENV);
-typedef CORBA::Boolean TAO_param_skip_rtn (TAO_InputCDR *);
-
-class TAO_Export TAO_CDR_Interpreter
-{
-  // = TITLE
-  //   TAO's CORBA TypeCode interpreter, which traverses GIOP/CDR
-  //   data structures.
-  //
-  // = DESCRIPTION
-  //   This uses the standard C/C++ representation for data, and knows
-  //   how to do things like align and pad according to standard
-  //   rules.  It is driven by CDR marshaled representations of
-  //   TypeCodes.
-  //
-  //   It does two key things: (a) calculate size and alignment
-  //   restrictions for the data type described by any given typecode;
-  //   and (b) "visits" each element of a data type in the order those
-  //   elements are defined in the type's IDL definition.
-  //
-  //   A typical use is that some application-specific "visit"
-  //   function will be called with a typecode and data value.  Then
-  //   that "visit" function may choose to use the interpreter's
-  //   knowledge of the environment's size, padding, and alignment
-  //   rules to help it examine each of the constituents of complex
-  //   data values.  It does so by making a call to
-  //   <TypeCode::traverse>, and passing itself for future recursive
-  //   calls.
-  //
-  //   NOTE that this module has system dependent parts, and so should
-  //   be examined when porting to new CPU architectures, compilers,
-  //   and so forth to make sure it correctly implements the
-  //   appropriate binary interfaces.
-  //
-  //   Issues of concern are primarily that sizes and representations
-  //   of CORBA primitive data types are correct (key issues are
-  //   verified when the ORB initializes) and that the alignment rules
-  //   are recognized.
-  //
-  //   Also, exceptions have vtables in them, which may cause trouble
-  //   if they aren't located at the very beginning by the compiler in
-  //   question.
-  //
-  //   So for example, moving to another CPU architecture which still
-  //   uses standard sized two's complement integers and IEEE floating
-  //   point, and expects "natural" alignment, won't be hard.  Even
-  //   using PC style tightly packed data is simple; the alignment
-  //   rules are just simpler.  Most volume microprocessors used in
-  //   1995 are correctly supported.
-  //
-  //   Using data representations that are far from the standard C/C++
-  //   style data layout is probably not practical with this
-  //   implementation.  LISP systems, as one example, probably won't
-  //   use "in-memory" representations much like C/C++, even though
-  //   its "wire form" could directly match CDR.
-  //
-  //   ALSO, the treatment of exceptions may need to be examined in
-  //   language environments which actually rely on C++ exceptions.
-  //   The RTTI data that identifies exceptions can easily be ignored
-  //   by this interpreter (if it's taught about that compiler's RTTI)
-  //   but it may not be practical for any code not generated by that
-  //   specific C++ compiler to store such data in the right place to
-  //   look like a C++ exception, or to throw exceptions when that's
-  //   needed.  (RTTI == "Run Time Typing Information", needed to make
-  //   C++ exceptions work correctly and partially exposed to users by
-  //   the ANSI standards comittee.  It provides type-safe
-  //   "downcasting" and other features previously unavailable in
-  //   C++.)
-  //
-  //   THREADING NOTE: Data structures being traversed should only be
-  //   modified by the thread doing the traversal.  The interpretive
-  //   code itself is reentrant (recursive!) so presents no threading
-  //   issues; only the data being fed to the interpreter must be
-  //   protected against concurrency.
-public:
-  static void init (void);
-  // Initialize TAO's TypeCode table.
-
-  static size_t calc_nested_size_and_alignment (CORBA::TypeCode_ptr tc,
-                                                TAO_InputCDR *original_stream,
-                                                size_t &alignment,
-                                                CORBA_Environment &ACE_TRY_ENV =
-                                                  TAO_default_environment ());
-  static size_t calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc,
-                                                  TAO_InputCDR *stream,
-                                                  CORBA::TCKind kind,
-                                                  size_t &alignment,
-                                                  CORBA_Environment &ACE_TRY_ENV =
-                                                    TAO_default_environment ());
-  // For a given typecode, figure out its size and alignment needs.
-  // This version is used mostly when traversing other typecodes, and
-  // follows these rules:
-  //
-  // - Some typecodes are illegal (can't be nested inside others);
-  // - Indirections are allowed;
-  // - The whole typecode (including TCKind enum) is in the stream
-  //
-  // When the routine returns, the stream has skipped this TypeCode.
-  //
-  // "size" is returned, "alignment" is an 'out' parameter.  If it is
-  // non-null, "tc" is initialized to hold the contents of the TypeCode;
-  // it depends on the contents of the original stream to be valid.
-  //
-  // The _i routine encapsulates some common code for the case were an
-  // indirected TypeCode is in use.
-  //
-  // @@ explore splitting apart returning the size/alignment data and
-  // the TypeCode initialization; union traversal would benefit a bit,
-  // but it would need more than that to make it as speedy as struct
-  // traversal.
-
-  // = Static visitor methods.
-
-  // These methods manipulate CDR-encapsulated TypeCode parameter
-  // lists, calculating the size and alignment of the data type being
-  // described.  The TCKind value has always been removed from the CDR
-  // stream when these calculator routines get called.
-
-  static size_t calc_struct_and_except_attributes (TAO_InputCDR *stream,
-                                                   size_t &alignment,
-                                                   CORBA::Boolean is_exception,
-                                                   CORBA_Environment &ACE_TRY_ENV =
-                                                    TAO_default_environment ());
-  // Given typecode bytes for a structure (or exception), figure out
-  // its alignment and size; return size, alignment is an 'out'
-  // parameter.  Only "CORBA::tk_struct" (or "CORBA::tk_except") has
-  // been taken out of the stream parameter holding the bytes.
-  //
-  // We use a one-pass algorithm, calculating size and inter-element
-  // padding while recording the strongest alignment restriction.
-  // Then we correct the size to account for tail-padding.
-  //
-  // This routine recognizes that exceptions are just structs with
-  // some additional information.  Different environments may differ
-  // in what that additional information is, so this routine may need
-  // to be taught about compiler-specific representation of that
-  // additional "RTTI" data.
-
-  static size_t calc_struct_attributes (TAO_InputCDR *stream,
-                                        size_t &alignment,
-                                        CORBA_Environment &ACE_TRY_ENV =
-                                          TAO_default_environment ());
-  // Calculate size and alignment for a structure.
-
-
-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-  static size_t calc_seq_attributes (TAO_InputCDR *stream,
-                                     size_t &alignment,
-                                     CORBA_Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ());
-  // Calculate size and alignment for a sequence, most of them have
-  // the same requirements, but for the sequences of Octets that are
-  // optimized to minimize copying.
-#endif /* defined (TAO_NO_COPY_OCTET_SEQUENCES) */
-
-  static size_t calc_exception_attributes (TAO_InputCDR *stream,
-                                           size_t &alignment,
-                                           CORBA_Environment &ACE_TRY_ENV =
-                                            TAO_default_environment ());
-  // Calculate size and alignment for an exception.
-
-
-  static size_t calc_union_attributes (TAO_InputCDR *stream,
-                                       size_t &alignment,
-                                       CORBA_Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ());
-  // Calculate size and alignment for a CORBA discriminated union.
-  //
-  // Note that this is really a two-element structure.  The first
-  // element is the discriminator; the second is the value.  All normal
-  // structure padding/alignment rules apply.  In particular, all arms
-  // of the union have the same initial address (adequately aligned for
-  // any of the members).
-
-
-  static size_t calc_alias_attributes (TAO_InputCDR *stream,
-                                       size_t &alignment,
-                                       CORBA_Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ());
-  // Calculate size and alignment for a typedeffed type.
-
-  static size_t calc_array_attributes (TAO_InputCDR *stream,
-                                       size_t &alignment,
-                                       CORBA_Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ());
-  // Calculate size and alignment of an array.  (All such arrays are
-  // described as single dimensional, even though the IDL definition
-  // may specify a multidimensional array ... such arrays are treated
-  // as nested single dimensional arrays.)
-
-  static CORBA::Boolean match_value (CORBA::TCKind kind,
-                                     TAO_InputCDR *tc_stream,
-                                     const void *value,
-                                     CORBA_Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ());
-  // Cast the discriminant values to the right type and compare them.
-
-  static size_t
-  calc_key_union_attributes (TAO_InputCDR *stream,
-                             size_t &overall_alignment,
-                             size_t &discrim_size_with_pad,
-                             CORBA_Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-
-
-  // = Utility routine that checks if a union member is a variable sized type
-  // (and hence is a pointer)
-  static int calc_union_attr_is_var_sized_member (TAO_InputCDR *temp,
-                                                  CORBA::Boolean &flag);
-
-  // = Utility routines that skip unneeded parameter lists.
-  static CORBA::Boolean skip_encapsulation (TAO_InputCDR *stream);
-  static CORBA::Boolean skip_long (TAO_InputCDR *stream);
-
-  struct Table_Element
-  {
-    size_t size_;
-    size_t alignment_;
-    TAO_attribute_calculator *calc_;
-    TAO_param_skip_rtn *skipper_;
-  };
-
-  static Table_Element table_[CORBA::TC_KIND_COUNT];
-  // Table supporting calculation of size and alignment requirements
-  // for any one instance of a given data types.
-  //
-  // This is indexed via CDR's TCKind values, which are "frozen" as
-  // part of the CDR standard.  Entries hold either the size and
-  // alignment values for that data type, or a pointer to a function
-  // that is used to calculate those values.  Function pointers are
-  // normally needed only for constructed types.
-  //
-  // A "skipper" routine is provided for some data types whose size is
-  // known statically (e.g. objrefs, structures, strings) but whose
-  // typecodes have parameters that sometimes need to be ignored when
-  // found in a CDR stream.  Any attribute calculator routine always
-  // skips parameters in the CDR input stream, so no type with such a
-  // routine also needs a "skipper".
-  //
-  // Rather than growing a set of processor-specific #ifdefs, we
-  // calculate most of this table (except functions) at ORB
-  // initialization time.
-};
-
-#endif /* TAO_CDR_INTERPRETER_H */
diff --git a/TAO/tao/CONV_FRAME.pidl b/TAO/tao/CONV_FRAME.pidl
deleted file mode 100644
index 64ef31c26b4..00000000000
--- a/TAO/tao/CONV_FRAME.pidl
+++ /dev/null
@@ -1,24 +0,0 @@
-// $Id$
-
-#pragma prefix "omg.org"
-
-module CONV_FRAME {
-  typedef unsigned long CodeSetId;
-
-  struct CodeSetComponent {
-     CodeSetId native_code_set;
-     sequence<CodeSetId> conversion_code_sets;
-  };
-
-  struct CodeSetComponentInfo {
-     CodeSetComponent ForCharData;
-     CodeSetComponent ForWcharData;
-  };
-
-  struct CodeSetContext {
-     CodeSetId char_data;
-     CodeSetId wchar_data;
-  };
-};
-
-#pragma prefix ""
diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp
deleted file mode 100644
index 8b8974683a2..00000000000
--- a/TAO/tao/CONV_FRAMEC.cpp
+++ /dev/null
@@ -1,494 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   CONV_FRAME.cpp
-//
-// = DESCRIPTION
-//   Generated from CONV_FRAME.pidl, that contains the OMG standarized
-//   CONV_FRAME module.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#include "CONV_FRAMEC.h"
-#include "tao/Any.h"
-
-#if !defined (__ACE_INLINE__)
-#include "CONV_FRAMEC.i"
-#endif /* !defined INLINE */
-
-static const CORBA::Long _oc_CONV_FRAME_CodeSetId[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-  10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-  CORBA::tk_ulong,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetId (CORBA::tk_alias, sizeof (_oc_CONV_FRAME_CodeSetId), (char *) &_oc_CONV_FRAME_CodeSetId, 0, sizeof (CONV_FRAME::CodeSetId));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CONV_FRAME)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_CodeSetId, &_tc_TAO_tc_CONV_FRAME_CodeSetId)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_CONV_FRAME_CodeSetComponent[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  44, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x6574436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0
-  17, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657443), ACE_NTOHL (0x6f6d706f), ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x0),  // name = CodeSetComponent
-  2, // member count
-  16, ACE_NTOHL (0x6e617469), ACE_NTOHL (0x76655f63), ACE_NTOHL (0x6f64655f), ACE_NTOHL (0x73657400),  // name = native_code_set
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-    10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-    CORBA::tk_ulong,
-
-
-  21, ACE_NTOHL (0x636f6e76), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5f63), ACE_NTOHL (0x6f64655f), ACE_NTOHL (0x73657473), ACE_NTOHL (0x0),  // name = conversion_code_sets
-  CORBA::tk_sequence, // typecode kind
-  84, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_alias, // typecode kind for typedefs
-    68, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-      10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-      CORBA::tk_ulong,
-
-
-    0,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetComponent (CORBA::tk_struct, sizeof (_oc_CONV_FRAME_CodeSetComponent), (char *) &_oc_CONV_FRAME_CodeSetComponent, 0, sizeof (CONV_FRAME::CodeSetComponent));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CONV_FRAME)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_CodeSetComponent, &_tc_TAO_tc_CONV_FRAME_CodeSetComponent)
-TAO_NAMESPACE_END
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CS_
-
-  void
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA::ULong* tmp = CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (length);
-
-    if (this->buffer_ != 0)
-    {
-      CORBA::ULong *old = ACE_reinterpret_cast (CORBA::ULong *,this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-
-      if (this->release_)
-        CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (old);
-
-    }
-    this->buffer_ = tmp;
-  }
-
-  void
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-
-    CORBA::ULong *tmp = ACE_reinterpret_cast (CORBA::ULong *,this->buffer_);
-
-    CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (tmp);
-    this->buffer_ = 0;
-  }
-
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::~_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (void) // Dtor.
-  {
-    this->_deallocate_buffer ();
-  }
-
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CS_)
-#define _CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CS_
-
-// *************************************************************
-// CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId
-// *************************************************************
-
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId (void)
-{}
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId (CORBA::ULong max) // uses max size
-  :
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ULong>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- (max)
-{}
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId (CORBA::ULong max, CORBA::ULong length, CORBA::ULong *buffer, CORBA::Boolean release)
-  :
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ULong>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- (max, length, buffer, release)
-{}
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId (const _tao_seq_CodeSetId &seq) // copy ctor
-  :
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ULong>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- (seq)
-{}
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::~_tao_seq_CodeSetId (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-static const CORBA::Long _oc_CONV_FRAME_CodeSetComponentInfo[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  48, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x6574436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e7449), ACE_NTOHL (0x6e666f3a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponentInfo:1.0
-  21, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657443), ACE_NTOHL (0x6f6d706f), ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x496e666f), ACE_NTOHL (0x0),  // name = CodeSetComponentInfo
-  2, // member count
-  12, ACE_NTOHL (0x466f7243), ACE_NTOHL (0x68617244), ACE_NTOHL (0x61746100),  // name = ForCharData
-  CORBA::tk_struct, // typecode kind
-  296, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    44, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x6574436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0
-    17, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657443), ACE_NTOHL (0x6f6d706f), ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x0),  // name = CodeSetComponent
-    2, // member count
-    16, ACE_NTOHL (0x6e617469), ACE_NTOHL (0x76655f63), ACE_NTOHL (0x6f64655f), ACE_NTOHL (0x73657400),  // name = native_code_set
-    CORBA::tk_alias, // typecode kind for typedefs
-    68, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-      10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-      CORBA::tk_ulong,
-
-
-    21, ACE_NTOHL (0x636f6e76), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5f63), ACE_NTOHL (0x6f64655f), ACE_NTOHL (0x73657473), ACE_NTOHL (0x0),  // name = conversion_code_sets
-    CORBA::tk_sequence, // typecode kind
-    84, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-        10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-        CORBA::tk_ulong,
-
-
-      0,
-
-
-  13, ACE_NTOHL (0x466f7257), ACE_NTOHL (0x63686172), ACE_NTOHL (0x44617461), ACE_NTOHL (0x0),  // name = ForWcharData
-  CORBA::tk_struct, // typecode kind
-  296, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    44, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x6574436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0
-    17, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657443), ACE_NTOHL (0x6f6d706f), ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x0),  // name = CodeSetComponent
-    2, // member count
-    16, ACE_NTOHL (0x6e617469), ACE_NTOHL (0x76655f63), ACE_NTOHL (0x6f64655f), ACE_NTOHL (0x73657400),  // name = native_code_set
-    CORBA::tk_alias, // typecode kind for typedefs
-    68, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-      10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-      CORBA::tk_ulong,
-
-
-    21, ACE_NTOHL (0x636f6e76), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5f63), ACE_NTOHL (0x6f64655f), ACE_NTOHL (0x73657473), ACE_NTOHL (0x0),  // name = conversion_code_sets
-    CORBA::tk_sequence, // typecode kind
-    84, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-        10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-        CORBA::tk_ulong,
-
-
-      0,
-
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetComponentInfo (CORBA::tk_struct, sizeof (_oc_CONV_FRAME_CodeSetComponentInfo), (char *) &_oc_CONV_FRAME_CodeSetComponentInfo, 0, sizeof (CONV_FRAME::CodeSetComponentInfo));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CONV_FRAME)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_CodeSetComponentInfo, &_tc_TAO_tc_CONV_FRAME_CodeSetComponentInfo)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_CONV_FRAME_CodeSetContext[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  42, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x6574436f), ACE_NTOHL (0x6e746578), ACE_NTOHL (0x743a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetContext:1.0
-  15, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657443), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78740000),  // name = CodeSetContext
-  2, // member count
-  10, ACE_NTOHL (0x63686172), ACE_NTOHL (0x5f646174), ACE_NTOHL (0x61000000),  // name = char_data
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-    10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-    CORBA::tk_ulong,
-
-
-  11, ACE_NTOHL (0x77636861), ACE_NTOHL (0x725f6461), ACE_NTOHL (0x74610000),  // name = wchar_data
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-    10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-    CORBA::tk_ulong,
-
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetContext (CORBA::tk_struct, sizeof (_oc_CONV_FRAME_CodeSetContext), (char *) &_oc_CONV_FRAME_CodeSetContext, 0, sizeof (CONV_FRAME::CodeSetContext));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CONV_FRAME)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_CodeSetContext, &_tc_TAO_tc_CONV_FRAME_CodeSetContext)
-TAO_NAMESPACE_END
-void operator<<= (CORBA::Any &_tao_any, const CONV_FRAME::CodeSetComponent &_tao_elem) // copying
-{
-  CONV_FRAME::CodeSetComponent *_any_val;
-  ACE_NEW (_any_val, CONV_FRAME::CodeSetComponent (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CONV_FRAME::_tc_CodeSetComponent, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CONV_FRAME::CodeSetComponent *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CONV_FRAME::_tc_CodeSetComponent, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CONV_FRAME::CodeSetComponent *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CONV_FRAME::_tc_CodeSetComponent, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CONV_FRAME::CodeSetComponent *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CONV_FRAME::CodeSetComponent, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CONV_FRAME::_tc_CodeSetComponent, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CONV_FRAME::_tc_CodeSetComponent, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const CONV_FRAME::CodeSetComponentInfo &_tao_elem) // copying
-{
-  CONV_FRAME::CodeSetComponentInfo *_any_val;
-  ACE_NEW (_any_val, CONV_FRAME::CodeSetComponentInfo (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CONV_FRAME::_tc_CodeSetComponentInfo, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CONV_FRAME::CodeSetComponentInfo *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CONV_FRAME::_tc_CodeSetComponentInfo, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CONV_FRAME::CodeSetComponentInfo *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CONV_FRAME::_tc_CodeSetComponentInfo, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CONV_FRAME::CodeSetComponentInfo *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CONV_FRAME::CodeSetComponentInfo, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CONV_FRAME::_tc_CodeSetComponentInfo, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CONV_FRAME::_tc_CodeSetComponentInfo, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const CONV_FRAME::CodeSetContext &_tao_elem) // copying
-{
-  CONV_FRAME::CodeSetContext *_any_val;
-  ACE_NEW (_any_val, CONV_FRAME::CodeSetContext (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CONV_FRAME::_tc_CodeSetContext, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CONV_FRAME::CodeSetContext *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CONV_FRAME::_tc_CodeSetContext, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CONV_FRAME::CodeSetContext *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CONV_FRAME::_tc_CodeSetContext, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CONV_FRAME::CodeSetContext *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CONV_FRAME::CodeSetContext, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CONV_FRAME::_tc_CodeSetContext, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CONV_FRAME::_tc_CodeSetContext, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  }
-  return 0; // error
-}
diff --git a/TAO/tao/CONV_FRAMEC.h b/TAO/tao/CONV_FRAMEC.h
deleted file mode 100644
index ccfed2dbb0b..00000000000
--- a/TAO/tao/CONV_FRAMEC.h
+++ /dev/null
@@ -1,368 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   CONV_FRAMEC.h
-//
-// = DESCRIPTION
-//   Generated from CONV_FRAME.pidl, that contains the OMG standarized
-//   CONV_FRAME module.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#ifndef TAO_CONV_FRAMEC_H
-#define TAO_CONV_FRAMEC_H
-
-#include "tao/CDR.h"
-#include "tao/Sequence.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-TAO_NAMESPACE  CONV_FRAME
-{
-  typedef CORBA::ULong CodeSetId;
-  typedef CORBA::ULong_out CodeSetId_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_CodeSetId;
-
-  struct TAO_Export CodeSetComponent
-  {
-    CodeSetId native_code_set;
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CH_
-
-      class _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId : public TAO_Unbounded_Base_Sequence
-      {
-      public:
-        // = Initialization and termination methods.
-
-        _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (void); // Default constructor.
-        _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (CORBA::ULong maximum);
-        _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (CORBA::ULong maximum,
-          CORBA::ULong length,
-          CORBA::ULong *data,
-          CORBA::Boolean release = 0);
-        _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (const _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &rhs);
-        _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &operator= (const _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &rhs);
-        virtual ~_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (void); // Dtor.
-        // = Accessors.
-        CORBA::ULong &operator[] (CORBA::ULong i);
-        const CORBA::ULong &operator[] (CORBA::ULong i) const;
-        // = Static operations.
-        static CORBA::ULong *allocbuf (CORBA::ULong size);
-        static void freebuf (CORBA::ULong *buffer);
-        virtual void _allocate_buffer (CORBA::ULong length);
-        virtual void _deallocate_buffer (void);
-        // Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-        CORBA::ULong *get_buffer (CORBA::Boolean orphan = 0);
-        const CORBA::ULong *get_buffer (void) const;
-        void replace (CORBA::ULong max,
-          CORBA::ULong length,
-          CORBA::ULong *data,
-          CORBA::Boolean release);
-      };
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CH_)
-#define _CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CH_
-
-    // *************************************************************
-    // _tao_seq_CodeSetId
-    // *************************************************************
-
-    class TAO_Export _tao_seq_CodeSetId : public
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-      _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-      TAO_Unbounded_Sequence<CORBA::ULong>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-    {
-    public:
-      _tao_seq_CodeSetId (void); // default ctor
-      _tao_seq_CodeSetId (CORBA::ULong max); // uses max size
-      _tao_seq_CodeSetId (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::ULong *buffer,
-        CORBA::Boolean release=0
-      );
-      _tao_seq_CodeSetId (const _tao_seq_CodeSetId &); // copy ctor
-      ~_tao_seq_CodeSetId (void); // dtor
-    };
-    typedef _tao_seq_CodeSetId *_tao_seq_CodeSetId_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID___VAR_CH_)
-#define _CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID___VAR_CH_
-
-// *************************************************************
-    // class CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var
-    // *************************************************************
-
-    class TAO_Export _tao_seq_CodeSetId_var
-    {
-    public:
-      _tao_seq_CodeSetId_var (void); // default constructor
-      _tao_seq_CodeSetId_var (_tao_seq_CodeSetId *);
-      _tao_seq_CodeSetId_var (const _tao_seq_CodeSetId_var &); // copy constructor
-      ~_tao_seq_CodeSetId_var (void); // destructor
-
-      _tao_seq_CodeSetId_var &operator= (_tao_seq_CodeSetId *);
-      _tao_seq_CodeSetId_var &operator= (const _tao_seq_CodeSetId_var &);
-      _tao_seq_CodeSetId *operator-> (void);
-      const _tao_seq_CodeSetId *operator-> (void) const;
-
-      operator const _tao_seq_CodeSetId &() const;
-      operator _tao_seq_CodeSetId &();
-      operator _tao_seq_CodeSetId &() const;
-      CodeSetId &operator[] (CORBA::ULong index);
-      // in, inout, out, _retn
-      const _tao_seq_CodeSetId &in (void) const;
-      _tao_seq_CodeSetId &inout (void);
-      _tao_seq_CodeSetId *&out (void);
-      _tao_seq_CodeSetId *_retn (void);
-      _tao_seq_CodeSetId *ptr (void) const;
-
-    private:
-      _tao_seq_CodeSetId *ptr_;
-    };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID___OUT_CH_)
-#define _CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID___OUT_CH_
-
-    class TAO_Export _tao_seq_CodeSetId_out
-    {
-    public:
-      _tao_seq_CodeSetId_out (_tao_seq_CodeSetId *&);
-      _tao_seq_CodeSetId_out (_tao_seq_CodeSetId_var &);
-      _tao_seq_CodeSetId_out (const _tao_seq_CodeSetId_out &);
-      _tao_seq_CodeSetId_out &operator= (const _tao_seq_CodeSetId_out &);
-      _tao_seq_CodeSetId_out &operator= (_tao_seq_CodeSetId *);
-      operator _tao_seq_CodeSetId *&();
-      _tao_seq_CodeSetId *&ptr (void);
-      _tao_seq_CodeSetId *operator-> (void);
-      CodeSetId &operator[] (CORBA::ULong index);
-
-    private:
-      _tao_seq_CodeSetId *&ptr_;
-      // assignment from T_var not allowed
-      void operator= (const _tao_seq_CodeSetId_var &);
-    };
-
-
-#endif /* end #if !defined */
-
-    _tao_seq_CodeSetId conversion_code_sets;
-  };
-
-  class TAO_Export CodeSetComponent_var
-  {
-  public:
-    CodeSetComponent_var (void); // default constructor
-    CodeSetComponent_var (CodeSetComponent *);
-    CodeSetComponent_var (const CodeSetComponent_var &); // copy constructor
-    ~CodeSetComponent_var (void); // destructor
-
-    CodeSetComponent_var &operator= (CodeSetComponent *);
-    CodeSetComponent_var &operator= (const CodeSetComponent_var &);
-    CodeSetComponent *operator-> (void);
-    const CodeSetComponent *operator-> (void) const;
-
-    operator const CodeSetComponent &() const;
-    operator CodeSetComponent &();
-    operator CodeSetComponent &() const;
-    // in, inout, out, _retn
-    const CodeSetComponent &in (void) const;
-    CodeSetComponent &inout (void);
-    CodeSetComponent *&out (void);
-    CodeSetComponent *_retn (void);
-    CodeSetComponent *ptr (void) const;
-
-  private:
-    CodeSetComponent *ptr_;
-  };
-
-  class TAO_Export CodeSetComponent_out
-  {
-  public:
-    CodeSetComponent_out (CodeSetComponent *&);
-    CodeSetComponent_out (CodeSetComponent_var &);
-    CodeSetComponent_out (const CodeSetComponent_out &);
-    CodeSetComponent_out &operator= (const CodeSetComponent_out &);
-    CodeSetComponent_out &operator= (CodeSetComponent *);
-    operator CodeSetComponent *&();
-    CodeSetComponent *&ptr (void);
-    CodeSetComponent *operator-> (void);
-
-  private:
-    CodeSetComponent *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CodeSetComponent_var &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_CodeSetComponent;
-
-  struct TAO_Export CodeSetComponentInfo
-  {
-    CodeSetComponent ForCharData;
-    CodeSetComponent ForWcharData;
-  };
-
-  class TAO_Export CodeSetComponentInfo_var
-  {
-  public:
-    CodeSetComponentInfo_var (void); // default constructor
-    CodeSetComponentInfo_var (CodeSetComponentInfo *);
-    CodeSetComponentInfo_var (const CodeSetComponentInfo_var &); // copy constructor
-    ~CodeSetComponentInfo_var (void); // destructor
-
-    CodeSetComponentInfo_var &operator= (CodeSetComponentInfo *);
-    CodeSetComponentInfo_var &operator= (const CodeSetComponentInfo_var &);
-    CodeSetComponentInfo *operator-> (void);
-    const CodeSetComponentInfo *operator-> (void) const;
-
-    operator const CodeSetComponentInfo &() const;
-    operator CodeSetComponentInfo &();
-    operator CodeSetComponentInfo &() const;
-    // in, inout, out, _retn
-    const CodeSetComponentInfo &in (void) const;
-    CodeSetComponentInfo &inout (void);
-    CodeSetComponentInfo *&out (void);
-    CodeSetComponentInfo *_retn (void);
-    CodeSetComponentInfo *ptr (void) const;
-
-  private:
-    CodeSetComponentInfo *ptr_;
-  };
-
-  class TAO_Export CodeSetComponentInfo_out
-  {
-  public:
-    CodeSetComponentInfo_out (CodeSetComponentInfo *&);
-    CodeSetComponentInfo_out (CodeSetComponentInfo_var &);
-    CodeSetComponentInfo_out (const CodeSetComponentInfo_out &);
-    CodeSetComponentInfo_out &operator= (const CodeSetComponentInfo_out &);
-    CodeSetComponentInfo_out &operator= (CodeSetComponentInfo *);
-    operator CodeSetComponentInfo *&();
-    CodeSetComponentInfo *&ptr (void);
-    CodeSetComponentInfo *operator-> (void);
-
-  private:
-    CodeSetComponentInfo *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CodeSetComponentInfo_var &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_CodeSetComponentInfo;
-
-  struct TAO_Export CodeSetContext
-  {
-    CodeSetId char_data;
-    CodeSetId wchar_data;
-  };
-
-  class TAO_Export CodeSetContext_var
-  {
-  public:
-    CodeSetContext_var (void); // default constructor
-    CodeSetContext_var (CodeSetContext *);
-    CodeSetContext_var (const CodeSetContext_var &); // copy constructor
-    ~CodeSetContext_var (void); // destructor
-
-    CodeSetContext_var &operator= (CodeSetContext *);
-    CodeSetContext_var &operator= (const CodeSetContext_var &);
-    CodeSetContext *operator-> (void);
-    const CodeSetContext *operator-> (void) const;
-
-    operator const CodeSetContext &() const;
-    operator CodeSetContext &();
-    operator CodeSetContext &() const;
-    // in, inout, out, _retn
-    const CodeSetContext &in (void) const;
-    CodeSetContext &inout (void);
-    CodeSetContext &out (void);
-    CodeSetContext _retn (void);
-    CodeSetContext *ptr (void) const;
-
-  private:
-    CodeSetContext *ptr_;
-  };
-
-  typedef CodeSetContext &CodeSetContext_out;
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_CodeSetContext;
-
-
-}; // module CONV_FRAME
-
-void TAO_Export operator<<= (CORBA::Any &, const CONV_FRAME::CodeSetComponent &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, CONV_FRAME::CodeSetComponent*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetComponent *&);
-void TAO_Export operator<<= (CORBA::Any &, const CONV_FRAME::CodeSetComponentInfo &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, CONV_FRAME::CodeSetComponentInfo*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetComponentInfo *&);
-void TAO_Export operator<<= (CORBA::Any &, const CONV_FRAME::CodeSetContext &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, CONV_FRAME::CodeSetContext*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetContext *&);
-
-#ifndef __ACE_INLINE__
-
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const CONV_FRAME::CodeSetComponent &);
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetComponent &);
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &
-  );
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &
-  );
-
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const CONV_FRAME::CodeSetComponentInfo &);
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetComponentInfo &);
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const CONV_FRAME::CodeSetContext &);
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetContext &);
-
-#endif /* __ACE_INLINE__ */
-
-
-#if defined (__ACE_INLINE__)
-#include "CONV_FRAMEC.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_CONV_FRAMEC_H */
diff --git a/TAO/tao/CONV_FRAMEC.i b/TAO/tao/CONV_FRAMEC.i
deleted file mode 100644
index 985bcc50e7c..00000000000
--- a/TAO/tao/CONV_FRAMEC.i
+++ /dev/null
@@ -1,883 +0,0 @@
-// $Id$
-
-// *************************************************************
-// Inline operations for class CONV_FRAME::CodeSetComponent_var
-// *************************************************************
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::CodeSetComponent_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::CodeSetComponent_var (CONV_FRAME::CodeSetComponent *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::CodeSetComponent_var (const CONV_FRAME::CodeSetComponent_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CONV_FRAME::CodeSetComponent(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::~CodeSetComponent_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent_var &
-CONV_FRAME::CodeSetComponent_var::operator= (CONV_FRAME::CodeSetComponent *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent_var &
-CONV_FRAME::CodeSetComponent_var::operator= (const CONV_FRAME::CodeSetComponent_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CONV_FRAME::CodeSetComponent (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CONV_FRAME::CodeSetComponent *
-CONV_FRAME::CodeSetComponent_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent *
-CONV_FRAME::CodeSetComponent_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::operator const CONV_FRAME::CodeSetComponent &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::operator CONV_FRAME::CodeSetComponent &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::operator CONV_FRAME::CodeSetComponent &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const CONV_FRAME::CodeSetComponent &
-CONV_FRAME::CodeSetComponent_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent &
-CONV_FRAME::CodeSetComponent_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE CONV_FRAME::CodeSetComponent *&
-CONV_FRAME::CodeSetComponent_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent *
-CONV_FRAME::CodeSetComponent_var::_retn (void)
-{
-  CONV_FRAME::CodeSetComponent *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent *
-CONV_FRAME::CodeSetComponent_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CONV_FRAME::CodeSetComponent_out
-// *************************************************************
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_out::CodeSetComponent_out (CONV_FRAME::CodeSetComponent *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_out::CodeSetComponent_out (CONV_FRAME::CodeSetComponent_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_out::CodeSetComponent_out (const CONV_FRAME::CodeSetComponent_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CONV_FRAME::CodeSetComponent_out&,p).ptr_)
-{}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent_out &
-CONV_FRAME::CodeSetComponent_out::operator= (const CONV_FRAME::CodeSetComponent_out &p)
-{
-  this->ptr_ = ACE_const_cast (CONV_FRAME::CodeSetComponent_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent_out &
-CONV_FRAME::CodeSetComponent_out::operator= (CONV_FRAME::CodeSetComponent *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_out::operator CONV_FRAME::CodeSetComponent *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent *&
-CONV_FRAME::CodeSetComponent_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent *
-CONV_FRAME::CodeSetComponent_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CI_
-
-  // = Static operations.
-  ACE_INLINE CORBA::ULong *
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    return new CORBA::ULong[size];
-  }
-
-  ACE_INLINE void CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (CORBA::ULong *buffer)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-
-  ACE_INLINE
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (void) // Default constructor.
-  {
-  }
-
-  ACE_INLINE
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (maximum))
-  {
-  }
-
-  ACE_INLINE
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::ULong *data,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-  {
-  }
-
-  ACE_INLINE
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (const CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    CORBA::ULong *tmp1 = CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (this->maximum_);
-    CORBA::ULong * const tmp2 = ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_);
-
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-
-    this->buffer_ = tmp1;
-  }
-
-  ACE_INLINE CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::operator= (const CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &rhs)
-  // Assignment operator.
-  {
-    if (this == &rhs)
-      return *this;
-
-    if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-      {
-        // free the old buffer
-        CORBA::ULong *tmp = ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
-        CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (tmp);
-        this->buffer_ = CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (rhs.maximum_);
-
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-
-    CORBA::ULong *tmp1 = ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
-    CORBA::ULong * const tmp2 = ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_);
-
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-
-    return *this;
-  }
-
-  // = Accessors.
-  ACE_INLINE CORBA::ULong &
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::operator[] (CORBA::ULong i)
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA::ULong* tmp = ACE_reinterpret_cast(CORBA::ULong*,this->buffer_);
-    return tmp[i];
-  }
-
-  ACE_INLINE const CORBA::ULong &
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::operator[] (CORBA::ULong i) const
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA::ULong * const tmp = ACE_reinterpret_cast (CORBA::ULong* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
-  }
-
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-  ACE_INLINE CORBA::ULong *
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::get_buffer (CORBA::Boolean orphan)
-  {
-    CORBA::ULong *result = 0;
-    if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (this->length_);
-        this->buffer_ = result;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA::ULong*, this->buffer_);
-      }
-    }
-    else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA::ULong*,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
-    }
-    return result;
-  }
-
-  ACE_INLINE const CORBA::ULong *
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const CORBA::ULong * ACE_CAST_CONST, this->buffer_);
-  }
-
-  ACE_INLINE void
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::replace (CORBA::ULong max,
-  CORBA::ULong length,
-  CORBA::ULong *data,
-  CORBA::Boolean release)
-  {
-    this->maximum_ = max;
-    this->length_ = length;
-    if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::ULong *tmp = ACE_reinterpret_cast(CORBA::ULong*,this->buffer_);
-      CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (tmp);
-    }
-    this->buffer_ = data;
-    this->release_ = release;
-  }
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CI_)
-#define _CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CI_
-
-// *************************************************************
-// Inline operations for class CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var
-// *************************************************************
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::_tao_seq_CodeSetId_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::_tao_seq_CodeSetId_var (CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::_tao_seq_CodeSetId_var (const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::~_tao_seq_CodeSetId_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var &
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator= (CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var &
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator= (const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetId &
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *&
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::_retn (void)
-{
-  CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out
-// *************************************************************
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::_tao_seq_CodeSetId_out (CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::_tao_seq_CodeSetId_out (CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::_tao_seq_CodeSetId_out (const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out&,p).ptr_)
-{}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out &
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::operator= (const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out &p)
-{
-  this->ptr_ = ACE_const_cast (CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out &
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::operator= (CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::operator CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *&
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetId &
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif /* end #if !defined */
-
-// *************************************************************
-// Inline operations for class CONV_FRAME::CodeSetComponentInfo_var
-// *************************************************************
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::CodeSetComponentInfo_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::CodeSetComponentInfo_var (CONV_FRAME::CodeSetComponentInfo *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::CodeSetComponentInfo_var (const CONV_FRAME::CodeSetComponentInfo_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CONV_FRAME::CodeSetComponentInfo(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::~CodeSetComponentInfo_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo_var &
-CONV_FRAME::CodeSetComponentInfo_var::operator= (CONV_FRAME::CodeSetComponentInfo *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo_var &
-CONV_FRAME::CodeSetComponentInfo_var::operator= (const CONV_FRAME::CodeSetComponentInfo_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CONV_FRAME::CodeSetComponentInfo (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CONV_FRAME::CodeSetComponentInfo *
-CONV_FRAME::CodeSetComponentInfo_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo *
-CONV_FRAME::CodeSetComponentInfo_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::operator const CONV_FRAME::CodeSetComponentInfo &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::operator CONV_FRAME::CodeSetComponentInfo &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::operator CONV_FRAME::CodeSetComponentInfo &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const CONV_FRAME::CodeSetComponentInfo &
-CONV_FRAME::CodeSetComponentInfo_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo &
-CONV_FRAME::CodeSetComponentInfo_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo *&
-CONV_FRAME::CodeSetComponentInfo_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo *
-CONV_FRAME::CodeSetComponentInfo_var::_retn (void)
-{
-  CONV_FRAME::CodeSetComponentInfo *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo *
-CONV_FRAME::CodeSetComponentInfo_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CONV_FRAME::CodeSetComponentInfo_out
-// *************************************************************
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_out::CodeSetComponentInfo_out (CONV_FRAME::CodeSetComponentInfo *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_out::CodeSetComponentInfo_out (CONV_FRAME::CodeSetComponentInfo_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_out::CodeSetComponentInfo_out (const CONV_FRAME::CodeSetComponentInfo_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CONV_FRAME::CodeSetComponentInfo_out&,p).ptr_)
-{}
-
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo_out &
-CONV_FRAME::CodeSetComponentInfo_out::operator= (const CONV_FRAME::CodeSetComponentInfo_out &p)
-{
-  this->ptr_ = ACE_const_cast (CONV_FRAME::CodeSetComponentInfo_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo_out &
-CONV_FRAME::CodeSetComponentInfo_out::operator= (CONV_FRAME::CodeSetComponentInfo *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_out::operator CONV_FRAME::CodeSetComponentInfo *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo *&
-CONV_FRAME::CodeSetComponentInfo_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo *
-CONV_FRAME::CodeSetComponentInfo_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CONV_FRAME::CodeSetContext_var
-// *************************************************************
-
-ACE_INLINE
-CONV_FRAME::CodeSetContext_var::CodeSetContext_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CONV_FRAME::CodeSetContext_var::CodeSetContext_var (CONV_FRAME::CodeSetContext *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CONV_FRAME::CodeSetContext_var::CodeSetContext_var (const CONV_FRAME::CodeSetContext_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CONV_FRAME::CodeSetContext(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetContext_var::~CodeSetContext_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetContext_var &
-CONV_FRAME::CodeSetContext_var::operator= (CONV_FRAME::CodeSetContext *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetContext_var &
-CONV_FRAME::CodeSetContext_var::operator= (const CONV_FRAME::CodeSetContext_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CONV_FRAME::CodeSetContext (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CONV_FRAME::CodeSetContext *
-CONV_FRAME::CodeSetContext_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetContext *
-CONV_FRAME::CodeSetContext_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetContext_var::operator const CONV_FRAME::CodeSetContext &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetContext_var::operator CONV_FRAME::CodeSetContext &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetContext_var::operator CONV_FRAME::CodeSetContext &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const CONV_FRAME::CodeSetContext &
-CONV_FRAME::CodeSetContext_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetContext &
-CONV_FRAME::CodeSetContext_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for fixed size
-ACE_INLINE CONV_FRAME::CodeSetContext &
-CONV_FRAME::CodeSetContext_var::out (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetContext
-CONV_FRAME::CodeSetContext_var::_retn (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetContext *
-CONV_FRAME::CodeSetContext_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &
-  );
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &
-  );
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CONV_FRAME::CodeSetComponent &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.native_code_set) &&
-    (strm << _tao_aggregate.conversion_code_sets)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CONV_FRAME::CodeSetComponent &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.native_code_set) &&
-    (strm >> _tao_aggregate.conversion_code_sets)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CONV_FRAME::CodeSetComponentInfo &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.ForCharData) &&
-    (strm << _tao_aggregate.ForWcharData)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CONV_FRAME::CodeSetComponentInfo &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.ForCharData) &&
-    (strm >> _tao_aggregate.ForWcharData)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CONV_FRAME::CodeSetContext &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.char_data) &&
-    (strm << _tao_aggregate.wchar_data)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CONV_FRAME::CodeSetContext &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.char_data) &&
-    (strm >> _tao_aggregate.wchar_data)
-  )
-    return 1;
-  else
-    return 0;
-
-}
diff --git a/TAO/tao/CONV_FRAMES.cpp b/TAO/tao/CONV_FRAMES.cpp
deleted file mode 100644
index 424daaee2ef..00000000000
--- a/TAO/tao/CONV_FRAMES.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   CONV_FRAME.cpp
-//
-// = DESCRIPTION
-//   Generated from CONV_FRAME.pidl, that contains the OMG standarized
-//   CONV_FRAME module.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#include "CONV_FRAMES.h"
-
-#if !defined (__ACE_INLINE__)
-#include "CONV_FRAMES.i"
-#endif /* !defined INLINE */
diff --git a/TAO/tao/CONV_FRAMES.h b/TAO/tao/CONV_FRAMES.h
deleted file mode 100644
index e0cd5f4a47c..00000000000
--- a/TAO/tao/CONV_FRAMES.h
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   CONV_FRAME.cpp
-//
-// = DESCRIPTION
-//   Generated from CONV_FRAME.pidl, that contains the OMG standarized
-//   CONV_FRAME module.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#ifndef TAO_CONV_FRAMES_H
-#define TAO_CONV_FRAMES_H
-
-#include "CONV_FRAMEC.h"
-
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-TAO_NAMESPACE  POA_CONV_FRAME
-{
-};
-
-#include "CONV_FRAMES_T.h"
-
-#if defined (__ACE_INLINE__)
-#include "CONV_FRAMES.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_CONV_FRAMES_H */
diff --git a/TAO/tao/CONV_FRAMES.i b/TAO/tao/CONV_FRAMES.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/CONV_FRAMES.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/CONV_FRAMES_T.cpp b/TAO/tao/CONV_FRAMES_T.cpp
deleted file mode 100644
index 268c12f6c43..00000000000
--- a/TAO/tao/CONV_FRAMES_T.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   CONV_FRAMES_T.h
-//
-// = DESCRIPTION
-//   Generated from CONV_FRAME.pidl, that contains the OMG standarized
-//   CONV_FRAME module.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#ifndef TAO_CONV_FRAMES_T_CPP
-#define TAO_CONV_FRAMES_T_CPP
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#include "CONV_FRAMES_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "CONV_FRAMES_T.i"
-#endif /* !defined INLINE */
-
-
-#endif /* TAO_CONV_FRAMES_T_CPP */
diff --git a/TAO/tao/CONV_FRAMES_T.h b/TAO/tao/CONV_FRAMES_T.h
deleted file mode 100644
index a43d98b34c2..00000000000
--- a/TAO/tao/CONV_FRAMES_T.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   CONV_FRAMES_T.h
-//
-// = DESCRIPTION
-//   Generated from CONV_FRAME.pidl, that contains the OMG standarized
-//   CONV_FRAME module.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#ifndef TAO_CONV_FRAMES_T_H
-#define TAO_CONV_FRAMES_T_H
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-#if defined (__ACE_INLINE__)
-#include "CONV_FRAMES_T.i"
-#endif /* defined INLINE */
-
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "CONV_FRAMES_T.cpp"
-#endif /* defined REQUIRED SOURCE */
-
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("CONV_FRAMES_T.cpp")
-#endif /* defined REQUIRED PRAGMA */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_CONV_FRAMES_T_H */
diff --git a/TAO/tao/CONV_FRAMES_T.i b/TAO/tao/CONV_FRAMES_T.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/CONV_FRAMES_T.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/CORBA.pidl b/TAO/tao/CORBA.pidl
deleted file mode 100644
index 108889a16b9..00000000000
--- a/TAO/tao/CORBA.pidl
+++ /dev/null
@@ -1,49 +0,0 @@
-// $Id$
-
-// This will have all new definitions that will go in to CORBA from 
-// now on.
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  typedef string  ORBid;
-
-  interface NamedValue
-    {
-      readonly attribute Identifier name;
-      readonly attribute any value;
-      readonly attribute Flags flags;
-    };
-
-  enum exception_type
-  {
-    NO_EXCEPTION,
-    USER_EXCEPTION,
-    SYSTEM_EXCEPTION
-  };
-
-  typedef sequence<Request_ptr> RequestSeq;
-  
-  typedef string ObjectId; 
-  typedef sequence <ObjectId> ObjectIdList;
-
-  typedef unsigned short ServiceType; 
-  typedef unsigned long ServiceOption; 
-  typedef unsigned long ServiceDetailType;
-
-  struct ServiceDetail 
-  { 
-    ServiceDetailType service_detail_type;
-    sequence <octet> service_detail; 
-  }; 
-   
-   struct ServiceInformation 
-   { 
-     sequence <ServiceOption> service_options; 
-     sequence <ServiceDetail> service_details; 
-   };
-
-};
-
-#pragma prefix ""
diff --git a/TAO/tao/Client_Strategy_Factory.cpp b/TAO/tao/Client_Strategy_Factory.cpp
deleted file mode 100644
index 8d6411f972d..00000000000
--- a/TAO/tao/Client_Strategy_Factory.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-// $Id$
-
-#include "tao/Client_Strategy_Factory.h"
-
-ACE_RCSID(tao, Client_Strategy_Factory, "$Id$")
-
-TAO_Client_Strategy_Factory::TAO_Client_Strategy_Factory (void)
-{
-}
-
-TAO_Client_Strategy_Factory::~TAO_Client_Strategy_Factory (void)
-{
-}
-
-ACE_Lock *
-TAO_Client_Strategy_Factory::create_profile_lock (void)
-{
-  return 0;
-}
-
-TAO_Transport_Mux_Strategy *
-TAO_Client_Strategy_Factory::create_transport_mux_strategy (TAO_ORB_Core *)
-{
-  return 0;
-}
-
-TAO_Wait_Strategy *
-TAO_Client_Strategy_Factory::create_wait_strategy (TAO_Transport *)
-{
-  return 0;
-}
-
-ACE_Lock *
-TAO_Client_Strategy_Factory::create_cached_connector_lock (void)
-{
-  return 0;
-}
diff --git a/TAO/tao/Client_Strategy_Factory.h b/TAO/tao/Client_Strategy_Factory.h
deleted file mode 100644
index d4b0cbfdda5..00000000000
--- a/TAO/tao/Client_Strategy_Factory.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     Client_Strategy_Factory.h
-//
-// = AUTHOR
-//     Chris Cleeland <cleeland@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_CLIENT_STRATEGY_FACTORY_H
-#define TAO_CLIENT_STRATEGY_FACTORY_H
-
-#include "ace/Service_Object.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/corbafwd.h"
-
-class ACE_Lock;
-class TAO_Transport_Mux_Strategy;
-class TAO_Wait_Strategy;
-class TAO_Transport;
-class TAO_ORB_Core;
-
-class TAO_Export TAO_Client_Strategy_Factory : public ACE_Service_Object
-{
-  // = TITLE
-  //    Abstract factory used by the client to manufacture various
-  //    strategies used on the client-side.
-public:
-  // = Intialization and termination methods.
-  TAO_Client_Strategy_Factory (void);
-  // Constructor.
-
-  virtual ~TAO_Client_Strategy_Factory (void);
-  // Destructor
-
-  virtual ACE_Lock* create_profile_lock (void);
-  // Create the lock for the forwarding Profile used by the
-  // <TAO_GIOP_Invocation::location_forward> and the
-  // <TAO_GIOP_Invocation::start>.
-
-  virtual TAO_Transport_Mux_Strategy *create_transport_mux_strategy (TAO_ORB_Core *orb_core);
-  // Create the correct client request muxing strategy.
-
-  virtual TAO_Wait_Strategy *create_wait_strategy (TAO_Transport *transport);
-  // Create the correct client <wait_for_reply> strategy.
-
-  virtual ACE_Lock *create_cached_connector_lock (void);
-  // Create the lock to be used by the cached connector.
-};
-
-#endif /* TAO_CLIENT_STRATEGY_FACTORY_H */
diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp
deleted file mode 100644
index c2d6eb18b48..00000000000
--- a/TAO/tao/Connector_Registry.cpp
+++ /dev/null
@@ -1,416 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-#include "tao/ORB_Core.h"
-#include "tao/Connector_Registry.h"
-#include "tao/Stub.h"
-#include "tao/Environment.h"
-#include "tao/GIOP.h"
-#include "tao/debug.h"
-
-TAO_Connector_Registry::TAO_Connector_Registry (void)
-  : connectors_ ()
-{
-}
-
-TAO_Connector_Registry::~TAO_Connector_Registry (void)
-{
-  this->close_all ();
-}
-
-TAO_Connector *
-TAO_Connector_Registry::get_connector (CORBA::ULong tag)
-{
-  TAO_ConnectorSetItor end =
-    this->connectors_.end ();
-  TAO_ConnectorSetItor connector =
-    this->connectors_.begin ();
-
-  for (;
-       connector != end ;
-       connector++)
-    {
-      if ((*connector)->tag () == tag)
-        return *connector;
-    }
-
-  return 0;
-}
-
-int
-TAO_Connector_Registry::open (TAO_ORB_Core *orb_core)
-{
-  // Open one connector for each loaded protocol!
-  TAO_ProtocolFactorySetItor end =
-    orb_core->protocol_factories ()->end ();
-  TAO_ProtocolFactorySetItor factory =
-    orb_core->protocol_factories ()->begin ();
-
-  TAO_Connector *connector = 0;
-
-  for ( ;
-       factory != end;
-       ++factory)
-    {
-      connector = (*factory)->factory ()->make_connector ();
-
-      if (connector)
-        {
-          if (connector->open (orb_core) != 0)
-            {
-              delete connector;
-
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "TAO (%P|%t) unable to open connector for "
-                                 "<%s>.\n",
-                                 (*factory)->protocol_name ().c_str ()),
-                                -1);
-            }
-
-          if (connectors_.insert (connector) == -1)
-            {
-              delete connector;
-
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "TAO (%P|%t) unable to add a <%s> connector "
-                                 "to the connector registry.\n",
-                                 (*factory)->protocol_name ().c_str ()),
-                                -1);
-            }
-        }
-      else
-        return -1;
-    }
-
-  return 0;
-}
-
-int
-TAO_Connector_Registry::close_all (void)
-{
-  TAO_ConnectorSetItor end =
-    this->connectors_.end ();
-
-  for (TAO_ConnectorSetItor i = this->connectors_.begin ();
-       i != end;
-       ++i)
-    {
-      if (*i == 0)
-        continue;
-
-      (*i)->close ();
-
-      delete *i;
-    }
-
-  this->connectors_.reset ();
-  return 0;
-}
-
-int
-TAO_Connector_Registry::preconnect (TAO_ORB_Core *orb_core,
-                                    TAO_PreconnectSet &preconnections)
-{
-  // Put the preconnects in a form that makes it simple for protocol 
-  // implementers to parse.
-  if (this->preprocess_preconnects (orb_core, preconnections) != 0)
-    {
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) Unable to preprocess the preconnections.\n"));
-
-      return -1;
-    }
-
-  TAO_PreconnectSetIterator preconnects = preconnections.begin ();
-
-  for (ACE_CString *i = 0;
-       preconnects.next (i) != 0;
-       preconnects.advance ())
-    {
-      TAO_ConnectorSetItor first_connector =
-        this->connectors_.begin ();
-      TAO_ConnectorSetItor last_connector =
-        this->connectors_.end ();
-
-      for (TAO_ConnectorSetItor connector = first_connector;
-           connector != last_connector;
-           ++connector)
-        if (*connector)
-          (*connector)->preconnect (i->c_str ());
-    }
-
-  return 0;  // Success
-}
-
-int
-TAO_Connector_Registry::preprocess_preconnects (TAO_ORB_Core *orb_core,
-                                                TAO_PreconnectSet &preconnects)
-{
-  // Organize all matching protocol endpoints and addrs into a single
-  // endpoint for the given protocol.
-  //
-  // For example, the following endpoints:
-  //
-  //   uiop://1.1@/tmp/foobar,/tmp/chicken
-  //   iiop://1.0@localhost
-  //   uiop:///tmp/soup
-  //   iiop://1.1@mopbucket
-  //
-  // will be merged to create the following preconnects:
-  //
-  //   uiop://1.1@/tmp/foobar,/tmp/chicken,/tmp/soup
-  //   iiop://1.0@localhost,1.1@mopbucket
-  //
-  // The four elements in the preconnect set will be squeezed into two 
-  // elements, in this case. This is done to simplify the preconnect
-  // parsing code in each protocol specific connector and to make sure 
-  // that all preconnections are established during the first
-  // attempt.  Otherwise, secondary attempts to establish
-  // preconnections will not be successful since all preconnections
-  // will have been idled after during the first attempt, hence the
-  // need to pass all preconnects during the first attempt.
-
-  const size_t num_protocols =
-    orb_core->protocol_factories ()->size ();
-
-  ACE_CString *processed = 0;
-
-  ACE_NEW_RETURN (processed,
-                  ACE_CString[num_protocols],
-                  -1);
-
-  // Open one connector for each loaded protocol!
-  TAO_ProtocolFactorySetItor begin =
-    orb_core->protocol_factories ()->begin ();
-  TAO_ProtocolFactorySetItor end =
-    orb_core->protocol_factories ()->end ();
-
-  ACE_CString *tmp = processed;
-
-  // Iterate over the protocols, *not* the connectors!
-  for (TAO_ProtocolFactorySetItor factory = begin;
-       factory != end;
-       ++factory, ++tmp)
-    {
-      (*tmp) =
-        ACE_CString ((*factory)->factory ()->prefix ()) + ACE_CString ("://");
-
-      TAO_PreconnectSetIterator p = preconnects.begin ();
-
-      for (ACE_CString *i = 0;
-           p.next (i) != 0;
-           p.advance ())
-        {
-          const int slot = i->find ("://");
-
-          ACE_CString protocol_name = i->substring (0, slot);
-
-          if (slot != ACE_CString::npos &&
-              (slot != ACE_static_cast (int, i->length ()) - 3) &&
-              (*factory)->factory ()->match_prefix (protocol_name.c_str ()))
-            {
-              (*tmp) += i->substring (slot + 3); // +3 due to "://"
-              (*tmp) += ACE_CString (',');
-            }
-        }
-
-      // Remove the trailing comma ','.
-      if ((*tmp)[tmp->length () - 1] == ',')
-        (*tmp) = tmp->substring (0, tmp->length () - 1);
-    }
-
-  // Empty the preconnect container.
-  preconnects.reset ();
-
-  // Now enqueue the re-formed preconnect strings.
-  for (size_t n = 0; n < num_protocols; ++n)
-    {
-      // If no preconnects for the given protocol exist then don't
-      // enqueue the empty preconnect list for that protocol.
-      // Such an empty preconnect string should be of the form
-      //
-      //     protocol://
-      //
-      // so check for the forward slash '/' at the end of the string.
-      if (processed[n][processed[n].length () - 1] != '/')
-        {
-          if (preconnects.enqueue_tail (processed[n]) != 0)
-            {
-              delete [] processed;
-
-              return -1;
-            }
-        }
-    }
-
-  delete [] processed;
-
-  return 0;
-}
-
-
-int
-TAO_Connector_Registry::connect (TAO_Profile *&profile,
-                                 TAO_Transport *&transport,
-                                 ACE_Time_Value *max_wait_time)
-{
-  // Find the appropriate connector object
-  TAO_Connector *connector =
-    this->get_connector (profile->tag ());
-
-  if (connector == 0)
-    return -1;
-
-  return connector->connect (profile, transport, max_wait_time);
-}
-
-int
-TAO_Connector_Registry::make_mprofile (const char *ior,
-                                       TAO_MProfile &mprofile,
-                                       CORBA::Environment &ACE_TRY_ENV)
-{
-  if (!ior)
-    // Failure: Null IOR string pointer
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (
-      CORBA_SystemException::_tao_minor_code (
-        TAO_NULL_POINTER_MINOR_CODE,
-        0),
-      CORBA::COMPLETED_NO),
-      -1);
-
-  TAO_ConnectorSetItor first_connector =
-    this->connectors_.begin ();
-  TAO_ConnectorSetItor last_connector =
-    this->connectors_.end ();
-
-  for (TAO_ConnectorSetItor connector = first_connector;
-       connector != last_connector;
-       ++connector)
-    {
-      if (*connector)
-        {
-          int mp_result = (*connector)->make_mprofile (ior,
-                                                       mprofile,
-                                                       ACE_TRY_ENV);
-
-          ACE_CHECK_RETURN (mp_result);
-
-          if (mp_result == 0)
-            return 0;  // Success
-        }
-      else
-        // Failure: Null pointer to connector in connector registry.
-        ACE_THROW_RETURN (CORBA::INV_OBJREF (
-          CORBA_SystemException::_tao_minor_code (
-            TAO_NULL_POINTER_MINOR_CODE,
-            0),
-          CORBA::COMPLETED_NO),
-          -1);
-    }
-
-  // Failure: None of the connectors were able to parse the URL style
-  // IOR into an MProfile.
-  ACE_THROW_RETURN (CORBA::INV_OBJREF (
-   CORBA_SystemException::_tao_minor_code (
-      TAO_CONNECTOR_REGISTRY_NO_USABLE_PROTOCOL,
-      0),
-   CORBA::COMPLETED_NO),
-   -1);
-}
-
-TAO_Profile *
-TAO_Connector_Registry::create_profile (TAO_InputCDR &cdr)
-{
-  CORBA::ULong tag = 0;
-
-  // If there is an error we abort.
-  if ((cdr >> tag) == 0)
-    return 0;
-
-  TAO_Connector *connector =
-    this->get_connector (tag);
-
-  if (connector == 0)
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) unknown profile tag %d\n",
-                      tag));
-        }
-
-      TAO_Profile *pfile = 0;
-      ACE_NEW_RETURN (pfile,
-                      TAO_Unknown_Profile (tag),
-                      0);
-      if (pfile->decode (cdr) == -1)
-        {
-          pfile->_decr_refcnt ();
-          pfile = 0;
-        }
-
-      return pfile;
-    }
-
-  // OK, we've got a known profile.  It's going to be encapsulated
-  // ProfileData.  Create a new decoding stream and context for it,
-  // and skip the data in the parent stream
-
-  // ProfileData is encoded as a sequence of octet. So first get the
-  // length of the sequence.
-  CORBA::ULong encap_len = 0;
-  if ((cdr >> encap_len) == 0)
-    return 0;
-
-  // Create the decoding stream from the encapsulation in the buffer,
-  // and skip the encapsulation.
-  TAO_InputCDR str (cdr, encap_len);
-
-  if (str.good_bit () == 0
-      || cdr.skip_bytes (encap_len) == 0)
-    return 0;
-
-  return connector->create_profile (str);
-}
-
-char
-TAO_Connector_Registry::object_key_delimiter (const char *ior)
-{
-  if (!ior)
-    return 0; // Failure: Null IOR string pointer
-
-  TAO_ConnectorSetItor first_connector =
-    this->connectors_.begin ();
-  TAO_ConnectorSetItor last_connector =
-    this->connectors_.end ();
-
-  for (TAO_ConnectorSetItor connector = first_connector;
-       connector != last_connector;
-       ++connector)
-    {
-      if (*connector)
-        {
-          if ((*connector)->check_prefix (ior) == 0)
-            return (*connector)->object_key_delimiter ();
-        }
-    }
-
-  // Failure: None of the connectors were able to match their protocol
-  // against the provided string.
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Node<TAO_Connector*>;
-template class ACE_Unbounded_Set<TAO_Connector*>;
-template class ACE_Unbounded_Set_Iterator<TAO_Connector*>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Node<TAO_Connector*>
-#pragma instantiate ACE_Unbounded_Set<TAO_Connector*>
-#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_Connector*>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Connector_Registry.h b/TAO/tao/Connector_Registry.h
deleted file mode 100644
index 6e2b28064ce..00000000000
--- a/TAO/tao/Connector_Registry.h
+++ /dev/null
@@ -1,117 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     Connector_Registry.h
-//
-// = DESCRIPTION
-//     Interface for the TAO Connector Registry
-//
-// = AUTHOR
-//     Fred Kuhns <fredk@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_CONNECTOR_REGISTRY_H
-#define TAO_CONNECTOR_REGISTRY_H
-
-#include "tao/Pluggable.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/corbafwd.h"
-#include "tao/Typecode.h"
-#include "tao/params.h"
-
-#include "ace/Containers_T.h"
-
-// Forward declarations.
-class ACE_Addr;
-class ACE_Reactor;
-class TAO_ORB_Core;
-
-class TAO_Stub;
-class TAO_MProfile;
-class TAO_Resource_Factory;
-
-typedef ACE_Unbounded_Set<TAO_Connector*>
-        TAO_ConnectorSet;
-
-typedef ACE_Unbounded_Set_Iterator<TAO_Connector*>
-        TAO_ConnectorSetItor;
-
-
-class TAO_Export TAO_Connector_Registry
-{
-  // = TITLE
-  //   Per ORB TAO Connector Registry
-  //
-  // = DESCRIPTION
-  //   Connector Registry and Generic Connector interface definitions.
-  //   All loaded ESIOP or GIOP connector bridges must register with
-  //   this object.
-  //   This class is able to dynamically load a set of
-  //   concrete protocol connectors which have registered with the service
-  //   configurator and added their Factory name to the Resource_Factory
-  //   line of the svc.comf file.
-public:
-  TAO_Connector_Registry (void);
-  //  Default constructor.
-
-  ~TAO_Connector_Registry (void);
-  //  Default destructor.
-
-   TAO_Connector *get_connector (CORBA::ULong tag);
-  // Return the connector bridges
-
-  int open (TAO_ORB_Core *orb_core);
-  // Initialize all registered connectors.
-
-  int close_all (void);
-  // Close all open connectors.
-
-  int preconnect (TAO_ORB_Core *orb_core,
-                  TAO_PreconnectSet &preconnections);
-  // For this list of preconnections call the connector specific
-  // preconnect method for each preconnection.
-
-  int connect (TAO_Profile *&profile,
-               TAO_Transport *&transport,
-               ACE_Time_Value *max_wait_time = 0);
-  // This is where the transport protocol is selected based on some
-  // policy.  This member will call the connect member of the
-  // TAO_Connector class which in turn will call the concrete
-  // connector.
-
-  int make_mprofile (const char *ior,
-                     TAO_MProfile &mprofile,
-                     CORBA::Environment &ACE_TRY_ENV);
-  // Parse a string containing a URL style IOR and return an
-  // MProfile.
-
-  TAO_Profile* create_profile (TAO_InputCDR& cdr);
-  // Create a profile based on the contents of <cdr>
-
-  char object_key_delimiter (const char *ior);
-  // Obtain the object key delimiter used by the protocol specified in
-  // the provided URL style IOR.
-
-private:
-  int preprocess_preconnects (TAO_ORB_Core *orb_core,
-                              TAO_PreconnectSet &preconnects);
-  // Put the preconnects in a form that makes it simple for protocol
-  // implementers to parse.
-
-private:
-  TAO_ConnectorSet connectors_;
-  // list of connectors currently open.
-};
-
-#endif /* TAO_CONNECTOR_REGISTRY_H */
diff --git a/TAO/tao/Context.cpp b/TAO/tao/Context.cpp
deleted file mode 100644
index 72b1d3f2d81..00000000000
--- a/TAO/tao/Context.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-// $Id$
-
-#include "tao/Context.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#include "tao/Typecode.h"
-#include "tao/Environment.h"
-#include "tao/NVList.h"
-#include "tao/ORB.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Context.i"
-#endif /* ! __ACE_INLINE__ */
-
-CORBA_Context::CORBA_Context (void)
-  : refcount_ (1)
-{
-}
-
-CORBA_Context::~CORBA_Context (void)
-{
-}
-
-CORBA::ULong
-CORBA_Context::_incr_refcnt (void)
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0);
-  return refcount_++;
-}
-
-CORBA::ULong
-CORBA_Context::_decr_refcnt (void)
-{
-  {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0);
-    this->refcount_--;
-    if (this->refcount_ != 0)
-      return this->refcount_;
-  }
-
-  delete this;
-  return 0;
-}
-
-const char *
-CORBA_Context::context_name (CORBA::Environment &ACE_TRY_ENV) const
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                         CORBA::COMPLETED_NO),
-                    0);
-}
-
-CORBA_Context_ptr
-CORBA_Context::parent (CORBA::Environment &ACE_TRY_ENV) const
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                         CORBA::COMPLETED_NO),
-                    0);
-}
-
-void
-CORBA_Context::create_child (const char * /* child_ctx_name */,
-                             CORBA_Context_out /* child_ctx */,
-                             CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                  CORBA::COMPLETED_NO));
-}
-
-void
-CORBA_Context::set_one_value (const char * /* propname */,
-                              const CORBA_Any & /* propvalue */,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                  CORBA::COMPLETED_NO));
-}
-
-void
-CORBA_Context::set_values (CORBA::NVList_ptr,
-                           CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                  CORBA::COMPLETED_NO));
-}
-
-void
-CORBA_Context::delete_values (const char * /* propname */,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                  CORBA::COMPLETED_NO));
-}
-
-void
-CORBA_Context::get_values (const char * /* start_scope */,
-                           CORBA::Flags /* op_flags */,
-                           const char * /* pattern */,
-                           CORBA::NVList_ptr & /* values */,
-                           CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                  CORBA::COMPLETED_NO));
-}
-
-CORBA_ContextList::CORBA_ContextList (CORBA::ULong len,
-                                      char* *ctx_list)
-  : ref_count_ (1)
-{
-  for (CORBA::ULong i=0; i < len; i++)
-    this->add (ctx_list [i]);
-}
-
-CORBA_ContextList::~CORBA_ContextList (void)
-{
-  for (CORBA::ULong i = 0; i < this->count (); ++i)
-    {
-      char **ctx;
-
-      if (this->ctx_list_.get (ctx, i) == -1)
-        return;
-
-      CORBA::string_free (*ctx);
-    }
-}
-
-void
-CORBA_ContextList::add (char *ctx)
-{
-  this->ctx_list_.enqueue_tail (CORBA::string_dup (ctx));
-}
-
-void
-CORBA_ContextList::add_consume (char *ctx)
-{
-  this->ctx_list_.enqueue_tail (ctx);
-}
-
-char *
-CORBA_ContextList::item (CORBA::ULong slot,
-                         CORBA::Environment &ACE_TRY_ENV)
-{
-  char **ctx;
-  if (this->ctx_list_.get (ctx,
-                           slot) == -1)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-  else
-    return CORBA::string_dup (*ctx);
-}
-
-void
-CORBA_ContextList::remove (CORBA::ULong,
-                           CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
-}
-
-CORBA_ContextList_ptr
-CORBA_ContextList::_duplicate (void)
-{
-  ++this->ref_count_;
-  return this;
-}
-
-void
-CORBA_ContextList::_destroy (void)
-{
-  CORBA::ULong current = --this->ref_count_;
-
-  if (current == 0)
-    delete this;
-}
-
-void
-CORBA_ContextList::_incr_refcnt (void)
-{
-  this->ref_count_++;
-}
-
-void
-CORBA_ContextList::_decr_refcnt (void)
-{
-  this->ref_count_--;
-    if (this->ref_count_ != 0)
-      delete this;
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/Context.h b/TAO/tao/Context.h
deleted file mode 100644
index 81bb68d36e2..00000000000
--- a/TAO/tao/Context.h
+++ /dev/null
@@ -1,303 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Context.h
-//
-// = DESCRIPTION
-//    Header file for CORBA Context class.
-//
-// = AUTHOR
-//     Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_CONTEXT_H
-#define TAO_CONTEXT_H
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-class TAO_Export CORBA_Context
-{
-  // = TITLE
-  //   CORBA_Context
-  //
-  // = DESCRIPTION
-  //   TAO's minimal implementation of the Context interface.  Since
-  //   Contexts are inherently un-typesafe, there use is deprecated
-  //   and the feature may eventaully disappear from CORBA. It is
-  //   implemented only to make the arg list of
-  //   CORBA_Object::_create_request() compliant. The only (pointer)
-  //   value that should be passed is 0.
-  //
-public:
-  // = Initialization and termination methods.
-  CORBA_Context (void);
-  // Constructor.
-
-  ~CORBA_Context (void);
-  // Destructor.
-
-  // = Pseudo-object methods
-  static CORBA_Context *_duplicate (CORBA_Context*);
-  static CORBA_Context *_nil (void);
-
-  // = Reference counting.
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
-
-  // = All the spec-required functions below will just throw a
-  //   CORBA::NO_IMPLEMENT exception and do nothing else.
-
-  const char *context_name (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ()) const;
-
-  CORBA_Context_ptr parent (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ()) const;
-
-  void create_child (const char *child_ctx_name,
-                     CORBA_Context_out child_ctx,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-
-  void set_one_value (const char *propname,
-                      const CORBA_Any &propvalue,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
-
-  void set_values (CORBA::NVList_ptr values,
-                   CORBA::Environment &ACE_TRY_ENV =
-                     TAO_default_environment ());
-
-  void delete_values (const char *propname,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
-
-  void get_values (const char *start_scope,
-                   CORBA::Flags op_flags,
-                   const char *pattern,
-                   CORBA::NVList_ptr &values,
-                   CORBA::Environment &ACE_TRY_ENV =
-                     TAO_default_environment ());
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_Context_ptr _ptr_type;
-  typedef CORBA_Context_var _var_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
-private:
-  CORBA::ULong refcount_;
-  // Reference counting.
-
-  ACE_SYNCH_MUTEX refcount_lock_;
-  // Protect the reference count.
-};
-
-typedef CORBA_Context* CORBA_Context_ptr;
-
-class TAO_Export CORBA_Context_var
-{
-  // = TITLE
-  //   The T_var class for Context
-  //
-  // = DESCRIPTION
-  //   As any other pseudo object Context must have a T_var class,
-  //   the interface an semantics are specified in the CORBA spec.
-  //
-  //   We use <CORBA_Context_ptr> as the _ptr type instead of
-  //   <CORBA::Context_ptr> in an attempt to reduced the cyclic
-  //   dependencies in TAO.
-public:
-  CORBA_Context_var (void);
-  CORBA_Context_var (CORBA_Context_ptr);
-  CORBA_Context_var (const CORBA_Context_var &);
-  ~CORBA_Context_var (void);
-
-  CORBA_Context_var &operator= (CORBA_Context_ptr);
-  CORBA_Context_var &operator= (const CORBA_Context_var &);
-  CORBA_Context_ptr operator-> (void) const;
-
-  operator const CORBA_Context_ptr &() const;
-  operator CORBA_Context_ptr &();
-  // in, inout, out, _retn
-  CORBA_Context_ptr in (void) const;
-  CORBA_Context_ptr &inout (void);
-  CORBA_Context_ptr &out (void);
-  CORBA_Context_ptr _retn (void);
-  CORBA_Context_ptr ptr (void) const;
-
-private:
-  CORBA_Context_ptr ptr_;
-};
-
-class TAO_Export CORBA_Context_out
-{
-  // = TITLE
-  //   The T_out class for Context
-  //
-  // = DESCRIPTION
-  //   As any other pseudo object Context must have a T_out class,
-  //   the interface an semantics are specified in the CORBA spec.
-  //
-  //   We use <CORBA_Context_ptr> as the _ptr type instead of
-  //   <CORBA::Context_ptr> in an attempt to reduced the cyclic
-  //   dependencies in TAO.
-public:
-  CORBA_Context_out (CORBA_Context_ptr &);
-  CORBA_Context_out (CORBA_Context_var &);
-  CORBA_Context_out (CORBA_Context_out &);
-  CORBA_Context_out &operator= (CORBA_Context_out &);
-  CORBA_Context_out &operator= (const CORBA_Context_var &);
-  CORBA_Context_out &operator= (CORBA_Context_ptr);
-  operator CORBA_Context_ptr &();
-  CORBA_Context_ptr &ptr (void);
-  CORBA_Context_ptr operator-> (void);
-
-private:
-  CORBA_Context_ptr &ptr_;
-};
-
-class CORBA_ContextList
-{
-  // = TITLE
-  //   ContextList definition taken from CORBA v2.3a Dec 1998
-  //
-  // = DESCRIPTION
-  //   Maintains a list of strings for Contexts.
-public:
-  CORBA_ContextList (void);
-  // Constructor.
-
-  CORBA_ContextList (CORBA::ULong len,
-                     char **ctx_list);
-  // Constructor - initialize given a length and an array of
-  // strings.
-
-  ~CORBA_ContextList (void);
-  // destructor
-
-  CORBA::ULong count ();
-  // return the number of elements
-
-  CORBA_ContextList_ptr _duplicate (void);
-  // Increment the reference count.
-
-  static CORBA_ContextList_ptr _duplicate (CORBA_ContextList *);
-  // Increment the reference count.
-
-  void _destroy (void);
-  // Decrement the reference count and delete if it is 0.
-
-  static CORBA_ContextList_ptr _nil ();
-  // Return null pointer of this type.
-
-  void add (char *ctx);
-  // Add a string to the list.
-
-  void add_consume (char *ctx);
-  // Add and consume a string to the list.
-
-  char *item (CORBA::ULong slot,
-              CORBA_Environment &ACE_TRY_ENV =
-                TAO_default_environment ());
-  // Return the typecode at slot i. Raises the "Bounds" exception.
-
-  void remove (CORBA::ULong slot,
-               CORBA_Environment &ACE_TRY_ENV =
-                TAO_default_environment ());
-  // remove the typecode at slot i. Raises the "Bounds" exception
-
-  void _incr_refcnt (void);
-  void  _decr_refcnt (void);
-  // Increment and decrement ref counts
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA::ContextList_ptr _ptr_type;
-  typedef CORBA::ContextList_var _var_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
-private:
-  // Not allowed.
-  CORBA_ContextList (const CORBA_ContextList &);
-  CORBA_ContextList &operator= (const CORBA_ContextList &);
-
-  ACE_Atomic_Op<ACE_SYNCH_MUTEX, CORBA::ULong> ref_count_;
-  // Reference counter.
-
-  ACE_Unbounded_Queue<char *> ctx_list_;
-  // Internal list of typecodes.
-};
-
-class TAO_Export CORBA_ContextList_var
-{
-public:
-  CORBA_ContextList_var (void); // default constructor
-  CORBA_ContextList_var (CORBA_ContextList_ptr);
-  CORBA_ContextList_var (const CORBA_ContextList_var &); // copy constructor
-  ~CORBA_ContextList_var (void); // destructor
-
-  CORBA_ContextList_var &operator= (CORBA_ContextList_ptr);
-  CORBA_ContextList_var &operator= (const CORBA_ContextList_var &);
-  CORBA_ContextList_ptr operator-> (void) const;
-
-  operator const CORBA_ContextList_ptr &() const;
-  operator CORBA_ContextList_ptr &();
-  // in, inout, out, _retn
-  CORBA_ContextList_ptr in (void) const;
-  CORBA_ContextList_ptr &inout (void);
-  CORBA_ContextList_ptr &out (void);
-  CORBA_ContextList_ptr _retn (void);
-  CORBA_ContextList_ptr ptr (void) const;
-
-private:
-  CORBA_ContextList_ptr ptr_;
-};
-
-class TAO_Export CORBA_ContextList_out
-{
-  // = TITLE
-  //   The T_out class for ContextList
-  //
-  // = DESCRIPTION
-  //   As any other pseudo object ContextList must have a T_out class,
-  //   the interface an semantics are specified in the CORBA spec.
-  //
-  // = NOTE
-  //   We use CORBA_ContextList_ptr as the _ptr type instead of
-  //   CORBA::ContextList_ptr, this is an attempt to reduced the cyclic
-  //   dependencies in TAO.
-  //
-public:
-  CORBA_ContextList_out (CORBA_ContextList_ptr &);
-  CORBA_ContextList_out (CORBA_ContextList_var &);
-  CORBA_ContextList_out (CORBA_ContextList_out &);
-  CORBA_ContextList_out &operator= (CORBA_ContextList_out &);
-  CORBA_ContextList_out &operator= (const CORBA_ContextList_var &);
-  CORBA_ContextList_out &operator= (CORBA_ContextList_ptr);
-  operator CORBA_ContextList_ptr &();
-  CORBA_ContextList_ptr &ptr (void);
-  CORBA_ContextList_ptr operator-> (void);
-
-private:
-  CORBA_ContextList_ptr &ptr_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Context.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-#endif /* TAO_CONTEXT_H */
diff --git a/TAO/tao/Context.i b/TAO/tao/Context.i
deleted file mode 100644
index 63fd1441608..00000000000
--- a/TAO/tao/Context.i
+++ /dev/null
@@ -1,386 +0,0 @@
-// $Id$
-
-// This may look like C, but it's really -*- C++ -*-
-
-// These should never be non-NULL, but the method
-// is required of pseudo objects.
-
-ACE_INLINE CORBA::Boolean
-CORBA::is_nil (CORBA::Context_ptr ctx)
-{
-  return ctx == 0;
-}
-
-ACE_INLINE void
-CORBA::release (CORBA::Context_ptr ctx)
-{
-  if (ctx)
-    ctx->_decr_refcnt ();
-}
-
-ACE_INLINE CORBA_Context*
-CORBA_Context::_duplicate (CORBA_Context* x)
-{
-  if (x != 0)
-    x->_incr_refcnt ();
-  return x;
-}
-
-ACE_INLINE CORBA_Context*
-CORBA_Context::_nil (void)
-{
-  return (CORBA::Context*)0;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_Context_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_Context_var::CORBA_Context_var (void)
-  : ptr_ (CORBA_Context::_nil ())
-{
-}
-
-ACE_INLINE
-CORBA_Context_var::CORBA_Context_var (CORBA_Context_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_Context_var::~CORBA_Context_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_Context_ptr
-CORBA_Context_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Context_var::CORBA_Context_var (const CORBA_Context_var &p)
-  : ptr_ (CORBA_Context::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE CORBA_Context_var &
-CORBA_Context_var::operator= (CORBA_Context_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_Context_var &
-CORBA_Context_var::operator= (const CORBA_Context_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_Context::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_Context_var::operator const CORBA_Context_ptr &() const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Context_var::operator CORBA_Context_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Context_ptr
-CORBA_Context_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Context_ptr
-CORBA_Context_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Context_ptr &
-CORBA_Context_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Context_ptr &
-CORBA_Context_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_Context::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Context_ptr
-CORBA_Context_var::_retn (void)
-{
-  // yield ownership
-  CORBA_Context_ptr val = this->ptr_;
-  this->ptr_ = CORBA_Context::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_Context_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_Context_out::CORBA_Context_out (CORBA_Context_ptr &p)
-        : ptr_ (p)
-{
-  this->ptr_ = CORBA_Context::_nil ();
-}
-
-ACE_INLINE
-CORBA_Context_out::CORBA_Context_out (CORBA_Context_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_Context::_nil ();
-}
-
-ACE_INLINE
-CORBA_Context_out::CORBA_Context_out (CORBA_Context_out &p)
-  : ptr_ (p.ptr_)
-{}
-
-ACE_INLINE CORBA_Context_out &
-CORBA_Context_out::operator= (CORBA_Context_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_Context_out &
-CORBA_Context_out::operator= (const CORBA_Context_var &p)
-{
-  this->ptr_ = CORBA_Context::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_Context_out &
-CORBA_Context_out::operator= (CORBA_Context_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_Context_out::operator CORBA_Context_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Context_ptr &
-CORBA_Context_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Context_ptr
-CORBA_Context_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_ContextList
-// *************************************************************
-
-ACE_INLINE
-CORBA_ContextList::CORBA_ContextList (void)
-{
-}
-
-ACE_INLINE CORBA::ULong
-CORBA_ContextList::count (void)
-{
-  return (CORBA::ULong) this->ctx_list_.size ();
-}
-
-ACE_INLINE CORBA_ContextList_ptr
-CORBA_ContextList::_nil (void)
-{
-  return (CORBA_ContextList_ptr)0;
-}
-
-ACE_INLINE CORBA_ContextList *
-CORBA_ContextList::_duplicate (CORBA_ContextList* x)
-{
-  if (x != 0)
-    x->_incr_refcnt ();
-  return x;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_ContextList_var
-// *************************************************************
-
-// default constructor
-
-ACE_INLINE
-CORBA_ContextList_var::CORBA_ContextList_var (void)
-  : ptr_ (CORBA_ContextList::_nil ())
-{}
-
-ACE_INLINE
-CORBA_ContextList_var::CORBA_ContextList_var (CORBA_ContextList_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA_ContextList_ptr
-CORBA_ContextList_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// copy constructor
-ACE_INLINE
-CORBA_ContextList_var::CORBA_ContextList_var (const CORBA_ContextList_var &p)
-  : ptr_ (p.ptr_->_duplicate ())
-{}
-
-ACE_INLINE
-CORBA_ContextList_var::~CORBA_ContextList_var (void) // destructor
-{
-  this->ptr_->_destroy ();
-}
-
-ACE_INLINE CORBA_ContextList_var &
-CORBA_ContextList_var::operator= (CORBA_ContextList_ptr p)
-{
-  this->ptr_->_destroy ();
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_ContextList_var &
-CORBA_ContextList_var::operator= (const CORBA_ContextList_var &p)
-{
-  if (this != &p)
-    {
-      this->ptr_->_destroy ();
-      this->ptr_ = p.ptr_->_duplicate ();
-    }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_ContextList_var::operator const CORBA_ContextList_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_ContextList_var::operator CORBA_ContextList_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ContextList_ptr
-CORBA_ContextList_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ContextList_ptr
-CORBA_ContextList_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ContextList_ptr &
-CORBA_ContextList_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ContextList_ptr &
-CORBA_ContextList_var::out (void)
-{
-  this->ptr_->_destroy ();
-  this->ptr_ = CORBA_ContextList::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ContextList_ptr
-CORBA_ContextList_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_ContextList_ptr val = this->ptr_;
-  this->ptr_ = CORBA_ContextList::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_ContextList_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_ContextList_out::CORBA_ContextList_out (CORBA_ContextList_ptr &p)
-        : ptr_ (p)
-{
-  this->ptr_ = CORBA_ContextList::_nil ();
-}
-
-ACE_INLINE
-CORBA_ContextList_out::CORBA_ContextList_out (CORBA_ContextList_var &p)
-  : ptr_ (p.out ())
-{
-  this->ptr_->_destroy ();
-  this->ptr_ = CORBA_ContextList::_nil ();
-}
-
-ACE_INLINE
-CORBA_ContextList_out::CORBA_ContextList_out (CORBA_ContextList_out &p)
-  : ptr_ (p.ptr_)
-{}
-
-ACE_INLINE CORBA_ContextList_out &
-CORBA_ContextList_out::operator= (CORBA_ContextList_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_ContextList_out &
-CORBA_ContextList_out::operator= (const CORBA_ContextList_var &p)
-{
-  this->ptr_ = p.ptr ()->_duplicate ();
-  return *this;
-}
-
-ACE_INLINE CORBA_ContextList_out &
-CORBA_ContextList_out::operator= (CORBA_ContextList_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_ContextList_out::operator CORBA_ContextList_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ContextList_ptr &
-CORBA_ContextList_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ContextList_ptr
-CORBA_ContextList_out::operator-> (void)
-{
-  return this->ptr_;
-}
diff --git a/TAO/tao/Current.pidl b/TAO/tao/Current.pidl
deleted file mode 100644
index f6e6498be41..00000000000
--- a/TAO/tao/Current.pidl
+++ /dev/null
@@ -1,10 +0,0 @@
-// $Id$
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  interface Current {};
-};
-
-#pragma prefix ""
diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp
deleted file mode 100644
index 76e1e8aba99..00000000000
--- a/TAO/tao/CurrentC.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "tao/CurrentC.h"
-#include "tao/Stub.h"
-#include "tao/Servant_Base.h"
-#include "tao/Typecode.h"
-#include "tao/Any.h"
-#include "tao/POA_CORBA.h"
-#include "tao/Environment.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/CurrentC.i"
-#endif /* !defined INLINE */
-
-ACE_RCSID(tao, CurrentC, "$Id$")
-
-CORBA_Current_ptr CORBA_Current::_duplicate (CORBA_Current_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-
-  return obj;
-} // end of _duplicate
-
-CORBA_Current_ptr CORBA_Current::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA_Current::_nil ();
-  if (!obj->_is_a ("IDL:omg.org/CORBA/Current:1.0", ACE_TRY_ENV))
-    return CORBA_Current::_nil ();
-  TAO_Stub *stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  if (!obj->_is_collocated ()
-         || !obj->_servant()
-         || obj->_servant()->_downcast ("IDL:omg.org/CORBA/Current:1.0") == 0
-      )
-  {
-    return new CORBA_Current(stub);
-  }
-  void* servant = obj->_servant ()->_downcast ("IDL:omg.org/CORBA/Current:1.0");
-  return new POA_CORBA::_tao_collocated_Current(
-      ACE_reinterpret_cast(POA_CORBA::Current_ptr, servant),
-      stub
-    );
-}
-
-CORBA_Current_ptr CORBA_Current::_nil (void)
-{
-  return (CORBA_Current_ptr)NULL;
-} // end of _nil
-
-CORBA::Boolean CORBA_Current::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Current:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
-}
-
-const char* CORBA_Current::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/Current:1.0";
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA_Current_ptr _tao_elem)
-{
-  CORBA::Environment _tao_env;
-  CORBA::Object_ptr *_tao_obj_ptr;
-  ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-  *_tao_obj_ptr = CORBA_Current::_duplicate (_tao_elem);
-  _tao_any.replace (CORBA::_tc_Current, _tao_obj_ptr, 1, _tao_env);
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_Current_ptr &_tao_elem)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      _tao_elem = CORBA_Current::_nil ();
-      CORBA::TypeCode_var type = _tao_any.type ();
-      CORBA::Boolean eq = type->equal (CORBA::_tc_Current,
-                                       ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      if (eq == 0)
-        return 0;
-
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      CORBA::Object_ptr *_tao_obj_ptr;
-      ACE_NEW_RETURN (_tao_obj_ptr, CORBA::Object_ptr, 0);
-      if (stream.decode (CORBA::_tc_Current, _tao_obj_ptr, 0, ACE_TRY_ENV)
-          == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          _tao_elem = CORBA_Current::_narrow (*_tao_obj_ptr, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          CORBA::release (*_tao_obj_ptr);
-          *_tao_obj_ptr = _tao_elem;
-          ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_Current,
-                                              _tao_obj_ptr, 1,
-                                              ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      return 0;
-    }
-  ACE_ENDTRY;
-  return 1;
-}
diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h
deleted file mode 100644
index 267f3951893..00000000000
--- a/TAO/tao/CurrentC.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    CurrentC.h
-//
-// = AUTHOR
-//
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-//
-//
-// Modified by Aniruddha Gokhale.
-//
-// ============================================================================
-
-#ifndef TAO_IDL_CURRENTC_H
-#define TAO_IDL_CURRENTC_H
-
-#ifndef TAO_EXPORT_MACRO
-#define TAO_EXPORT_MACRO
-#endif
-
-#include "tao/Object.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if !defined (_CORBA_CURRENT___PTR_CH_)
-#define _CORBA_CURRENT___PTR_CH_
-
-class CORBA_Current;
-typedef CORBA_Current *CORBA_Current_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CURRENT___VAR_CH_)
-#define _CORBA_CURRENT___VAR_CH_
-
-class  CORBA_Current_var
-{
-public:
-  CORBA_Current_var (void); // default constructor
-  CORBA_Current_var (CORBA_Current_ptr);
-  CORBA_Current_var (const CORBA_Current_var &); // copy constructor
-  ~CORBA_Current_var (void); // destructor
-
-  CORBA_Current_var &operator= (CORBA_Current_ptr);
-  CORBA_Current_var &operator= (const CORBA_Current_var &);
-  CORBA_Current_ptr operator-> (void) const;
-
-  operator const CORBA_Current_ptr &() const;
-  operator CORBA_Current_ptr &();
-  // in, inout, out, _retn
-  CORBA_Current_ptr in (void) const;
-  CORBA_Current_ptr &inout (void);
-  CORBA_Current_ptr &out (void);
-  CORBA_Current_ptr _retn (void);
-  CORBA_Current_ptr ptr (void) const;
-
-private:
-  CORBA_Current_ptr ptr_;
-};
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CURRENT___OUT_CH_)
-#define _CORBA_CURRENT___OUT_CH_
-
-class  CORBA_Current_out
-{
-public:
-  CORBA_Current_out (CORBA_Current_ptr &);
-  CORBA_Current_out (CORBA_Current_var &);
-  CORBA_Current_out (CORBA_Current_out &);
-  CORBA_Current_out &operator= (CORBA_Current_out &);
-  CORBA_Current_out &operator= (const CORBA_Current_var &);
-  CORBA_Current_out &operator= (CORBA_Current_ptr);
-  operator CORBA_Current_ptr &();
-  CORBA_Current_ptr &ptr (void);
-  CORBA_Current_ptr operator-> (void);
-
-private:
-  CORBA_Current_ptr &ptr_;
-};
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CURRENT_CH_)
-#define _CORBA_CURRENT_CH_
-
-class  CORBA_Current : public virtual ACE_CORBA_1 (Object)
-{
- public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_Current_ptr _ptr_type;
-    typedef CORBA_Current_var _var_type;
-  #endif /* __GNUC__ */
-
-  // the static operations
-  static CORBA_Current_ptr _duplicate (CORBA_Current_ptr obj);
-  static CORBA_Current_ptr _narrow (CORBA::Object_ptr obj,
-                                    CORBA_Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ());
-  static CORBA_Current_ptr _nil (void);
-
-  virtual CORBA::Boolean _is_a (const CORBA::Char *type_id,
-                                CORBA_Environment &ACE_TRY_ENV =
-                                    TAO_default_environment ()
-                                );
-  virtual const char* _interface_repository_id (void) const;
- protected:
-  CORBA_Current (void); // default constructor
-  CORBA_Current (TAO_Stub *objref,
-           TAO_ServantBase *_tao_servant = 0,
-           CORBA::Boolean _tao_collocated = 0
-           );
-  virtual ~CORBA_Current (void);
- private:
-  CORBA_Current (const CORBA_Current &);
-  void operator= (const CORBA_Current &);
-};
-
-
-#endif /* end #if !defined */
-
-// Any operators for interface CORBA_Current
-void operator<<= (CORBA::Any &, CORBA_Current_ptr);
-CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_Current *&);
-
-#if defined (__ACE_INLINE__)
-#include "CurrentC.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_IDL_CURRENTC_H */
diff --git a/TAO/tao/CurrentC.i b/TAO/tao/CurrentC.i
deleted file mode 100644
index e4232c052e2..00000000000
--- a/TAO/tao/CurrentC.i
+++ /dev/null
@@ -1,195 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-ACE_INLINE
-CORBA_Current::CORBA_Current (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA_Current::CORBA_Current (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA_Current::~CORBA_Current (void) // destructor
-{}
-
-
-#if !defined (_CORBA_CURRENT___VAR_CI_)
-#define _CORBA_CURRENT___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_Current_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_Current_var::CORBA_Current_var (void) // default constructor
-  : ptr_ (CORBA_Current::_nil ())
-{}
-
-ACE_INLINE
-CORBA_Current_var::CORBA_Current_var (CORBA_Current_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA_Current_ptr
-CORBA_Current_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Current_var::CORBA_Current_var (const CORBA_Current_var &p) // copy constructor
-  : ptr_ (CORBA_Current::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_Current_var::~CORBA_Current_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_Current_var &
-CORBA_Current_var::operator= (CORBA_Current_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_Current_var &
-CORBA_Current_var::operator= (const CORBA_Current_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_Current::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_Current_var::operator const CORBA_Current_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Current_var::operator CORBA_Current_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Current_ptr
-CORBA_Current_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Current_ptr
-CORBA_Current_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Current_ptr &
-CORBA_Current_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Current_ptr &
-CORBA_Current_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_Current::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Current_ptr
-CORBA_Current_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_Current_ptr val = this->ptr_;
-  this->ptr_ = CORBA_Current::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CURRENT___OUT_CI_)
-#define _CORBA_CURRENT___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_Current_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_Current_out::CORBA_Current_out (CORBA_Current_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA_Current::_nil ();
-}
-
-ACE_INLINE
-CORBA_Current_out::CORBA_Current_out (CORBA_Current_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_Current::_nil ();
-}
-
-ACE_INLINE
-CORBA_Current_out::CORBA_Current_out (CORBA_Current_out &p) // copy constructor
-  : ptr_ (p.ptr_)
-{}
-
-ACE_INLINE CORBA_Current_out &
-CORBA_Current_out::operator= (CORBA_Current_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_Current_out &
-CORBA_Current_out::operator= (const CORBA_Current_var &p)
-{
-  this->ptr_ = CORBA_Current::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_Current_out &
-CORBA_Current_out::operator= (CORBA_Current_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_Current_out::operator CORBA_Current_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Current_ptr &
-CORBA_Current_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Current_ptr
-CORBA_Current_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
diff --git a/TAO/tao/CurrentS.cpp b/TAO/tao/CurrentS.cpp
deleted file mode 100644
index 6b31268b162..00000000000
--- a/TAO/tao/CurrentS.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "tao/CurrentC.h"
-#include "tao/Operation_Table.h"
-#include "tao/POA_CORBA.h"
-#include "tao/Server_Request.h"
-#include "tao/Environment.h"
-#include "tao/Typecode.h"
-
-ACE_RCSID(tao, CurrentS, "$Id$")
-
-POA_CORBA::Current::Current (void)
-{
-}
-
-// skeleton destructor
-POA_CORBA::Current::~Current (void)
-{
-}
-
-CORBA::Boolean POA_CORBA::Current::_is_a (
-    const char* value,
-    CORBA::Environment &
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Current:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_CORBA::Current::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Current:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Current_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-const char* POA_CORBA::Current::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/Current:1.0";
-}
-
-POA_CORBA::_tao_collocated_Current::_tao_collocated_Current (
-    POA_CORBA::Current_ptr  servant,
-    TAO_Stub *stub
-  )
-  : CORBA_Current (stub, servant, 1),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_CORBA::Current_ptr POA_CORBA::_tao_collocated_Current::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_CORBA::_tao_collocated_Current::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-
-CORBA::Current*
-POA_CORBA::Current::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_CORBA::_tao_collocated_Current (this, stub);
-}
diff --git a/TAO/tao/Domain.pidl b/TAO/tao/Domain.pidl
deleted file mode 100644
index 1e413c6bed1..00000000000
--- a/TAO/tao/Domain.pidl
+++ /dev/null
@@ -1,46 +0,0 @@
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   Domain.pidl
-//
-// = DESCRIPTION
-//   This file was used to generate the code in Domain{C,S,S_T}.{h,i,cpp}
-//   The code is then hand-crafted to compile it inside the ORB, avoid
-//   cyclic dependencies and enforce the locality constraints on
-//   certain objects.
-//
-// ================================================================
-
-#if !defined POLICY_DOMAIN_IDL
-#define POLICY_DOMAIN_IDL
-
-#pragma prefix "omg.org"
-
-#include "Policy.pidl"
-
-module CORBA
-{
-  interface DomainManager
-  {
-    Policy get_domain_policy (
-      in PolicyType policy_type);
-  };
-
-  const PolicyType SecConstruction = 11;
-
-  interface ConstructionPolicy : Policy
-  {
-    void make_domain_manager (
-      in InterfaceDef object_type,
-      in boolean constr_policy);
-  };
-
-  typedef sequence <DomainManager> DomainManagerList;
-};
-
-#endif /* !defined POLICY_DOMAIN_IDL */
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
deleted file mode 100644
index fd4e7f9c50a..00000000000
--- a/TAO/tao/DomainC.cpp
+++ /dev/null
@@ -1,486 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-//
-// And later modified by Jeff Parsons
-//
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-//
-//
-
-#include "tao/DomainC.h"
-#include "tao/Stub.h"
-#include "tao/Invocation.h"
-#include "tao/varout.h"
-#include "tao/POA_CORBA.h"
-#include "tao/ORB.h"
-
-#if !defined (__ACE_INLINE__)
-#include "DomainC.i"
-#endif /* !defined INLINE */
-
-const CORBA::PolicyType CORBA::SecConstruction = 11;
-
-CORBA::DomainManager_ptr
-CORBA_DomainManager::_nil (void)
-{
-  return (CORBA::DomainManager_ptr)0;
-}
-
-CORBA_DomainManager_ptr CORBA_DomainManager::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA_DomainManager::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/DomainManager:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_DomainManager::_nil ());
-  if (is_a == 0)
-    return CORBA_DomainManager::_nil ();
-  return CORBA_DomainManager::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-CORBA_DomainManager_ptr CORBA_DomainManager::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  if (CORBA::is_nil (obj))
-    return CORBA_DomainManager::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/DomainManager:1.0");
-  if (servant == 0)
-    return new CORBA_DomainManager(stub);
-  return new POA_CORBA::_tao_collocated_DomainManager(
-      ACE_reinterpret_cast(POA_CORBA::DomainManager_ptr, servant),
-      stub
-    );
-}
-
-CORBA_DomainManager_ptr
-CORBA_DomainManager::_duplicate (CORBA_DomainManager_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-CORBA::Policy_ptr CORBA_DomainManager::get_domain_policy (
-    CORBA::PolicyType policy_type,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    CORBA::Policy_ptr _tao_retval = CORBA::Policy::_nil ();
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "get_domain_policy",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << policy_type)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::Boolean CORBA_DomainManager::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/DomainManager:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
-}
-
-const char* CORBA_DomainManager::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/DomainManager:1.0";
-}
-
-#if ! defined (TAO_HAS_MINIMUM_CORBA)
-
-CORBA::ConstructionPolicy_ptr CORBA::ConstructionPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::ConstructionPolicy::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ConstructionPolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::ConstructionPolicy::_nil ());
-  if (is_a == 0)
-    return CORBA::ConstructionPolicy::_nil ();
-  return CORBA::ConstructionPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-CORBA::ConstructionPolicy_ptr CORBA::ConstructionPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  if (CORBA::is_nil (obj))
-    return CORBA::ConstructionPolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/ConstructionPolicy:1.0");
-  if (servant == 0)
-    return new CORBA::ConstructionPolicy(stub);
-  return new POA_CORBA::_tao_collocated_ConstructionPolicy(
-      ACE_reinterpret_cast(POA_CORBA::ConstructionPolicy_ptr, servant),
-      stub
-    );
-}
-
-CORBA::ConstructionPolicy_ptr
-CORBA::ConstructionPolicy::_duplicate (CORBA::ConstructionPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-void CORBA::ConstructionPolicy::make_domain_manager (
-    CORBA::InterfaceDef_ptr object_type,
-    CORBA::Boolean constr_policy,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  // @@ TODO this method will require some modifications once the
-  // interface repository is implemented. The modifications are
-  // documented with @@ comments.
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "make_domain_manager",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-        ACE_CHECK;
-
-#if 0
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-  // @@ The insertion operation (<<) for InterfaceDef will be
-  // defined, and thus this code will work.
-    if (!(
-          (_tao_out << object_type) &&
-          (_tao_out << CORBA::Any::from_boolean (constr_policy))
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-#else
-    ACE_UNUSED_ARG (object_type);
-    ACE_UNUSED_ARG (constr_policy);
-#endif /* 0 */
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-
-  }
-
-}
-
-CORBA::Boolean CORBA::ConstructionPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ConstructionPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
-}
-
-const char* CORBA::ConstructionPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ConstructionPolicy:1.0";
-}
-
-#endif /* ! defined (TAO_HAS_MINIMUM_CORBA) */
-
-// *************************************************************
-// CORBA_DomainManagerList
-// *************************************************************
-
-CORBA_DomainManagerList::CORBA_DomainManagerList (void)
-{}
-
-CORBA_DomainManagerList::CORBA_DomainManagerList (CORBA::ULong max) // uses max size
-  : TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var> (max)
-{}
-
-CORBA_DomainManagerList::CORBA_DomainManagerList (CORBA::ULong max,
-                                                  CORBA::ULong length,
-                                                  CORBA_DomainManager_ptr *buffer,
-                                                  CORBA::Boolean release)
-  : TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var> (max,
-                                                        length,
-                                                        buffer,
-                                                        release)
-{}
-
-CORBA_DomainManagerList::CORBA_DomainManagerList (const CORBA_DomainManagerList &seq) // copy ctor
-  : TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var> (seq)
-{}
-
-CORBA_DomainManagerList::~CORBA_DomainManagerList (void) // dtor
-{}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA_DomainManager_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = CORBA_DomainManager::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_DomainManager, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_DomainManager_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA_DomainManager::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_DomainManager, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (CORBA::_tc_DomainManager, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA_DomainManager::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_DomainManager, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA_DomainManager,CORBA_DomainManager_var>;
-  template class TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var>;
-  template class TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Field_T<CORBA_DomainManager,CORBA_DomainManager_var>
-# pragma instantiate TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var>
-# pragma instantiate TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#if ! defined (TAO_HAS_MINIMUM_CORBA)
-
-void operator<<= (CORBA::Any &_tao_any, CORBA_ConstructionPolicy_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = CORBA_ConstructionPolicy::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_ConstructionPolicy, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ConstructionPolicy_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA_ConstructionPolicy::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ConstructionPolicy, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (CORBA::_tc_ConstructionPolicy, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA_ConstructionPolicy::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_ConstructionPolicy, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA_ConstructionPolicy,CORBA_ConstructionPolicy_var>;
-  template class TAO_Object_Manager<CORBA_ConstructionPolicy,CORBA_ConstructionPolicy_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA_ConstructionPolicy,CORBA_ConstructionPolicy_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* ! defined (TAO_HAS_MINIMUM_CORBA) */
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA_DomainManagerList &_tao_elem
-  ) // copying
-{
-  CORBA_DomainManagerList *_tao_any_val;
-  ACE_NEW (_tao_any_val, CORBA_DomainManagerList (_tao_elem));
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_DomainManagerList, _tao_any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA_DomainManagerList *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_DomainManagerList, _tao_elem, 0, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_DomainManagerList *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_DomainManagerList, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA_DomainManagerList *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA_DomainManagerList, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_DomainManagerList, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_DomainManagerList, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h
deleted file mode 100644
index b720bcb41ff..00000000000
--- a/TAO/tao/DomainC.h
+++ /dev/null
@@ -1,338 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#ifndef TAO_IDL_DOMAINC_H
-#define TAO_IDL_DOMAINC_H
-
-#include "tao/corbafwd.h"
-#include "tao/PolicyC.h"
-#include "tao/Environment.h"
-#include "tao/Any.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class TAO_Export CORBA_DomainManager_var
-{
-public:
-  CORBA_DomainManager_var (void); // default constructor
-  CORBA_DomainManager_var (CORBA_DomainManager_ptr);
-  CORBA_DomainManager_var (const CORBA_DomainManager_var &); // copy constructor
-  ~CORBA_DomainManager_var (void); // destructor
-
-  CORBA_DomainManager_var &operator= (CORBA_DomainManager_ptr);
-  CORBA_DomainManager_var &operator= (const CORBA_DomainManager_var &);
-  CORBA_DomainManager_ptr operator-> (void) const;
-
-  operator const CORBA_DomainManager_ptr &() const;
-  operator CORBA_DomainManager_ptr &();
-  // in, inout, out, _retn
-  CORBA_DomainManager_ptr in (void) const;
-  CORBA_DomainManager_ptr &inout (void);
-  CORBA_DomainManager_ptr &out (void);
-  CORBA_DomainManager_ptr _retn (void);
-  CORBA_DomainManager_ptr ptr (void) const;
-
-private:
-  CORBA_DomainManager_ptr ptr_;
-};
-
-class TAO_Export CORBA_DomainManager_out
-{
-public:
-  CORBA_DomainManager_out (CORBA_DomainManager_ptr &);
-  CORBA_DomainManager_out (CORBA_DomainManager_var &);
-  CORBA_DomainManager_out (const CORBA_DomainManager_out &);
-  CORBA_DomainManager_out &operator= (const CORBA_DomainManager_out &);
-  CORBA_DomainManager_out &operator= (const CORBA_DomainManager_var &);
-  CORBA_DomainManager_out &operator= (CORBA_DomainManager_ptr);
-  operator CORBA_DomainManager_ptr &();
-  CORBA_DomainManager_ptr &ptr (void);
-  CORBA_DomainManager_ptr operator-> (void);
-
-private:
-  CORBA_DomainManager_ptr &ptr_;
-};
-
-class TAO_Export CORBA_DomainManager : public virtual CORBA_Object
-{
-public:
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_DomainManager_ptr _ptr_type;
-  typedef CORBA_DomainManager_var _var_type;
-#endif /* __GNUC__ */
-
-  // the static operations
-  static CORBA_DomainManager_ptr _duplicate (CORBA_DomainManager_ptr obj);
-  static CORBA_DomainManager_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static CORBA_DomainManager_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static CORBA_DomainManager_ptr _nil (void);
-
-  virtual CORBA::Policy_ptr get_domain_policy (
-      CORBA::PolicyType policy_type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  virtual const char* _interface_repository_id (void) const;
-
-protected:
-  CORBA_DomainManager (void);
-  CORBA_DomainManager (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
-      CORBA::Boolean _tao_collocated = 0
-    );
-  virtual ~CORBA_DomainManager (void);
-private:
-  CORBA_DomainManager (const CORBA_DomainManager &);
-  void operator= (const CORBA_DomainManager &);
-};
-
-// *************************************************************
-// DomainManagerList
-// *************************************************************
-
-class TAO_Export CORBA_DomainManagerList : public TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var>
-{
-public:
-  CORBA_DomainManagerList (void); // default ctor
-  CORBA_DomainManagerList (CORBA::ULong max); // uses max size
-  CORBA_DomainManagerList (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA_DomainManager_ptr *buffer,
-    CORBA::Boolean release=0
-  );
-  CORBA_DomainManagerList (const CORBA_DomainManagerList &); // copy ctor
-  ~CORBA_DomainManagerList (void); // dtor
-};
-
-typedef CORBA_DomainManagerList *CORBA_DomainManagerList_ptr;
-
-// *************************************************************
-// class CORBA::DomainManagerList_var
-// *************************************************************
-
-class TAO_Export CORBA_DomainManagerList_var
-{
-public:
-  CORBA_DomainManagerList_var (void); // default constructor
-  CORBA_DomainManagerList_var (CORBA_DomainManagerList *);
-  CORBA_DomainManagerList_var (const CORBA_DomainManagerList_var &); // copy constructor
-  ~CORBA_DomainManagerList_var (void); // destructor
-
-  CORBA_DomainManagerList_var &operator= (CORBA_DomainManagerList *);
-  CORBA_DomainManagerList_var &operator= (const CORBA_DomainManagerList_var &);
-  CORBA_DomainManagerList *operator-> (void);
-  const CORBA_DomainManagerList *operator-> (void) const;
-
-  operator const CORBA_DomainManagerList &() const;
-  operator CORBA_DomainManagerList &();
-  operator CORBA_DomainManagerList &() const;
-
-  TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var> operator[] (CORBA::ULong slot);
-  // in, inout, out, _retn
-  const CORBA_DomainManagerList &in (void) const;
-  CORBA_DomainManagerList &inout (void);
-  CORBA_DomainManagerList *&out (void);
-  CORBA_DomainManagerList *_retn (void);
-  CORBA_DomainManagerList *ptr (void) const;
-
-private:
-  CORBA_DomainManagerList *ptr_;
-};
-
-class TAO_Export CORBA_DomainManagerList_out
-{
-public:
-  CORBA_DomainManagerList_out (CORBA_DomainManagerList *&);
-  CORBA_DomainManagerList_out (CORBA_DomainManagerList_var &);
-  CORBA_DomainManagerList_out (const CORBA_DomainManagerList_out &);
-  CORBA_DomainManagerList_out &operator= (const CORBA_DomainManagerList_out &);
-  CORBA_DomainManagerList_out &operator= (CORBA_DomainManagerList *);
-  operator CORBA_DomainManagerList *&();
-  CORBA_DomainManagerList *&ptr (void);
-  CORBA_DomainManagerList *operator-> (void);
-
-  TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var> operator[] (CORBA::ULong slot);
-
-private:
-  CORBA_DomainManagerList *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_DomainManagerList_var &);
-};
-
-// *************************************************************
-// ConstructionPolicy
-// *************************************************************
-
-#if ! defined (TAO_HAS_MINIMUM_CORBA)
-
-class TAO_Export CORBA_ConstructionPolicy_var
-{
-public:
-  CORBA_ConstructionPolicy_var (void); // default constructor
-  CORBA_ConstructionPolicy_var (CORBA_ConstructionPolicy_ptr);
-  CORBA_ConstructionPolicy_var (const CORBA_ConstructionPolicy_var &); // copy constructor
-  ~CORBA_ConstructionPolicy_var (void); // destructor
-
-  CORBA_ConstructionPolicy_var &operator= (CORBA_ConstructionPolicy_ptr);
-  CORBA_ConstructionPolicy_var &operator= (const CORBA_ConstructionPolicy_var &);
-  CORBA_ConstructionPolicy_ptr operator-> (void) const;
-
-  operator const CORBA_ConstructionPolicy_ptr &() const;
-  operator CORBA_ConstructionPolicy_ptr &();
-  // in, inout, out, _retn
-  CORBA_ConstructionPolicy_ptr in (void) const;
-  CORBA_ConstructionPolicy_ptr &inout (void);
-  CORBA_ConstructionPolicy_ptr &out (void);
-  CORBA_ConstructionPolicy_ptr _retn (void);
-  CORBA_ConstructionPolicy_ptr ptr (void) const;
-
-private:
-  CORBA_ConstructionPolicy_ptr ptr_;
-};
-
-class TAO_Export CORBA_ConstructionPolicy_out
-{
-public:
-  CORBA_ConstructionPolicy_out (CORBA_ConstructionPolicy_ptr &);
-  CORBA_ConstructionPolicy_out (CORBA_ConstructionPolicy_var &);
-  CORBA_ConstructionPolicy_out (const CORBA_ConstructionPolicy_out &);
-  CORBA_ConstructionPolicy_out &operator= (const CORBA_ConstructionPolicy_out &);
-  CORBA_ConstructionPolicy_out &operator= (const CORBA_ConstructionPolicy_var &);
-  CORBA_ConstructionPolicy_out &operator= (CORBA_ConstructionPolicy_ptr);
-  operator CORBA_ConstructionPolicy_ptr &();
-  CORBA_ConstructionPolicy_ptr &ptr (void);
-  CORBA_ConstructionPolicy_ptr operator-> (void);
-
-private:
-  CORBA_ConstructionPolicy_ptr &ptr_;
-};
-
-class TAO_Export CORBA_ConstructionPolicy: public virtual CORBA_Policy
-{
-public:
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_ConstructionPolicy_ptr _ptr_type;
-  typedef CORBA_ConstructionPolicy_var _var_type;
-#endif /* __GNUC__ */
-
-  // the static operations
-  static CORBA_ConstructionPolicy_ptr _duplicate (CORBA_ConstructionPolicy_ptr obj);
-  static CORBA_ConstructionPolicy_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static CORBA_ConstructionPolicy_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static CORBA_ConstructionPolicy_ptr _nil (void);
-
-  virtual void make_domain_manager (
-      CORBA::InterfaceDef_ptr object_type,
-      CORBA::Boolean constr_policy,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  virtual const char* _interface_repository_id (void) const;
-
-protected:
-  CORBA_ConstructionPolicy (void);
-  CORBA_ConstructionPolicy (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
-      CORBA::Boolean _tao_collocated = 0
-    );
-  virtual ~CORBA_ConstructionPolicy (void);
-private:
-  CORBA_ConstructionPolicy (const CORBA_ConstructionPolicy &);
-  void operator= (const CORBA_ConstructionPolicy &);
-};
-
-// Any operators for interface CORBA_ConstructionPolicy
-void TAO_Export operator<<= (CORBA::Any &,
-                             CORBA_ConstructionPolicy_ptr);
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &,
-                                       CORBA_ConstructionPolicy *&);
-
-#ifndef __ACE_INLINE__
-
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &,
-                                      const CORBA_ConstructionPolicy_ptr );
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &,
-                                      CORBA_ConstructionPolicy_ptr &);
-
-#endif /* __ACE_INLINE__ */
-
-#endif /* ! defined (TAO_HAS_MINIMUM_CORBA) */
-
-
-
-
-// Any operators for interface CORBA_DomainManager
-void TAO_Export operator<<= (CORBA::Any &,
-                             CORBA_DomainManager_ptr);
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &,
-                                       CORBA_DomainManager *&);
-
-// Any operators for interface CORBA_DomainManagerList
-void TAO_Export operator<<= (CORBA::Any &,
-                             const CORBA_DomainManagerList &); // copying version
-void TAO_Export operator<<= (CORBA::Any &,
-                             CORBA_DomainManagerList*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &,
-                                       CORBA_DomainManagerList *&);
-
-#ifndef __ACE_INLINE__
-
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &,
-                                      const CORBA_DomainManager_ptr );
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &,
-                                      CORBA_DomainManager_ptr &);
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &,
-                                      const CORBA_DomainManagerList &);
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &,
-                                      CORBA_DomainManagerList &);
-#endif /* __ACE_INLINE__ */
-
-#if defined (__ACE_INLINE__)
-#include "DomainC.i"
-#endif /* defined INLINE */
-
-#endif /* TAO_IDL_DOMAINC_H */
diff --git a/TAO/tao/DomainC.i b/TAO/tao/DomainC.i
deleted file mode 100644
index b8c7ae4f439..00000000000
--- a/TAO/tao/DomainC.i
+++ /dev/null
@@ -1,684 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-ACE_INLINE
-CORBA_DomainManager::CORBA_DomainManager (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA_DomainManager::CORBA_DomainManager (TAO_Stub *objref,
-                                     TAO_ServantBase *_tao_servant,
-                                     CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA_DomainManager::~CORBA_DomainManager (void) // destructor
-{}
-
-
-// *************************************************************
-// Inline operations for class CORBA::DomainManager_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_DomainManager_var::CORBA_DomainManager_var (void) // default constructor
-  : ptr_ (CORBA::DomainManager::_nil ())
-{}
-
-ACE_INLINE
-CORBA_DomainManager_var::CORBA_DomainManager_var (CORBA::DomainManager_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA::DomainManager_ptr
-CORBA_DomainManager_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_DomainManager_var::CORBA_DomainManager_var (const CORBA::DomainManager_var &p) // copy constructor
-  : ptr_ (CORBA::DomainManager::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_DomainManager_var::~CORBA_DomainManager_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::DomainManager_var &
-CORBA_DomainManager_var::operator= (CORBA::DomainManager_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::DomainManager_var &
-CORBA_DomainManager_var::operator= (const CORBA::DomainManager_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::DomainManager::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_DomainManager_var::operator const CORBA::DomainManager_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_DomainManager_var::operator CORBA::DomainManager_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::DomainManager_ptr
-CORBA_DomainManager_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::DomainManager_ptr
-CORBA_DomainManager_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::DomainManager_ptr &
-CORBA_DomainManager_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::DomainManager_ptr &
-CORBA_DomainManager_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_DomainManager::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::DomainManager_ptr
-CORBA_DomainManager_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_DomainManager_ptr val = this->ptr_;
-  this->ptr_ = CORBA_DomainManager::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::DomainManager_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_DomainManager_out::CORBA_DomainManager_out (CORBA_DomainManager_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA::DomainManager::_nil ();
-}
-
-ACE_INLINE
-CORBA_DomainManager_out::CORBA_DomainManager_out (CORBA_DomainManager_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_DomainManager::_nil ();
-}
-
-ACE_INLINE
-CORBA_DomainManager_out::CORBA_DomainManager_out (const CORBA_DomainManager_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_DomainManager_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_DomainManager_out &
-CORBA_DomainManager_out::operator= (const CORBA_DomainManager_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::DomainManager_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_DomainManager_out &
-CORBA_DomainManager_out::operator= (const CORBA_DomainManager_var &p)
-{
-  this->ptr_ = CORBA::DomainManager::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_DomainManager_out &
-CORBA_DomainManager_out::operator= (CORBA_DomainManager_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_DomainManager_out::operator CORBA_DomainManager_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DomainManager_ptr &
-CORBA_DomainManager_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DomainManager_ptr
-CORBA_DomainManager_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-#if ! defined (TAO_HAS_MINIMUM_CORBA)
-
-ACE_INLINE
-CORBA_ConstructionPolicy::CORBA_ConstructionPolicy (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA_ConstructionPolicy::CORBA_ConstructionPolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA_ConstructionPolicy::~CORBA_ConstructionPolicy (void) // destructor
-{}
-
-ACE_INLINE CORBA::ConstructionPolicy_ptr
-CORBA_ConstructionPolicy::_nil (void)
-{
-  return (CORBA_ConstructionPolicy_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ConstructionPolicy_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_ConstructionPolicy_var::CORBA_ConstructionPolicy_var (void) // default constructor
-  : ptr_ (CORBA_ConstructionPolicy::_nil ())
-{}
-
-ACE_INLINE
-CORBA_ConstructionPolicy_var::CORBA_ConstructionPolicy_var (CORBA_ConstructionPolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA_ConstructionPolicy_ptr
-CORBA_ConstructionPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_ConstructionPolicy_var::CORBA_ConstructionPolicy_var (const CORBA_ConstructionPolicy_var &p) // copy constructor
-  : ptr_ (CORBA_ConstructionPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_ConstructionPolicy_var::~CORBA_ConstructionPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_ConstructionPolicy_var &
-CORBA_ConstructionPolicy_var::operator= (CORBA_ConstructionPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_ConstructionPolicy_var &
-CORBA_ConstructionPolicy_var::operator= (const CORBA_ConstructionPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_ConstructionPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_ConstructionPolicy_var::operator const CORBA_ConstructionPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_ConstructionPolicy_var::operator CORBA_ConstructionPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ConstructionPolicy_ptr
-CORBA_ConstructionPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ConstructionPolicy_ptr
-CORBA_ConstructionPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ConstructionPolicy_ptr &
-CORBA_ConstructionPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ConstructionPolicy_ptr &
-CORBA_ConstructionPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_ConstructionPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ConstructionPolicy_ptr
-CORBA_ConstructionPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_ConstructionPolicy_ptr val = this->ptr_;
-  this->ptr_ = CORBA_ConstructionPolicy::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ConstructionPolicy_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_ConstructionPolicy_out::CORBA_ConstructionPolicy_out (CORBA_ConstructionPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA_ConstructionPolicy::_nil ();
-}
-
-ACE_INLINE
-CORBA_ConstructionPolicy_out::CORBA_ConstructionPolicy_out (CORBA_ConstructionPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_ConstructionPolicy::_nil ();
-}
-
-ACE_INLINE
-CORBA_ConstructionPolicy_out::CORBA_ConstructionPolicy_out (const CORBA_ConstructionPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_ConstructionPolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_ConstructionPolicy_out &
-CORBA_ConstructionPolicy_out::operator= (const CORBA_ConstructionPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_ConstructionPolicy_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_ConstructionPolicy_out &
-CORBA_ConstructionPolicy_out::operator= (const CORBA_ConstructionPolicy_var &p)
-{
-  this->ptr_ = CORBA::ConstructionPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_ConstructionPolicy_out &
-CORBA_ConstructionPolicy_out::operator= (CORBA_ConstructionPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_ConstructionPolicy_out::operator CORBA_ConstructionPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ConstructionPolicy_ptr &
-CORBA_ConstructionPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ConstructionPolicy_ptr
-CORBA_ConstructionPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* ! defined (TAO_HAS_MINIMUM_CORBA) */
-
-// *************************************************************
-// Inline operations for class CORBA::DomainManagerList_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_DomainManagerList_var::CORBA_DomainManagerList_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA_DomainManagerList_var::CORBA_DomainManagerList_var (CORBA_DomainManagerList *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_DomainManagerList_var::CORBA_DomainManagerList_var (const CORBA_DomainManagerList_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA_DomainManagerList(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_DomainManagerList_var::~CORBA_DomainManagerList_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA_DomainManagerList_var &
-CORBA_DomainManagerList_var::operator= (CORBA_DomainManagerList *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_DomainManagerList_var &
-CORBA_DomainManagerList_var::operator= (const CORBA_DomainManagerList_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA_DomainManagerList (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA_DomainManagerList *
-CORBA_DomainManagerList_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DomainManagerList *
-CORBA_DomainManagerList_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_DomainManagerList_var::operator const CORBA_DomainManagerList &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA_DomainManagerList_var::operator CORBA_DomainManagerList &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA_DomainManagerList_var::operator CORBA_DomainManagerList &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var>
-CORBA_DomainManagerList_var::operator[] (CORBA::ULong slot)
-{
-  return this->ptr_->operator[] (slot);
-}
-
-ACE_INLINE const CORBA_DomainManagerList &
-CORBA_DomainManagerList_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA_DomainManagerList &
-CORBA_DomainManagerList_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE CORBA_DomainManagerList *&
-CORBA_DomainManagerList_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DomainManagerList *
-CORBA_DomainManagerList_var::_retn (void)
-{
-  CORBA_DomainManagerList *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA_DomainManagerList *
-CORBA::DomainManagerList_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::DomainManagerList_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_DomainManagerList_out::CORBA_DomainManagerList_out (CORBA_DomainManagerList *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_DomainManagerList_out::CORBA_DomainManagerList_out (CORBA_DomainManagerList_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_DomainManagerList_out::CORBA_DomainManagerList_out (const CORBA_DomainManagerList_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_DomainManagerList_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_DomainManagerList_out &
-CORBA_DomainManagerList_out::operator= (const CORBA_DomainManagerList_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_DomainManagerList_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_DomainManagerList_out &
-CORBA_DomainManagerList_out::operator= (CORBA_DomainManagerList *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_DomainManagerList_out::operator CORBA_DomainManagerList *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DomainManagerList *&
-CORBA_DomainManagerList_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DomainManagerList *
-CORBA_DomainManagerList_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var>
-CORBA_DomainManagerList_out::operator[] (CORBA::ULong slot)
-{
-  return this->ptr_->operator[] (slot);
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA_DomainManager_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA_DomainManager_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA_DomainManager_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA_DomainManager_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA_DomainManager::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if ! defined (TAO_HAS_MINIMUM_CORBA)
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA_ConstructionPolicy_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::ConstructionPolicy_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA_ConstructionPolicy_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA_ConstructionPolicy_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA_ConstructionPolicy::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#endif /* ! defined (TAO_HAS_MINIMUM_CORBA) */
-
-ACE_INLINE CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA_DomainManagerList &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_DomainManagerList &_tao_sequence)
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
diff --git a/TAO/tao/DomainS.cpp b/TAO/tao/DomainS.cpp
deleted file mode 100644
index 719e16da136..00000000000
--- a/TAO/tao/DomainS.cpp
+++ /dev/null
@@ -1,526 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "DomainC.h"
-#include "tao/Operation_Table.h"
-#include "tao/Server_Request.h"
-#include "tao/POA_CORBA.h"
-#include "tao/ORB.h"
-
-class TAO_CORBA_DomainManager_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-{
-private:
-  unsigned int hash (const char *str, unsigned int len);
-public:
- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-};
-/* starting time is 20:54:02 */
-/* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_DomainManager_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_CORBA_DomainManager_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18,  0, 18,  0, 18, 18,
-     18, 18, 18,  0, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18,  0, 18, 18, 18,
-     18,  0, 18, 18, 18, 18, 18, 18,
-    };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
-}
-
-const class TAO_operation_db_entry *
-TAO_CORBA_DomainManager_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 3,
-      MIN_WORD_LENGTH = 5,
-      MAX_WORD_LENGTH = 17,
-      MIN_HASH_VALUE = 5,
-      MAX_HASH_VALUE = 17,
-      HASH_VALUE_RANGE = 13,
-      DUPLICATES = 0
-    };
-
-  static const class TAO_operation_db_entry  wordlist[] =
-    {
-      {"",0}, {"",0}, {"",0}, {"",0}, {"",0},
-      {"_is_a",  &POA_CORBA::DomainManager::_is_a_skel},
-      {"",0}, {"",0}, {"",0}, {"",0}, {"",0}, {"",0}, {"",0},
-      {"_non_existent",  &POA_CORBA::DomainManager::_non_existent_skel},
-      {"",0}, {"",0}, {"",0},
-      {"get_domain_policy", 	&POA_CORBA::DomainManager::get_domain_policy_skel},
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      unsigned int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-        {
-          const char *s = wordlist[key].opname_;
-
-          if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
-/* ending time is 20:54:02 */
-static TAO_CORBA_DomainManager_Perfect_Hash_OpTable tao_CORBA_DomainManager_optable;
-
-// skeleton constructor
-POA_CORBA::DomainManager::DomainManager (void)
-{
-  this->optable_ = &tao_CORBA_DomainManager_optable;
-}
-
-// copy ctor
-POA_CORBA::DomainManager::DomainManager (const DomainManager& rhs)
-  :   TAO_ServantBase (rhs)
-{}
-
-// skeleton destructor
-POA_CORBA::DomainManager::~DomainManager (void)
-{
-}
-
-void POA_CORBA::DomainManager::get_domain_policy_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-)
-{
-  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::DomainManager *_tao_impl = (POA_CORBA::DomainManager *)_tao_object_reference;
-  CORBA::Policy_var _tao_retval;
-  CORBA::PolicyType policy_type;
-  if (!(
-    (_tao_in >> policy_type)
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-  _tao_retval = _tao_impl->get_domain_policy (
-    policy_type,
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval.in ())
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_CORBA::DomainManager::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::DomainManager *_tao_impl = (POA_CORBA::DomainManager *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = 0;
-  CORBA::String_var value;
-  if (!((_tao_in >> value.out ())))
-    ACE_THROW (CORBA::MARSHAL ());
-
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-    ACE_THROW (CORBA::MARSHAL ());
-}
-
-void POA_CORBA::DomainManager::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  POA_CORBA::DomainManager *_tao_impl = (POA_CORBA::DomainManager *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-    ACE_THROW (CORBA::MARSHAL ());
-}
-
-CORBA::Boolean POA_CORBA::DomainManager::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/DomainManager:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_CORBA::DomainManager::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/DomainManager:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::DomainManager_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_CORBA::DomainManager::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel, req.operation_length ()) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
-}
-
-const char* POA_CORBA::DomainManager::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/DomainManager:1.0";
-}
-
-
-CORBA::DomainManager*
-POA_CORBA::DomainManager::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_CORBA::_tao_collocated_DomainManager (this, stub);
-}
-
-POA_CORBA::_tao_collocated_DomainManager::_tao_collocated_DomainManager (
-    POA_CORBA::DomainManager_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_CORBA_1 (DomainManager) (),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_CORBA::DomainManager_ptr POA_CORBA::_tao_collocated_DomainManager::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Policy_ptr POA_CORBA::_tao_collocated_DomainManager::get_domain_policy  (
-    CORBA::PolicyType policy_type,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->get_domain_policy (
-    policy_type,
-    ACE_TRY_ENV
-  );
-}
-
-#if ! defined (TAO_HAS_MINIMUM_CORBA)
-
-class TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-{
-private:
-  unsigned int hash (const char *str, unsigned int len);
-public:
- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-};
-/* starting time is 20:54:02 */
-/* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20,  0, 20,  0, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20,  0,
-     20, 20, 20, 20,  0, 20,  0, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20,
-    };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
-}
-
-const class TAO_operation_db_entry *
-TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 3,
-      MIN_WORD_LENGTH = 5,
-      MAX_WORD_LENGTH = 19,
-      MIN_HASH_VALUE = 5,
-      MAX_HASH_VALUE = 19,
-      HASH_VALUE_RANGE = 15,
-      DUPLICATES = 0
-    };
-
-  static const class TAO_operation_db_entry  wordlist[] =
-    {
-      {"",0}, {"",0}, {"",0}, {"",0}, {"",0},
-      {"_is_a",  &POA_CORBA::ConstructionPolicy::_is_a_skel},
-      {"",0}, {"",0}, {"",0}, {"",0}, {"",0}, {"",0}, {"",0},
-      {"_non_existent",  &POA_CORBA::ConstructionPolicy::_non_existent_skel},
-      {"",0}, {"",0}, {"",0}, {"",0}, {"",0},
-      {"make_domain_manager", 	&POA_CORBA::ConstructionPolicy::make_domain_manager_skel},
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      unsigned int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-        {
-          const char *s = wordlist[key].opname_;
-
-          if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
-/* ending time is 20:54:02 */
-static TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable tao_CORBA_ConstructionPolicy_optable;
-
-// skeleton constructor
-POA_CORBA::ConstructionPolicy::ConstructionPolicy (void)
-{
-  this->optable_ = &tao_CORBA_ConstructionPolicy_optable;
-}
-
-// copy ctor
-POA_CORBA::ConstructionPolicy::ConstructionPolicy (const ConstructionPolicy& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs),
-    TAO_ServantBase (rhs)
-{}
-
-// skeleton destructor
-POA_CORBA::ConstructionPolicy::~ConstructionPolicy (void)
-{
-}
-
-void POA_CORBA::ConstructionPolicy::make_domain_manager_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-)
-{
-  // @@ TODO this method will require some modifications once the
-  // interface repository is implemented. The modifications are
-  // documented with @@ comments. Right now we raise a
-  // MARSHAL exception....
-
-  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::ConstructionPolicy *_tao_impl = (POA_CORBA::ConstructionPolicy *)_tao_object_reference;
-
-// @@ Needs implementation of InterfaceDef_var and >> operator
-#if 0
-  CORBA::InterfaceDef_var object_type;
-
-  CORBA::Boolean constr_policy;
-  if (!(
-    (_tao_in >> object_type.out ()) &&
-    (_tao_in >> CORBA::Any::to_boolean (constr_policy))
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-  _tao_impl->make_domain_manager (
-    object_type.in (),
-    constr_policy,
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-#else /* 0 */
-  ACE_UNUSED_ARG (_tao_in);
-  ACE_UNUSED_ARG (_tao_impl);
-  ACE_THROW (CORBA::MARSHAL ());
-#endif /* 0 */
-}
-
-void POA_CORBA::ConstructionPolicy::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::ConstructionPolicy *_tao_impl = (POA_CORBA::ConstructionPolicy *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = 0;
-  CORBA::String_var value;
-  if (!((_tao_in >> value.out ())))
-    ACE_THROW (CORBA::MARSHAL ());
-
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-    ACE_THROW (CORBA::MARSHAL ());
-}
-
-void POA_CORBA::ConstructionPolicy::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  POA_CORBA::ConstructionPolicy *_tao_impl = (POA_CORBA::ConstructionPolicy *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-    ACE_THROW (CORBA::MARSHAL ());
-}
-
-CORBA::Boolean POA_CORBA::ConstructionPolicy::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ConstructionPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_CORBA::ConstructionPolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ConstructionPolicy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::ConstructionPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_CORBA::ConstructionPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel, req.operation_length ()) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
-}
-
-const char* POA_CORBA::ConstructionPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ConstructionPolicy:1.0";
-}
-
-
-CORBA::ConstructionPolicy*
-POA_CORBA::ConstructionPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_CORBA::_tao_collocated_ConstructionPolicy (this, stub);
-}
-
-POA_CORBA::_tao_collocated_ConstructionPolicy::_tao_collocated_ConstructionPolicy (
-    POA_CORBA::ConstructionPolicy_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_CORBA_1 (ConstructionPolicy) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_CORBA::ConstructionPolicy_ptr POA_CORBA::_tao_collocated_ConstructionPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-void POA_CORBA::_tao_collocated_ConstructionPolicy::make_domain_manager  (
-    CORBA::InterfaceDef_ptr object_type,
-    CORBA::Boolean constr_policy,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->servant_->make_domain_manager (
-    object_type,
-    constr_policy,
-    ACE_TRY_ENV
-  );
-}
-
-CORBA::Boolean POA_CORBA::_tao_collocated_ConstructionPolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-#endif /* ! defined (TAO_HAS_MINIMUM_CORBA) */
diff --git a/TAO/tao/DomainS_T.cpp b/TAO/tao/DomainS_T.cpp
deleted file mode 100644
index 83f26cd625b..00000000000
--- a/TAO/tao/DomainS_T.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#ifndef _TAO_IDL_DOMAINS_T_CPP_
-#define _TAO_IDL_DOMAINS_T_CPP_
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#include "DomainS_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "DomainS_T.i"
-#endif /* !defined INLINE */
-
-
-#endif /* ifndef */
diff --git a/TAO/tao/DomainS_T.h b/TAO/tao/DomainS_T.h
deleted file mode 100644
index 5e7874a77fb..00000000000
--- a/TAO/tao/DomainS_T.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#ifndef _TAO_IDL_DOMAINS_T_H_
-#define _TAO_IDL_DOMAINS_T_H_
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-#if defined (__ACE_INLINE__)
-#include "DomainS_T.i"
-#endif /* defined INLINE */
-
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "DomainS_T.cpp"
-#endif /* defined REQUIRED SOURCE */
-
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("DomainS_T.cpp")
-#endif /* defined REQUIRED PRAGMA */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* ifndef */
diff --git a/TAO/tao/DomainS_T.i b/TAO/tao/DomainS_T.i
deleted file mode 100644
index efc44a409b9..00000000000
--- a/TAO/tao/DomainS_T.i
+++ /dev/null
@@ -1,200 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_CORBA::DomainManager_tie<T>::DomainManager_tie (T &t)
-        : ptr_ (&t),
-          poa_ (PortableServer::POA::_nil ()),
-          rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::DomainManager_tie<T>::DomainManager_tie (T &t, PortableServer::POA_ptr poa)
-        : ptr_ (&t),
-          poa_ (PortableServer::POA::_duplicate (poa)),
-          rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::DomainManager_tie<T>::DomainManager_tie (T *tp, CORBA::Boolean release)
-        : ptr_ (tp),
-          poa_ (PortableServer::POA::_nil ()),
-          rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::DomainManager_tie<T>::DomainManager_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-        : ptr_ (tp),
-          poa_ (PortableServer::POA::_duplicate (poa)),
-          rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::DomainManager_tie<T>::~DomainManager_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::DomainManager_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::DomainManager_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::DomainManager_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::DomainManager_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::DomainManager_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::DomainManager_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-
-  return this->DomainManager::_default_POA (ACE_TRY_ENV);
-}
-
-template <class T> ACE_INLINE
-CORBA::Policy_ptr POA_CORBA::DomainManager_tie<T>::get_domain_policy  (
-    CORBA::PolicyType policy_type,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->get_domain_policy (
-    policy_type,
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if ! defined (TAO_HAS_MINIMUM_CORBA)
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_CORBA::ConstructionPolicy_tie<T>::ConstructionPolicy_tie (T &t)
-        : ptr_ (&t),
-          poa_ (PortableServer::POA::_nil ()),
-          rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ConstructionPolicy_tie<T>::ConstructionPolicy_tie (T &t, PortableServer::POA_ptr poa)
-        : ptr_ (&t),
-          poa_ (PortableServer::POA::_duplicate (poa)),
-          rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ConstructionPolicy_tie<T>::ConstructionPolicy_tie (T *tp, CORBA::Boolean release)
-        : ptr_ (tp),
-          poa_ (PortableServer::POA::_nil ()),
-          rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ConstructionPolicy_tie<T>::ConstructionPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-        : ptr_ (tp),
-          poa_ (PortableServer::POA::_duplicate (poa)),
-          rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ConstructionPolicy_tie<T>::~ConstructionPolicy_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::ConstructionPolicy_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ConstructionPolicy_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ConstructionPolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ConstructionPolicy_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ConstructionPolicy_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ConstructionPolicy_tie<T>::_default_POA (CORBA::Environment &env)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-
-  return this->Construction::_default_POA (env);
-}
-
-template <class T> ACE_INLINE
-void POA_CORBA::ConstructionPolicy_tie<T>::make_domain_manager  (
-    CORBA::InterfaceDef_ptr object_type,
-    CORBA::Boolean constr_policy,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->make_domain_manager (
-    object_type,
-    constr_policy,
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#endif /* ! defined (TAO_HAS_MINIMUM_CORBA)
diff --git a/TAO/tao/DynAny.pidl b/TAO/tao/DynAny.pidl
deleted file mode 100644
index 6fe4d54641b..00000000000
--- a/TAO/tao/DynAny.pidl
+++ /dev/null
@@ -1,308 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    DynAny.pidl
-//
-// = DESCRIPTION
-//    Allows composition and decomposition of arbitrarily complex CORBA::Any
-//    values at runtime, without requiring compile-time knowledge of the
-//    IDL. See the OMG spec for CORBA v2.2, chapter 7.
-//
-// = AUTHOR
-//    OMG 
-//
-// ============================================================================
-
-#if !defined DYN_ANY_IDL
-#define DYN_ANY_IDL
-
-#pragma prefix "omg.org"
-
-typedef unsigned long TCKind;
-
-// IDL
-interface CORBA_DynAny
-{
-  typedef CORBA_DynAny DynAny;
-
-  exception Invalid {};
-  // Typecodes don't match, or argument has no meaningful value.
-
-  exception InvalidValue {};
-  // Argument's typecode doesn't match.
-
-  exception TypeMismatch {};
-  // Requested type doesn't match what's there.
-
-  exception InvalidSeq {};
-  // Wrong length or typecode.
-
-
-  // Used only with DynFixed
-  //typedef sequence<octet> OctetSeq;
-
-
-  TypeCode type ();
-  // Returns the typecode expected or contained which, 
-  // once the DynAny object is created, cannot be changed.
-
-  void assign (in DynAny dyn_any)
-    raises (Invalid);
-  // Previous value is overwriiten, but typecodes must match.
-
-  void from_any (in any value)
-    raises (Invalid);
-  // Previous value is overwritten, but typecodes must match.
-
-  any to_any ()
-    raises (Invalid);
-  // Constructs a new CORBA::Any.
-
-  void destroy ();
-  // Destroys this object and any DynAny objects derived from it.
-
-  DynAny copy ();
-  // Clones this object.
-
-
-  // Insertion operations
-
-  void insert_boolean (in boolean value)
-    raises (InvalidValue);
-
-  void insert_octet (in octet value)
-    raises (InvalidValue);
-
-  void insert_char (in char value)
-    raises (InvalidValue);
-
-  void insert_short (in short value)
-    raises (InvalidValue);
-
-  void insert_ushort (in unsigned short value)
-    raises (InvalidValue);
-
-  void insert_long (in long value)
-    raises (InvalidValue);
-
-  void insert_ulong (in unsigned long value)
-    raises (InvalidValue);
-
-  void insert_float (in float value)
-    raises (InvalidValue);
-
-  void insert_double (in double value)
-    raises (InvalidValue);
-
-  void insert_string (in string value)
-    raises (InvalidValue);
-
-  void insert_reference (in Object value)
-    raises (InvalidValue);
-
-  void insert_typecode (in TypeCode value)
-    raises (InvalidValue);
-
-  void insert_longlong (in long long value)
-    raises (InvalidValue);
-
-  void insert_ulonglong (in unsigned long long value)
-    raises (InvalidValue);
-
-#if 0
-  // If sizeof(long double) != 16, it's represented as 
-  // as struct and ACE has no support for conversion or
-  // arithmetic operations.
-  void insert_longdouble (in long double value)
-    raises (InvalidValue);
-#endif /* 0 */
-
-  void insert_wchar (in wchar value)
-    raises (InvalidValue);
-
-#if 0
-  // TAO IDL compiler doesn't recognize this type (yet).
-  void insert_wstring (in wstring value)
-    raises (InvalidValue);
-#endif /* 0 */
-
-  void insert_any (in any value)
-    raises (InvalidValue);
-
-  // Extraction operations
-                    
-  boolean get_boolean ()
-    raises (TypeMismatch);
-
-  octet get_octet ()
-    raises (TypeMismatch);
-
-  char get_char ()
-    raises (TypeMismatch);
-
-  short get_short ()
-    raises (TypeMismatch);
-
-  unsigned short get_ushort ()
-    raises (TypeMismatch);
-
-  long get_long ()
-    raises (TypeMismatch);
-
-  unsigned long get_ulong ()
-    raises (TypeMismatch);
-
-  float get_float ()
-    raises (TypeMismatch);
-
-  double get_double ()
-    raises (TypeMismatch);
-
-  string get_string ()
-    raises (TypeMismatch);
-
-  Object get_reference ()
-    raises (TypeMismatch);
-
-  TypeCode get_typecode ()
-    raises (TypeMismatch);
-
-  long long get_longlong ()
-    raises (TypeMismatch);
-
-  unsigned long long get_ulonglong ()
-    raises (TypeMismatch);
-
-#if 0
-  // If sizeof(long double) != 16, see above.
-  long double get_longdouble ()
-    raises (TypeMismatch);
-#endif /* 0 */
-
-  wchar get_wchar ()
-    raises (TypeMismatch);
-
-#if 0
-  // TAO IDL compiler doesn't recognize this type (yet).
-  wstring get_wstring ()
-    raises (TypeMismatch);
-#endif /* 0 */
-
-  any get_any ()
-    raises (TypeMismatch);
-
-  DynAny current_component ();
-  // Returns component at the current position which, for simple
-  // and enumerated types, is *this.
-
-  boolean next ();
-  // Moves to the next component. Returns FALSE if already at the
-  // last component.
-
-  boolean seek (in long index);
-  // Makes the component at index the current component.
-  // Returns FALSE if index is out of range.
-
-  void rewind ();
-  // Same as seek (0), which never returns a FALSE value.
-};
-
-#if 0
-// Fixed types aren't supported by TAO (yet).
-
-interface DynFixed : DynAny
-  {
-    OctetSeq get_value ();
-
-    void set_value (in OctetSeq val)
-      raises (InvalidValue);
-  };
-#endif /* 0 */
-
-interface CORBA_DynEnum : CORBA_DynAny
-{
-  // Since the internal representation is a ulong,
-  // insert_ulong () and get_ulong () can also be used.
-
-  attribute string value_as_string;
-
-  attribute unsigned long value_as_ulong;
-};
-
-typedef string FieldName;
-// The name of a struct or union member.
-
-struct NameValuePair
-{
-  FieldName id;
-
-  any value;
-};
-
-// Representation of a struct or union member.
-
-typedef sequence<NameValuePair> NameValuePairSeq;
-// External representation of the members of a DynStruct object.
-
-interface CORBA_DynStruct : CORBA_DynAny
-{
-  FieldName current_member_name ();
-
-  TCKind current_member_kind ();
-
-  NameValuePairSeq get_members ();
-
-  void set_members (in NameValuePairSeq value)
-    raises (InvalidSeq);
-  // If the argument has the wrong length or order,
-  // mismatched typecodes or invalid members, the
-  // exception is raised.
-};
-
-interface CORBA_DynUnion : CORBA_DynAny
-{
-  attribute boolean set_as_default;
-  // Should be treated as if it were readonly, which it
-  // probably will be in a future spec.
-
-  DynAny discriminator ();
-
-  TCKind discriminator_kind ();
-
-  DynAny member ();
-
-  attribute FieldName member_name;
-
-  TCKind member_kind ();
-};
-
-typedef sequence<any> AnySeq;
-// Representation of the values in a DynArray or DynSequence object.
-
-interface CORBA_DynSequence : CORBA_DynAny
-{
-  attribute unsigned long length;
-
-  AnySeq get_elements ();
-
-  void set_elements (in AnySeq value)
-    raises (InvalidSeq);
-  // Length and each typecode must match.
-};
-
-interface CORBA_DynArray : CORBA_DynAny
-{
-  AnySeq get_elements ();
-
-  void set_elements (in AnySeq value)
-    raises (InvalidSeq);
-  // Length and each typecode must match.
-};
-
-#endif /* !defined DYN_ANY_IDL */
diff --git a/TAO/tao/DynAnyC.cpp b/TAO/tao/DynAnyC.cpp
deleted file mode 100644
index 4cbfd0a118f..00000000000
--- a/TAO/tao/DynAnyC.cpp
+++ /dev/null
@@ -1,1386 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ======================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    DynAnyC.cpp
-//
-// = AUTHOR
-//
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-//
-//
-// Modified by Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ======================================================================
-
-#include "tao/DynAnyC.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#include "tao/Stub.h"
-#include "tao/Servant_Base.h"
-#include "tao/varout.h"
-#include "tao/POA_CORBA.h"
-
-#if !defined (__ACE_INLINE__)
-#include "DynAnyC.i"
-#endif /* !defined INLINE */
-
-ACE_RCSID(tao, DynAnyC, "$Id$")
-
-CORBA_DynAny_ptr CORBA_DynAny::_duplicate (CORBA_DynAny_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-
-  return obj;
-} // end of _duplicate
-
-CORBA_DynAny_ptr CORBA_DynAny::_narrow (CORBA::Object_ptr obj,
-                                        CORBA::Environment &env)
-{
-  if (CORBA::is_nil (obj))
-    return CORBA_DynAny::_nil ();
-
-  if (!obj->_is_a ("IDL:/CORBA_DynAny:1.0", env))
-    return CORBA_DynAny::_nil ();
-
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  if (!obj->_is_collocated ()
-      || !obj->_servant ()
-      || obj->_servant ()->_downcast ("IDL:/CORBA_DynAny:1.0") == 0)
-    {
-      return new CORBA_DynAny (stub);
-    }
-
-  void* servant = obj->_servant ()->_downcast ("IDL:/CORBA_DynAny:1.0");
-  return new POA_CORBA::_tao_collocated_DynAny (
-    ACE_reinterpret_cast (POA_CORBA::DynAny_ptr,
-                          servant),
-    stub
-  );
-}
-
-CORBA_DynAny_ptr CORBA_DynAny::_nil (void)
-{
-  return (CORBA_DynAny_ptr) NULL;
-} // end of _nil
-
-// default constructor
-CORBA_DynAny::Invalid::Invalid (void)
-  : CORBA_UserException (CORBA_DynAny::_tc_Invalid)
-{
-}
-
-// destructor - all members are of self managing types
-CORBA_DynAny::Invalid::~Invalid (void)
-{
-}
-
-// copy constructor
-CORBA_DynAny::Invalid::Invalid (const CORBA_DynAny::Invalid &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-  }
-
-// assignment operator
-CORBA_DynAny::Invalid&
-CORBA_DynAny::Invalid::operator= (const CORBA_DynAny::Invalid &_tao_excp)
-{
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-// narrow
-CORBA_DynAny::Invalid_ptr
-CORBA_DynAny::Invalid::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:/CORBA_DynAny/Invalid:1.0",
-                       exc->_id ())) // same type
-    return ACE_dynamic_cast (CORBA_DynAny::Invalid_ptr,
-                             exc);
-  else
-    return 0;
-}
-
-
-void CORBA_DynAny::Invalid::_raise ()
-{
-  TAO_RAISE(*this);
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *CORBA_DynAny::Invalid::_alloc (void)
-{
-  return new CORBA_DynAny::Invalid;
-}
-
-static const CORBA::Long _oc_CORBA_DynAny_Invalid[] =
-{
-  TAO_ENCAP_BYTE_ORDER,     // byte order
-  24,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x2f44796e),
-  ACE_NTOHL (0x416e792f),
-  ACE_NTOHL (0x496e7661),
-  ACE_NTOHL (0x6c69643a),
-  ACE_NTOHL (0x312e3000),   // repository ID =
-                            // IDL:/CORBA_DynAny/Invalid:1.0
-  8,
-  ACE_NTOHL (0x496e7661),
-  ACE_NTOHL (0x6c696400),   // name = Invalid
-  0,                        // member count
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_DynAny_Invalid (
-    CORBA::tk_except,
-    sizeof (_oc_CORBA_DynAny_Invalid),
-    (char *) &_oc_CORBA_DynAny_Invalid,
-    0,
-    sizeof (CORBA_DynAny::Invalid)
-  );
-
-CORBA::TypeCode_ptr CORBA_DynAny::_tc_Invalid =
-  &_tc_TAO_tc_CORBA_DynAny_Invalid;
-
-// default constructor
-CORBA_DynAny::InvalidValue::InvalidValue (void)
-  : CORBA_UserException (CORBA_DynAny::_tc_InvalidValue)
-{
-}
-
-// destructor - all members are of self managing types
-CORBA_DynAny::InvalidValue::~InvalidValue (void)
-{
-}
-
-// copy constructor
-CORBA_DynAny::InvalidValue::InvalidValue (
-    const CORBA_DynAny::InvalidValue &_tao_excp
-  )
-  : CORBA_UserException (_tao_excp._type ())
-{
-}
-
-// assignment operator
-CORBA_DynAny::InvalidValue&
-CORBA_DynAny::InvalidValue::operator= (
-    const CORBA_DynAny::InvalidValue &_tao_excp
-  )
-{
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-// narrow
-CORBA_DynAny::InvalidValue_ptr
-CORBA_DynAny::InvalidValue::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:/CORBA_DynAny/InvalidValue:1.0",
-                       exc->_id ())) // same type
-    return ACE_dynamic_cast (CORBA_DynAny::InvalidValue_ptr,
-                             exc);
-  else
-    return 0;
-}
-
-
-void CORBA_DynAny::InvalidValue::_raise ()
-{
-  TAO_RAISE(*this);
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *CORBA_DynAny::InvalidValue::_alloc (void)
-{
-  return new CORBA_DynAny::InvalidValue;
-}
-
-static const CORBA::Long _oc_CORBA_DynAny_InvalidValue[] =
-{
-  TAO_ENCAP_BYTE_ORDER,   // byte order
-  29,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x2f44796e),
-  ACE_NTOHL (0x416e792f),
-  ACE_NTOHL (0x496e7661),
-  ACE_NTOHL (0x6c696456),
-  ACE_NTOHL (0x616c7565),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0xfdfdfd),   // repository ID =
-                          // IDL:/CORBA_DynAny/InvalidValue:1.0
-  13,
-  ACE_NTOHL (0x496e7661),
-  ACE_NTOHL (0x6c696456),
-  ACE_NTOHL (0x616c7565),
-  ACE_NTOHL (0xfdfdfd),   // name = InvalidValue
-  0,                      // member count
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_DynAny_InvalidValue (
-    CORBA::tk_except,
-    sizeof (_oc_CORBA_DynAny_InvalidValue),
-    (char *) &_oc_CORBA_DynAny_InvalidValue,
-    0,
-    sizeof (CORBA_DynAny::InvalidValue)
-  );
-
-CORBA::TypeCode_ptr CORBA_DynAny::_tc_InvalidValue =
-  &_tc_TAO_tc_CORBA_DynAny_InvalidValue;
-
-// default constructor
-CORBA_DynAny::TypeMismatch::TypeMismatch (void)
-  : CORBA_UserException (CORBA_DynAny::_tc_TypeMismatch)
-{
-}
-
-// destructor - all members are of self managing types
-CORBA_DynAny::TypeMismatch::~TypeMismatch (void)
-{
-}
-
-// copy constructor
-CORBA_DynAny::TypeMismatch::TypeMismatch (
-    const CORBA_DynAny::TypeMismatch &_tao_excp
-  )
-  : CORBA_UserException (_tao_excp._type ())
-{
-}
-
-// assignment operator
-CORBA_DynAny::TypeMismatch&
-CORBA_DynAny::TypeMismatch::operator= (
-    const CORBA_DynAny::TypeMismatch &_tao_excp
-  )
-{
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-// narrow
-CORBA_DynAny::TypeMismatch_ptr
-CORBA_DynAny::TypeMismatch::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:/CORBA_DynAny/TypeMismatch:1.0",
-                       exc->_id ())) // same type
-    return ACE_dynamic_cast (CORBA_DynAny::TypeMismatch_ptr,
-                             exc);
-  else
-    return 0;
-}
-
-
-void CORBA_DynAny::TypeMismatch::_raise ()
-{
-  TAO_RAISE(*this);
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *CORBA_DynAny::TypeMismatch::_alloc (void)
-{
-  return new CORBA_DynAny::TypeMismatch;
-}
-
-static const CORBA::Long _oc_CORBA_DynAny_TypeMismatch[] =
-{
-  TAO_ENCAP_BYTE_ORDER,     // byte order
-  29,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x2f44796e),
-  ACE_NTOHL (0x416e792f),
-  ACE_NTOHL (0x54797065),
-  ACE_NTOHL (0x4d69736d),
-  ACE_NTOHL (0x61746368),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0xfdfdfd),     // repository ID =
-                            // IDL:/CORBA_DynAny/TypeMismatch:1.0
-  13, ACE_NTOHL (0x54797065),
-  ACE_NTOHL (0x4d69736d),
-  ACE_NTOHL (0x61746368),
-  ACE_NTOHL (0xfdfdfd),     // name = TypeMismatch
-  0,                        // member count
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_DynAny_TypeMismatch (
-    CORBA::tk_except,
-    sizeof (_oc_CORBA_DynAny_TypeMismatch),
-    (char *) &_oc_CORBA_DynAny_TypeMismatch,
-    0,
-    sizeof (CORBA_DynAny::TypeMismatch)
-  );
-
-CORBA::TypeCode_ptr CORBA_DynAny::_tc_TypeMismatch =
-  &_tc_TAO_tc_CORBA_DynAny_TypeMismatch;
-
-// default constructor
-CORBA_DynAny::InvalidSeq::InvalidSeq (void)
-  : CORBA_UserException (CORBA_DynAny::_tc_InvalidSeq)
-{
-}
-
-// destructor - all members are of self managing types
-CORBA_DynAny::InvalidSeq::~InvalidSeq (void)
-{
-}
-
-// copy constructor
-CORBA_DynAny::InvalidSeq::InvalidSeq (
-    const CORBA_DynAny::InvalidSeq &_tao_excp
-  )
-  : CORBA_UserException (_tao_excp._type ())
-{
-}
-
-// assignment operator
-CORBA_DynAny::InvalidSeq&
-CORBA_DynAny::InvalidSeq::operator= (
-    const CORBA_DynAny::InvalidSeq &_tao_excp
-  )
-{
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-// narrow
-CORBA_DynAny::InvalidSeq_ptr
-CORBA_DynAny::InvalidSeq::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:/CORBA_DynAny/InvalidSeq:1.0",
-                       exc->_id ())) // same type
-    return ACE_dynamic_cast (CORBA_DynAny::InvalidSeq_ptr,
-                             exc);
-  else
-    return 0;
-}
-
-
-void CORBA_DynAny::InvalidSeq::_raise ()
-{
-  TAO_RAISE(*this);
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *CORBA_DynAny::InvalidSeq::_alloc (void)
-{
-  return new CORBA_DynAny::InvalidSeq;
-}
-
-static const CORBA::Long _oc_CORBA_DynAny_InvalidSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER,     // byte order
-  27,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x2f44796e),
-  ACE_NTOHL (0x416e792f),
-  ACE_NTOHL (0x496e7661),
-  ACE_NTOHL (0x6c696453),
-  ACE_NTOHL (0x65713a31),
-  ACE_NTOHL (0x2e3000fd),   // repository ID =
-                            // IDL:/CORBA_DynAny/InvalidSeq:1.0
-  11,
-  ACE_NTOHL (0x496e7661),
-  ACE_NTOHL (0x6c696453),
-  ACE_NTOHL (0x657100fd),   // name = InvalidSeq
-  0,                        // member count
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_DynAny_InvalidSeq (
-    CORBA::tk_except,
-    sizeof (_oc_CORBA_DynAny_InvalidSeq),
-    (char *) &_oc_CORBA_DynAny_InvalidSeq,
-    0,
-    sizeof (CORBA_DynAny::InvalidSeq)
-  );
-
-CORBA::TypeCode_ptr CORBA_DynAny::_tc_InvalidSeq =
-  &_tc_TAO_tc_CORBA_DynAny_InvalidSeq;
-
-CORBA::TypeCode_ptr
-CORBA_DynAny::type (CORBA::Environment &)
-{
-  return 0;
-}
-
-void
-CORBA_DynAny::assign (CORBA_DynAny_ptr,
-                      CORBA::Environment &)
-{
-}
-
-CORBA_DynAny_ptr
-CORBA_DynAny::copy (CORBA::Environment &)
-{
-  return 0;
-}
-
-void
-CORBA_DynAny::destroy (CORBA::Environment &)
-{
-}
-
-void
-CORBA_DynAny::from_any (const CORBA_Any &,
-                        CORBA::Environment &)
-{
-}
-
-CORBA::Any_ptr
-CORBA_DynAny::to_any (CORBA::Environment &)
-{
-  return 0;
-}
-
-CORBA_DynAny_ptr
-CORBA_DynAny::current_component (CORBA::Environment &)
-{
-  return 0;
-}
-
-CORBA::Boolean
-CORBA_DynAny::next (CORBA::Environment &)
-{
-  return 0;
-}
-
-CORBA::Boolean
-CORBA_DynAny::seek (CORBA::Long,
-                    CORBA::Environment &)
-{
-  return 0;
-}
-
-void
-CORBA_DynAny::rewind (CORBA::Environment &)
-{
-}
-
-void
-CORBA_DynAny::insert_boolean (CORBA::Boolean,
-                              CORBA::Environment &)
-{
-}
-
-void
-CORBA_DynAny::insert_octet (CORBA::Octet,
-                            CORBA::Environment &)
-{
-}
-
-void
-CORBA_DynAny::insert_char (CORBA::Char,
-                           CORBA::Environment &)
-{
-}
-
-void
-CORBA_DynAny::insert_short (CORBA::Short,
-                            CORBA::Environment &)
-{
-}
-
-void
-CORBA_DynAny::insert_ushort (CORBA::UShort,
-                             CORBA::Environment &)
-{
-}
-
-void
-CORBA_DynAny::insert_long (CORBA::Long,
-                           CORBA::Environment &)
-{
-}
-
-void
-CORBA_DynAny::insert_ulong (CORBA::ULong,
-                            CORBA::Environment &)
-{
-}
-
-void
-CORBA_DynAny::insert_float (CORBA::Float,
-                            CORBA::Environment &)
-{
-}
-
-void
-CORBA_DynAny::insert_double (CORBA::Double,
-                             CORBA::Environment &)
-{
-}
-
-void
-CORBA_DynAny::insert_string (const char *,
-                             CORBA::Environment &)
-{
-}
-
-void
-CORBA_DynAny::insert_reference (CORBA::Object_ptr,
-                                CORBA::Environment &)
-{
-}
-
-void
-CORBA_DynAny::insert_typecode (CORBA::TypeCode_ptr,
-                               CORBA::Environment &)
-{
-}
-
-void
-CORBA_DynAny::insert_longlong (CORBA::LongLong,
-                               CORBA::Environment &)
-{
-}
-
-void
-CORBA_DynAny::insert_ulonglong (CORBA::ULongLong,
-                                CORBA::Environment &)
-{
-}
-
-void
-CORBA_DynAny::insert_wchar (CORBA::WChar,
-                            CORBA::Environment &)
-{
-}
-
-void
-CORBA_DynAny::insert_any (const CORBA::Any &,
-                          CORBA::Environment &)
-{
-}
-
-CORBA::Boolean
-CORBA_DynAny::get_boolean (CORBA::Environment &)
-{
-  return 0;
-}
-
-CORBA::Octet
-CORBA_DynAny::get_octet (CORBA::Environment &)
-{
-  return 0;
-}
-
-CORBA::Char
-CORBA_DynAny::get_char (CORBA::Environment &)
-{
-  return 0;
-}
-
-CORBA::Short
-CORBA_DynAny::get_short (CORBA::Environment &)
-{
-  return 0;
-}
-
-CORBA::UShort
-CORBA_DynAny::get_ushort (CORBA::Environment &)
-{
-  return 0;
-}
-
-CORBA::Long
-CORBA_DynAny::get_long (CORBA::Environment &)
-{
-  return 0;
-}
-
-CORBA::ULong
-CORBA_DynAny::get_ulong (CORBA::Environment &)
-{
-  return 0;
-}
-
-CORBA::Float
-CORBA_DynAny::get_float (CORBA::Environment &)
-{
-  return 0;
-}
-
-CORBA::Double
-CORBA_DynAny::get_double (CORBA::Environment &)
-{
-  return 0;
-}
-
-char *
-CORBA_DynAny::get_string (CORBA::Environment &)
-{
-  return 0;
-}
-
-CORBA::Object_ptr
-CORBA_DynAny::get_reference (CORBA::Environment &)
-{
-  return 0;
-}
-
-CORBA::TypeCode_ptr
-CORBA_DynAny::get_typecode (CORBA::Environment &)
-{
-  return 0;
-}
-
-CORBA::LongLong
-CORBA_DynAny::get_longlong (CORBA::Environment &)
-{
-#if defined (ACE_LACKS_LONGLONG_T)
-  CORBA::LongLong tmp = {0, 0};
-  return tmp;
-#else  /* ! ACE_LACKS_LONGLONG_T */
-  return 0;
-#endif /* ! ACE_LACKS_LONGLONG_T */
-}
-
-CORBA::ULongLong
-CORBA_DynAny::get_ulonglong (CORBA::Environment &)
-{
-  return 0;
-}
-
-CORBA::WChar
-CORBA_DynAny::get_wchar (CORBA::Environment &)
-{
-  return 0;
-}
-
-CORBA::Any_ptr
-CORBA_DynAny::get_any (CORBA::Environment &)
-{
-   return 0;
-}
-
-CORBA::Boolean CORBA_DynAny::_is_a (const CORBA::Char *value,
-                                    CORBA::Environment &env)
-{
-  if ((!ACE_OS::strcmp ((char *)value,
-                        "IDL:/CORBA_DynAny:1.0"))
-      || (!ACE_OS::strcmp ((char *)value,
-                           CORBA::_tc_Object->id (env))))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value,
-                                      env); // remote call
-}
-
-const char* CORBA_DynAny::_interface_repository_id (void) const
-{
-  return "IDL:/CORBA_DynAny:1.0";
-}
-
-static const CORBA::Long _oc_CORBA_DynAny[] =
-{
-  TAO_ENCAP_BYTE_ORDER,     // byte order
-  16,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x2f44796e),
-  ACE_NTOHL (0x416e793a),
-  ACE_NTOHL (0x312e3000),   // repository ID = IDL:/CORBA_DynAny:1.0
-  7,
-  ACE_NTOHL (0x44796e41),
-  ACE_NTOHL (0x6e7900fd),   // name = CORBA_DynAny,
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_DynAny (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_DynAny),
-    (char *) &_oc_CORBA_DynAny,
-    0,
-    sizeof (CORBA_DynAny)
-  );
-
-CORBA::TypeCode_ptr _tc_CORBA_DynAny = &_tc_TAO_tc_CORBA_DynAny;
-
-CORBA_DynEnum_ptr CORBA_DynEnum::_duplicate (CORBA_DynEnum_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-
-  return obj;
-} // end of _duplicate
-
-CORBA_DynEnum_ptr CORBA_DynEnum::_narrow (CORBA::Object_ptr obj,
-                                          CORBA::Environment &env)
-{
-  if (CORBA::is_nil (obj))
-    return CORBA_DynEnum::_nil ();
-
-  if (!obj->_is_a ("IDL:/CORBA_DynEnum:1.0", env))
-    return CORBA_DynEnum::_nil ();
-
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  if (!obj->_is_collocated ()
-      || !obj->_servant ()
-      || obj->_servant ()->_downcast ("IDL:/CORBA_DynEnum:1.0") == 0)
-    {
-      return new CORBA_DynEnum (stub);
-    }
-
-  void* servant = obj->_servant ()->_downcast ("IDL:/CORBA_DynEnum:1.0");
-  return new POA_CORBA::_tao_collocated_DynEnum (
-    ACE_reinterpret_cast (POA_CORBA::DynEnum_ptr,
-                          servant),
-    stub
-  );
-}
-
-CORBA_DynEnum_ptr CORBA_DynEnum::_nil (void)
-{
-  return (CORBA_DynEnum_ptr) NULL;
-} // end of _nil
-
-char*
-CORBA_DynEnum::value_as_string (CORBA::Environment &)
-{
-  return 0;
-}
-
-void
-CORBA_DynEnum::value_as_string (const char*,
-                                CORBA::Environment &)
-{
-}
-
-CORBA::ULong
-CORBA_DynEnum::value_as_ulong (CORBA::Environment &)
-{
-  return 0;
-}
-
-void
-CORBA_DynEnum::value_as_ulong (CORBA::ULong,
-                               CORBA::Environment &)
-{
-}
-
-CORBA::Boolean CORBA_DynEnum::_is_a (const CORBA::Char *value,
-                                     CORBA::Environment &env)
-{
-  if ((!ACE_OS::strcmp ((char *)value,
-                        "IDL:/CORBA_DynEnum:1.0"))
-      || (!ACE_OS::strcmp ((char *)value,
-                           "IDL:/CORBA_DynAny:1.0"))
-      || (!ACE_OS::strcmp ((char *)value,
-                           CORBA::_tc_Object->id (env))))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value,
-                                      env); // remote call
-}
-
-const char* CORBA_DynEnum::_interface_repository_id (void) const
-{
-  return "IDL:/CORBA_DynEnum:1.0";
-}
-
-static const CORBA::Long _oc_CORBA_DynEnum[] =
-{
-  TAO_ENCAP_BYTE_ORDER,     // byte order
-  17,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x2f44796e),
-  ACE_NTOHL (0x456e756d),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0xfdfdfd),     // repository ID = IDL:/CORBA_DynEnum:1.0
-  8,
-  ACE_NTOHL (0x44796e45),
-  ACE_NTOHL (0x6e756d00),   // name = CORBA_DynEnum,
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_DynEnum (CORBA::tk_objref,
-                                              sizeof (_oc_CORBA_DynEnum),
-                                              (char *) &_oc_CORBA_DynEnum,
-                                              0,
-                                              sizeof (CORBA_DynEnum));
-
-CORBA::TypeCode_ptr _tc_CORBA_DynEnum = &_tc_TAO_tc_CORBA_DynEnum;
-
-#if !defined (_CORBA_NAME_VALUE_PAIR_SEQ_CS_)
-#define _CORBA_NAME_VALUE_PAIR_SEQ_CS_
-
-// *************************************************************
-// CORBA_NameValuePairSeq
-// *************************************************************
-
-CORBA_NameValuePairSeq::CORBA_NameValuePairSeq (void)
-{}
-CORBA_NameValuePairSeq::CORBA_NameValuePairSeq (CORBA::ULong max) // uses max size
-  :
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
-             || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) \
-             || !defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
-  _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq
-#else /* AHETI */
-  TAO_Unbounded_Sequence<CORBA::NameValuePair>
-#endif /* AHETI */
- (max)
-{}
-CORBA_NameValuePairSeq::CORBA_NameValuePairSeq (CORBA::ULong max,
-                                    CORBA::ULong length,
-                                    CORBA::NameValuePair *buffer,
-                                    CORBA::Boolean release)
-  :
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
-             || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) \
-             || !defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
-  _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq
-#else /* AHETI */
-  TAO_Unbounded_Sequence<CORBA::NameValuePair>
-#endif /* AHETI */
- (max, length, buffer, release)
-{}
-CORBA_NameValuePairSeq::CORBA_NameValuePairSeq (
-    const CORBA_NameValuePairSeq &seq
-  ) // copy ctor
-  :
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
-             || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) \
-             || !defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
-  _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq
-#else /* AHETI */
-  TAO_Unbounded_Sequence< CORBA::NameValuePair>
-#endif /* AHETI */
- (seq)
-{}
-CORBA_NameValuePairSeq::~CORBA_NameValuePairSeq (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-CORBA_DynStruct_ptr CORBA_DynStruct::_duplicate (CORBA_DynStruct_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-
-  return obj;
-} // end of _duplicate
-
-CORBA_DynStruct_ptr CORBA_DynStruct::_narrow (CORBA::Object_ptr obj,
-                                              CORBA::Environment &env)
-{
-  if (CORBA::is_nil (obj))
-    return CORBA_DynStruct::_nil ();
-
-  if (!obj->_is_a ("IDL:/CORBA_DynStruct:1.0", env))
-    return CORBA_DynStruct::_nil ();
-
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  if (!obj->_is_collocated ()
-      || !obj->_servant ()
-      || obj->_servant ()->_downcast ("IDL:/CORBA_DynStruct:1.0") == 0
-      )
-    {
-      return new CORBA_DynStruct (stub);
-    } // end of if
-
-  void* servant = obj->_servant ()->_downcast ("IDL:/CORBA_DynStruct:1.0");
-  return new POA_CORBA::_tao_collocated_DynStruct (
-    ACE_reinterpret_cast (POA_CORBA::DynStruct_ptr,
-                          servant),
-    stub
-  );
-}
-
-CORBA_DynStruct_ptr CORBA_DynStruct::_nil (void)
-{
-  return (CORBA_DynStruct_ptr) NULL;
-} // end of _nil
-
-CORBA::FieldName
-CORBA_DynStruct::current_member_name (CORBA::Environment  &)
-{
-  return 0;
-}
-
-CORBA::TCKind
-CORBA_DynStruct::current_member_kind (CORBA::Environment &)
-{
-  return CORBA::tk_null;
-}
-
-CORBA_NameValuePairSeq*
-CORBA_DynStruct::get_members (CORBA::Environment &)
-{
-  return 0;
-}
-
-void
-CORBA_DynStruct::set_members (const CORBA_NameValuePairSeq &,
-                              CORBA::Environment &)
-{
-}
-
-CORBA::Boolean CORBA_DynStruct::_is_a (const CORBA::Char *value,
-                                       CORBA::Environment &env)
-{
-  if ((!ACE_OS::strcmp ((char *)value,
-                        "IDL:/CORBA_DynStruct:1.0"))
-      || (!ACE_OS::strcmp ((char *)value,
-                           "IDL:/CORBA_DynAny:1.0"))
-      || (!ACE_OS::strcmp ((char *)value,
-                           CORBA::_tc_Object->id (env))))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value,
-                                      env); // remote call
-}
-
-const char* CORBA_DynStruct::_interface_repository_id (void) const
-{
-  return "IDL:/CORBA_DynStruct:1.0";
-}
-
-static const CORBA::Long _oc_CORBA_DynStruct[] =
-{
-  TAO_ENCAP_BYTE_ORDER,     // byte order
-  19,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x2f44796e),
-  ACE_NTOHL (0x53747275),
-  ACE_NTOHL (0x63743a31),
-  ACE_NTOHL (0x2e3000fd),   // repository ID = IDL:/CORBA_DynStruct:1.0
-  10,
-  ACE_NTOHL (0x44796e53),
-  ACE_NTOHL (0x74727563),
-  ACE_NTOHL (0x7400fdfd),   // name = CORBA_DynStruct,
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_DynStruct (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_DynStruct),
-    (char *) &_oc_CORBA_DynStruct,
-    0,
-    sizeof (CORBA_DynStruct));
-
-CORBA::TypeCode_ptr _tc_CORBA_DynStruct = &_tc_TAO_tc_CORBA_DynStruct;
-
-CORBA_DynUnion_ptr CORBA_DynUnion::_duplicate (CORBA_DynUnion_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-
-  return obj;
-} // end of _duplicate
-
-CORBA_DynUnion_ptr CORBA_DynUnion::_narrow (CORBA::Object_ptr obj,
-                                            CORBA::Environment &env)
-{
-  if (CORBA::is_nil (obj))
-    return CORBA_DynUnion::_nil ();
-
-  if (!obj->_is_a ("IDL:/CORBA_DynUnion:1.0",
-                   env))
-    return CORBA_DynUnion::_nil ();
-
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  if (!obj->_is_collocated ()
-      || !obj->_servant ()
-      || obj->_servant ()->_downcast ("IDL:/CORBA_DynUnion:1.0") == 0)
-    {
-      return new CORBA_DynUnion (stub);
-    } // end of if
-
-  void* servant = obj->_servant ()->_downcast ("IDL:/CORBA_DynUnion:1.0");
-  return new POA_CORBA::_tao_collocated_DynUnion (
-    ACE_reinterpret_cast (POA_CORBA::DynUnion_ptr,
-                          servant),
-    stub
-  );
-}
-
-CORBA_DynUnion_ptr CORBA_DynUnion::_nil (void)
-{
-  return (CORBA_DynUnion_ptr) NULL;
-} // end of _nil
-
-CORBA::Boolean
-CORBA_DynUnion::set_as_default (CORBA::Environment &)
-{
-  return 0;
-}
-
-void
-CORBA_DynUnion::set_as_default (CORBA::Boolean,
-                                CORBA::Environment &)
-{
-}
-
-CORBA_DynAny_ptr
-CORBA_DynUnion::discriminator (CORBA::Environment &)
-{
-  return 0;
-}
-
-CORBA::TCKind
-CORBA_DynUnion::discriminator_kind (CORBA::Environment &)
-{
-  return CORBA::tk_null;
-}
-
-CORBA_DynAny_ptr
-CORBA_DynUnion::member (CORBA::Environment &)
-{
-  return 0;
-}
-
-char*
-CORBA_DynUnion::member_name (CORBA::Environment &)
-{
-  return 0;
-}
-
-void
-CORBA_DynUnion::member_name (const char*,
-                             CORBA::Environment &)
-{
-}
-
-
-CORBA::TCKind
-CORBA_DynUnion::member_kind (CORBA::Environment &)
-{
-  return CORBA::tk_null;
-}
-
-CORBA::Boolean CORBA_DynUnion::_is_a (const CORBA::Char *value,
-                                      CORBA::Environment &env)
-{
-  if ((!ACE_OS::strcmp ((char *)value,
-                        "IDL:/CORBA_DynUnion:1.0"))
-      || (!ACE_OS::strcmp ((char *)value,
-                           "IDL:/CORBA_DynAny:1.0"))
-      || (!ACE_OS::strcmp ((char *)value,
-                           CORBA::_tc_Object->id (env))))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value,
-                                      env); // remote call
-}
-
-const char* CORBA_DynUnion::_interface_repository_id (void) const
-{
-  return "IDL:/CORBA_DynUnion:1.0";
-}
-
-static const CORBA::Long _oc_CORBA_DynUnion[] =
-{
-  TAO_ENCAP_BYTE_ORDER,     // byte order
-  18,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x2f44796e),
-  ACE_NTOHL (0x556e696f),
-  ACE_NTOHL (0x6e3a312e),
-  ACE_NTOHL (0x3000fdfd),   // repository ID = IDL:/CORBA_DynUnion:1.0
-  9,
-  ACE_NTOHL (0x44796e55),
-  ACE_NTOHL (0x6e696f6e),
-  ACE_NTOHL (0xfdfdfd),     // name = CORBA_DynUnion,
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_DynUnion (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_DynUnion),
-    (char *) &_oc_CORBA_DynUnion,
-    0,
-    sizeof (CORBA_DynUnion));
-
-CORBA::TypeCode_ptr _tc_CORBA_DynUnion = &_tc_TAO_tc_CORBA_DynUnion;
-
-
-#if !defined (_CORBA_ANYSEQ_CS_)
-#define _CORBA_ANYSEQ_CS_
-
-// *************************************************************
-// CORBA_AnySeq
-// *************************************************************
-
-CORBA_AnySeq::CORBA_AnySeq (void)
-{}
-CORBA_AnySeq::CORBA_AnySeq (CORBA::ULong max) // uses max size
-  :
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
-       || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) \
-       || !defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
-  _TAO_Unbounded_Sequence_CORBA_AnySeq
-#else /* AHETI */
-  TAO_Unbounded_Sequence<CORBA::Any>
-#endif /* AHETI */
- (max)
-{}
-CORBA_AnySeq::CORBA_AnySeq (CORBA::ULong max,
-                CORBA::ULong length,
-                CORBA::Any *buffer,
-                CORBA::Boolean release)
-  :
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
-             || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) \
-             || !defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
-  _TAO_Unbounded_Sequence_CORBA_AnySeq
-#else /* AHETI */
-  TAO_Unbounded_Sequence<CORBA::Any>
-#endif /* AHETI */
- (max, length, buffer, release)
-{}
-CORBA_AnySeq::CORBA_AnySeq (const CORBA_AnySeq &seq) // copy ctor
-  :
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
-             || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) \
-             || !defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
-  _TAO_Unbounded_Sequence_CORBA_AnySeq
-#else /* AHETI */
-  TAO_Unbounded_Sequence<CORBA::Any>
-#endif /* AHETI */
- (seq)
-{}
-CORBA_AnySeq::~CORBA_AnySeq (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-CORBA_DynSequence_ptr CORBA_DynSequence::_duplicate (
-    CORBA_DynSequence_ptr obj
-  )
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-
-  return obj;
-} // end of _duplicate
-
-CORBA_DynSequence_ptr CORBA_DynSequence::_narrow (CORBA::Object_ptr obj,
-                                                  CORBA::Environment &env)
-{
-  if (CORBA::is_nil (obj))
-    return CORBA_DynSequence::_nil ();
-
-  if (!obj->_is_a ("IDL:/CORBA_DynSequence:1.0",
-                   env))
-    return CORBA_DynSequence::_nil ();
-
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  if (!obj->_is_collocated ()
-      || !obj->_servant ()
-      || obj->_servant ()->_downcast ("IDL:/CORBA_DynSequence:1.0") == 0)
-    {
-      return new CORBA_DynSequence (stub);
-    } // end of if
-  void* servant = obj->_servant ()->_downcast ("IDL:/CORBA_DynSequence:1.0");
-  return new POA_CORBA::_tao_collocated_DynSequence (
-    ACE_reinterpret_cast (POA_CORBA::DynSequence_ptr,
-                          servant),
-    stub
-  );
-}
-
-CORBA_DynSequence_ptr CORBA_DynSequence::_nil (void)
-{
-  return (CORBA_DynSequence_ptr)NULL;
-} // end of _nil
-
-CORBA::ULong
-CORBA_DynSequence::length (CORBA::Environment &)
-{
-  return 0;
-}
-
-void
-CORBA_DynSequence::length (CORBA::ULong,
-                           CORBA::Environment &)
-{
-}
-
-CORBA_AnySeq_ptr
-CORBA_DynSequence::get_elements (CORBA::Environment &)
-{
-  return 0;
-}
-
-void
-CORBA_DynSequence::set_elements (const CORBA_AnySeq &,
-                                 CORBA::Environment &)
-{
-}
-
-CORBA::Boolean CORBA_DynSequence::_is_a (const CORBA::Char *value,
-                                         CORBA::Environment &env)
-{
-  if((!ACE_OS::strcmp ((char *)value,
-                       "IDL:/CORBA_DynSequence:1.0"))
-     || (!ACE_OS::strcmp ((char *) value,
-                          "IDL:/CORBA_DynAny:1.0"))
-     || (!ACE_OS::strcmp ((char *) value,
-                          CORBA::_tc_Object->id (env))))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value,
-                                      env); // remote call
-}
-
-const char* CORBA_DynSequence::_interface_repository_id (void) const
-{
-  return "IDL:/CORBA_DynSequence:1.0";
-}
-
-static const CORBA::Long _oc_CORBA_DynSequence[] =
-{
-  TAO_ENCAP_BYTE_ORDER,     // byte order
-  21,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x2f44796e),
-  ACE_NTOHL (0x53657175),
-  ACE_NTOHL (0x656e6365),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0xfdfdfd),     // repository ID = IDL:/CORBA_DynSequence:1.0
-  12,
-  ACE_NTOHL (0x44796e53),
-  ACE_NTOHL (0x65717565),
-  ACE_NTOHL (0x6e636500),  // name = CORBA_DynSequence,
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_DynSequence (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_DynSequence),
-    (char *) &_oc_CORBA_DynSequence,
-    0,
-    sizeof (CORBA_DynSequence));
-
-CORBA::TypeCode_ptr _tc_CORBA_DynSequence =
-  &_tc_TAO_tc_CORBA_DynSequence;
-
-CORBA_DynArray_ptr CORBA_DynArray::_duplicate (CORBA_DynArray_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-
-  return obj;
-} // end of _duplicate
-
-CORBA_DynArray_ptr CORBA_DynArray::_narrow (CORBA::Object_ptr obj,
-                                            CORBA::Environment &env)
-{
-  if (CORBA::is_nil (obj))
-    return CORBA_DynArray::_nil ();
-
-  if (!obj->_is_a ("IDL:/CORBA_DynArray:1.0",
-                   env))
-    return CORBA_DynArray::_nil ();
-
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  if (!obj->_is_collocated ()
-      || !obj->_servant ()
-      || obj->_servant ()->_downcast ("IDL:/CORBA_DynArray:1.0") == 0)
-    {
-      return new CORBA_DynArray (stub);
-    } // end of if
-
-  void* servant = obj->_servant ()->_downcast ("IDL:/CORBA_DynArray:1.0");
-  return new POA_CORBA::_tao_collocated_DynArray (
-    ACE_reinterpret_cast (POA_CORBA::DynArray_ptr,
-                          servant),
-    stub
-  );
-}
-
-CORBA_DynArray_ptr CORBA_DynArray::_nil (void)
-{
-  return (CORBA_DynArray_ptr) NULL;
-} // end of _nil
-
-CORBA_AnySeq_ptr
-CORBA_DynArray::get_elements (CORBA::Environment &)
-{
-  return 0;
-}
-
-void
-CORBA_DynArray::set_elements (const CORBA_AnySeq &,
-                              CORBA::Environment &)
-{
-}
-
-CORBA::Boolean CORBA_DynArray::_is_a (const CORBA::Char *value,
-                                      CORBA::Environment &env)
-{
-  if ((!ACE_OS::strcmp ((char *)value,
-                        "IDL:/CORBA_DynArray:1.0"))
-      || (!ACE_OS::strcmp ((char *)value,
-                           "IDL:/CORBA_DynAny:1.0"))
-      || (!ACE_OS::strcmp ((char *)value,
-                           CORBA::_tc_Object->id (env))))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, env); // remote call
-}
-
-const char* CORBA_DynArray::_interface_repository_id (void) const
-{
-  return "IDL:/CORBA_DynArray:1.0";
-}
-
-static const CORBA::Long _oc_CORBA_DynArray[] =
-{
-  TAO_ENCAP_BYTE_ORDER,     // byte order
-  18,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x2f44796e),
-  ACE_NTOHL (0x41727261),
-  ACE_NTOHL (0x793a312e),
-  ACE_NTOHL (0x3000fdfd),   // repository ID = IDL:/CORBA_DynArray:1.0
-  9,
-  ACE_NTOHL (0x44796e41),
-  ACE_NTOHL (0x72726179),
-  ACE_NTOHL (0xfdfdfd),     // name = CORBA_DynArray,
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_DynArray (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_DynArray),
-    (char *) &_oc_CORBA_DynArray,
-    0,
-    sizeof (CORBA_DynArray));
-
-CORBA::TypeCode_ptr _tc_CORBA_DynArray =
-    &_tc_TAO_tc_CORBA_DynArray;
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA_DynAny,CORBA_DynAny_var>;
-  template class TAO_Object_Field_T<CORBA_DynEnum,CORBA_DynEnum_var>;
-  template class TAO_Object_Field_T<CORBA_DynStruct,CORBA_DynStruct_var>;
-  template class TAO_Object_Field_T<CORBA_DynUnion,CORBA_DynUnion_var>;
-  template class TAO_Object_Field_T<CORBA_DynSequence,CORBA_DynSequence_var>;
-  template class TAO_Object_Field_T<CORBA_DynArray,CORBA_DynArray_var>;
-  template class TAO_Object_Manager<CORBA_DynAny,CORBA_DynAny_var>;
-  template class TAO_Object_Manager<CORBA_DynEnum,CORBA_DynEnum_var>;
-  template class TAO_Object_Manager<CORBA_DynStruct,CORBA_DynStruct_var>;
-  template class TAO_Object_Manager<CORBA_DynUnion,CORBA_DynUnion_var>;
-  template class TAO_Object_Manager<CORBA_DynSequence,CORBA_DynSequence_var>;
-  template class TAO_Object_Manager<CORBA_DynArray,CORBA_DynArray_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA_DynAny,CORBA_DynAny_var>
-#  pragma instantiate TAO_Object_Field_T<CORBA_DynEnum,CORBA_DynEnum_var>
-#  pragma instantiate TAO_Object_Field_T<CORBA_DynStruct,CORBA_DynStruct_var>
-#  pragma instantiate TAO_Object_Field_T<CORBA_DynUnion,CORBA_DynUnion_var>
-#  pragma instantiate TAO_Object_Field_T<CORBA_DynSequence,CORBA_DynSequence_var>
-#  pragma instantiate TAO_Object_Field_T<CORBA_DynArray,CORBA_DynArray_var>
-#  pragma instantiate TAO_Object_Manager<CORBA_DynAny,CORBA_DynAny_var>
-#  pragma instantiate TAO_Object_Manager<CORBA_DynEnum,CORBA_DynEnum_var>
-#  pragma instantiate TAO_Object_Manager<CORBA_DynStruct,CORBA_DynStruct_var>
-#  pragma instantiate TAO_Object_Manager<CORBA_DynUnion,CORBA_DynUnion_var>
-#  pragma instantiate TAO_Object_Manager<CORBA_DynSequence,CORBA_DynSequence_var>
-#  pragma instantiate TAO_Object_Manager<CORBA_DynArray,CORBA_DynArray_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/DynAnyC.h b/TAO/tao/DynAnyC.h
deleted file mode 100644
index 8750d67984c..00000000000
--- a/TAO/tao/DynAnyC.h
+++ /dev/null
@@ -1,1554 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    DynAnyC.h
-//
-// = AUTHOR
-//
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-//
-//
-// Modified by Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_IDL_CORBA_DYNANYC_H_
-#define TAO_IDL_CORBA_DYNANYC_H_
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#include "tao/corbafwd.h"
-#include "tao/Any.h"
-#include "tao/ORB.h"
-#include "tao/Object.h"
-#include "tao/Sequence.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-class CORBA_DynAny;
-typedef CORBA_DynAny *CORBA_DynAny_ptr;
-
-class  CORBA_DynAny_var
-{
-public:
-  CORBA_DynAny_var (void); // default constructor
-  CORBA_DynAny_var (CORBA_DynAny_ptr);
-  CORBA_DynAny_var (const CORBA_DynAny_var &); // copy constructor
-  ~CORBA_DynAny_var (void); // destructor
-
-  CORBA_DynAny_var &operator= (CORBA_DynAny_ptr);
-  CORBA_DynAny_var &operator= (const CORBA_DynAny_var &);
-  CORBA_DynAny_ptr operator-> (void) const;
-
-  operator const CORBA_DynAny_ptr &() const;
-  operator CORBA_DynAny_ptr &();
-
-  // in, inout, out, _retn
-  CORBA_DynAny_ptr in (void) const;
-  CORBA_DynAny_ptr &inout (void);
-  CORBA_DynAny_ptr &out (void);
-  CORBA_DynAny_ptr _retn (void);
-  CORBA_DynAny_ptr ptr (void) const;
-
-private:
-  CORBA_DynAny_ptr ptr_;
-};
-
-class  CORBA_DynAny_out
-{
-public:
-  CORBA_DynAny_out (CORBA_DynAny_ptr &);
-  CORBA_DynAny_out (CORBA_DynAny_var &);
-  CORBA_DynAny_out (const CORBA_DynAny_out &);
-  CORBA_DynAny_out &operator= (const CORBA_DynAny_out &);
-  CORBA_DynAny_out &operator= (const CORBA_DynAny_var &);
-  CORBA_DynAny_out &operator= (CORBA_DynAny_ptr);
-  operator CORBA_DynAny_ptr &();
-  CORBA_DynAny_ptr &ptr (void);
-  CORBA_DynAny_ptr operator-> (void);
-
-private:
-  CORBA_DynAny_ptr &ptr_;
-};
-
-class TAO_Export CORBA_DynAny : public virtual ACE_CORBA_1 (Object)
-{
-public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_DynAny_ptr _ptr_type;
-    typedef CORBA_DynAny_var _var_type;
-  #endif /* __GNUC__ */
-
-  // the static operations
-  static CORBA_DynAny_ptr _duplicate (CORBA_DynAny_ptr obj);
-  static CORBA_DynAny_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-  static CORBA_DynAny_ptr _nil (void);
-
-  class Invalid;
-  typedef Invalid *Invalid_ptr;
-
-  class TAO_Export Invalid : public CORBA::UserException
-  {
-  public:
-    Invalid (void); // default ctor
-    Invalid (const Invalid &); // copy ctor
-    ~Invalid (void); // dtor
-    Invalid &operator= (const Invalid &);
-
-
-    virtual void _raise (void);
-
-    static Invalid *_narrow (CORBA::Exception *);
-
-
-    // = TAO extension
-    static CORBA::Exception *_alloc (void);
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef Invalid_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
-  }; // exception CORBA_DynAny::Invalid
-
-    static CORBA::TypeCode_ptr _tc_Invalid;
-
-  class InvalidValue;
-  typedef InvalidValue *InvalidValue_ptr;
-
-  class TAO_Export InvalidValue : public CORBA::UserException
-  {
-  public:
-    InvalidValue (void); // default ctor
-    InvalidValue (const InvalidValue &); // copy ctor
-    ~InvalidValue (void); // dtor
-    InvalidValue &operator= (const InvalidValue &);
-
-
-    virtual void _raise (void);
-
-    static InvalidValue *_narrow (CORBA::Exception *);
-
-
-    // = TAO extension
-    static CORBA::Exception *_alloc (void);
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef InvalidValue_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
-  }; // exception CORBA_DynAny::InvalidValue
-
-    static CORBA::TypeCode_ptr _tc_InvalidValue;
-
-  class TypeMismatch;
-  typedef TypeMismatch *TypeMismatch_ptr;
-
-  class TAO_Export TypeMismatch : public CORBA::UserException
-  {
-  public:
-    TypeMismatch (void); // default ctor
-    TypeMismatch (const TypeMismatch &); // copy ctor
-    ~TypeMismatch (void); // dtor
-    TypeMismatch &operator= (const TypeMismatch &);
-
-
-    virtual void _raise (void);
-
-    static TypeMismatch *_narrow (CORBA::Exception *);
-
-
-    // = TAO extension
-    static CORBA::Exception *_alloc (void);
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef TypeMismatch_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
-  }; // exception CORBA_DynAny::TypeMismatch
-
-    static CORBA::TypeCode_ptr _tc_TypeMismatch;
-
-  class InvalidSeq;
-  typedef InvalidSeq *InvalidSeq_ptr;
-
-  class TAO_Export InvalidSeq : public CORBA::UserException
-  {
-  public:
-    InvalidSeq (void); // default ctor
-    InvalidSeq (const InvalidSeq &); // copy ctor
-    ~InvalidSeq (void); // dtor
-    InvalidSeq &operator= (const InvalidSeq &);
-
-
-    virtual void _raise (void);
-
-    static InvalidSeq *_narrow (CORBA::Exception *);
-
-
-    // = TAO extension
-    static CORBA::Exception *_alloc (void);
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef InvalidSeq_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
-  }; // exception CORBA_DynAny::InvalidSeq
-
-    static CORBA::TypeCode_ptr _tc_InvalidSeq;
-
-  virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENVironment =
-      CORBA::Environment::default_environment ()
-     );
-  virtual void assign (
-      CORBA_DynAny_ptr dyn_any,
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void from_any (
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::Any * to_any (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA_DynAny_ptr copy (
-      CORBA::Environment &ACE_TRY_ENVironment =
-      CORBA::Environment::default_environment ()
-     );
-  virtual void insert_boolean (
-      CORBA::Boolean value,
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void insert_octet (
-      CORBA::Octet value,
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void insert_char (
-      CORBA::Char value,
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void insert_short (
-      CORBA::Short value,
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void insert_ushort (
-      CORBA::UShort value,
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void insert_long (
-      CORBA::Long value,
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void insert_ulong (
-      CORBA::ULong value,
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void insert_float (
-      CORBA::Float value,
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void insert_double (
-      CORBA::Double value,
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void insert_string (
-      const char * value,
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void insert_reference (
-      CORBA::Object_ptr value,
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void insert_typecode (
-      CORBA::TypeCode_ptr value,
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void insert_longlong (
-      CORBA::LongLong value,
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void insert_ulonglong (
-      CORBA::ULongLong value,
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void insert_wchar (
-      CORBA::WChar value,
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void insert_any (
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::Boolean get_boolean (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::Octet get_octet (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::Char get_char (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::Short get_short (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::UShort get_ushort (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::Long get_long (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::ULong get_ulong (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::Float get_float (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::Double get_double (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual char * get_string (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::Object_ptr get_reference (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::TypeCode_ptr get_typecode (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::LongLong get_longlong (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::ULongLong get_ulonglong (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::WChar get_wchar (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::Any * get_any (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA_DynAny_ptr current_component (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::Boolean next (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::Boolean seek (
-      CORBA::Long slot,
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void rewind (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-  virtual const char* _interface_repository_id (void) const;
-protected:
-  CORBA_DynAny (void); // default constructor
-  CORBA_DynAny (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
-      CORBA::Boolean _tao_collocated = 0
-    );
-  virtual ~CORBA_DynAny (void);
-private:
-  CORBA_DynAny (const CORBA_DynAny &);
-  void operator= (const CORBA_DynAny &);
-};
-
-extern  CORBA::TypeCode_ptr  _tc_CORBA_DynAny;
-
-class CORBA_DynEnum;
-typedef CORBA_DynEnum *CORBA_DynEnum_ptr;
-
-class  CORBA_DynEnum_var
-{
-public:
-  CORBA_DynEnum_var (void); // default constructor
-  CORBA_DynEnum_var (CORBA_DynEnum_ptr);
-  CORBA_DynEnum_var (const CORBA_DynEnum_var &); // copy constructor
-  ~CORBA_DynEnum_var (void); // destructor
-
-  CORBA_DynEnum_var &operator= (CORBA_DynEnum_ptr);
-  CORBA_DynEnum_var &operator= (const CORBA_DynEnum_var &);
-  CORBA_DynEnum_ptr operator-> (void) const;
-
-  operator const CORBA_DynEnum_ptr &() const;
-  operator CORBA_DynEnum_ptr &();
-  // in, inout, out, _retn
-  CORBA_DynEnum_ptr in (void) const;
-  CORBA_DynEnum_ptr &inout (void);
-  CORBA_DynEnum_ptr &out (void);
-  CORBA_DynEnum_ptr _retn (void);
-  CORBA_DynEnum_ptr ptr (void) const;
-
-private:
-  CORBA_DynEnum_ptr ptr_;
-};
-
-class  CORBA_DynEnum_out
-{
-public:
-  CORBA_DynEnum_out (CORBA_DynEnum_ptr &);
-  CORBA_DynEnum_out (CORBA_DynEnum_var &);
-  CORBA_DynEnum_out (const CORBA_DynEnum_out &);
-  CORBA_DynEnum_out &operator= (const CORBA_DynEnum_out &);
-  CORBA_DynEnum_out &operator= (const CORBA_DynEnum_var &);
-  CORBA_DynEnum_out &operator= (CORBA_DynEnum_ptr);
-  operator CORBA_DynEnum_ptr &();
-  CORBA_DynEnum_ptr &ptr (void);
-  CORBA_DynEnum_ptr operator-> (void);
-
-private:
-  CORBA_DynEnum_ptr &ptr_;
-};
-
-class TAO_Export CORBA_DynEnum: public virtual CORBA_DynAny
-{
-public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_DynEnum_ptr _ptr_type;
-    typedef CORBA_DynEnum_var _var_type;
-  #endif /* __GNUC__ */
-
-  // the static operations
-  static CORBA_DynEnum_ptr _duplicate (CORBA_DynEnum_ptr obj);
-  static CORBA_DynEnum_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-  static CORBA_DynEnum_ptr _nil (void);
-
-  virtual char * value_as_string (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void value_as_string (
-      const char * value_as_string,
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::ULong value_as_ulong (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void value_as_ulong (
-      CORBA::ULong value_as_ulong,
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-  virtual const char* _interface_repository_id (void) const;
-protected:
-  CORBA_DynEnum (void); // default constructor
-  CORBA_DynEnum (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
-      CORBA::Boolean _tao_collocated = 0
-    );
-  virtual ~CORBA_DynEnum (void);
-private:
-  CORBA_DynEnum (const CORBA_DynEnum &);
-  void operator= (const CORBA_DynEnum &);
-};
-
-extern  CORBA::TypeCode_ptr  _tc_CORBA_DynEnum;
-
-// Forward declaration.
-struct CORBA_NameValuePair;
-
-class  CORBA_NameValuePair_var
-{
-public:
-  CORBA_NameValuePair_var (void); // default constructor
-  CORBA_NameValuePair_var (CORBA_NameValuePair *);
-  CORBA_NameValuePair_var (const CORBA_NameValuePair_var &); // copy constructor
-  ~CORBA_NameValuePair_var (void); // destructor
-
-  CORBA_NameValuePair_var &operator= (CORBA_NameValuePair *);
-  CORBA_NameValuePair_var &operator= (const CORBA_NameValuePair_var &);
-  CORBA_NameValuePair *operator-> (void);
-  const CORBA_NameValuePair *operator-> (void) const;
-
-  operator const CORBA_NameValuePair &() const;
-  operator CORBA_NameValuePair &();
-  operator CORBA_NameValuePair &() const;
-  // in, inout, out, _retn
-  const CORBA_NameValuePair &in (void) const;
-  CORBA_NameValuePair &inout (void);
-  CORBA_NameValuePair *&out (void);
-  CORBA_NameValuePair *_retn (void);
-  CORBA_NameValuePair *ptr (void) const;
-
-private:
-  CORBA_NameValuePair *ptr_;
-};
-
-class  CORBA_NameValuePair_out
-{
-public:
-  CORBA_NameValuePair_out (CORBA_NameValuePair *&);
-  CORBA_NameValuePair_out (CORBA_NameValuePair_var &);
-  CORBA_NameValuePair_out (const CORBA_NameValuePair_out &);
-  CORBA_NameValuePair_out &operator= (const CORBA_NameValuePair_out &);
-  CORBA_NameValuePair_out &operator= (CORBA_NameValuePair *);
-  operator CORBA_NameValuePair *&();
-  CORBA_NameValuePair *&ptr (void);
-  CORBA_NameValuePair *operator-> (void);
-
-private:
-  CORBA_NameValuePair *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_NameValuePair_var &);
-};
-
-struct  CORBA_NameValuePair
-{
-  TAO_String_Manager id;
-  CORBA::Any value;
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_NameValuePair_ptr _ptr_type;
-  typedef CORBA_NameValuePair_var _var_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
-};
-
-class _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq : public TAO_Unbounded_Base_Sequence
-{
-public:
-  // = Initialization and termination methods.
-
-  _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq (void) // Default constructor.
-  {
-  }
-
-  _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, allocbuf (maximum))
-  {
-  }
-
-  _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA_NameValuePair *data,
-    CORBA::Boolean release = 0)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-  {
-  }
-
-  _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq (const _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    CORBA_NameValuePair *tmp1 = allocbuf (this->maximum_);
-    CORBA_NameValuePair * const tmp2 = ACE_reinterpret_cast (CORBA_NameValuePair * ACE_CAST_CONST, rhs.buffer_);
-
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-
-    this->buffer_ = tmp1;
-  }
-
-  _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq &operator= (const _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq &rhs)
-  // Assignment operator.
-  {
-    if (this == &rhs)
-      return *this;
-
-    if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-      {
-        // free the old buffer
-        CORBA_NameValuePair *tmp = ACE_reinterpret_cast (CORBA_NameValuePair *, this->buffer_);
-        freebuf (tmp);
-        this->buffer_ = allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = allocbuf (rhs.maximum_);
-
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-
-    CORBA_NameValuePair *tmp1 = ACE_reinterpret_cast (CORBA_NameValuePair *, this->buffer_);
-    CORBA_NameValuePair * const tmp2 = ACE_reinterpret_cast (CORBA_NameValuePair * ACE_CAST_CONST, rhs.buffer_);
-
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-
-    return *this;
-  }
-
-  ~_TAO_Unbounded_Sequence_CORBA_NameValuePairSeq (void) // Dtor.
-  {
-    this->_deallocate_buffer ();
-  }
-
-  // = Accessors.
-  CORBA_NameValuePair &operator[] (CORBA::ULong i)
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA_NameValuePair* tmp = ACE_reinterpret_cast(CORBA_NameValuePair*,this->buffer_);
-    return tmp[i];
-  }
-
-  const CORBA_NameValuePair &operator[] (CORBA::ULong i) const
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA_NameValuePair * const tmp = ACE_reinterpret_cast (CORBA_NameValuePair* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
-  }
-
-  // = Static operations.
-  static CORBA_NameValuePair *allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    return new CORBA_NameValuePair[size];
-  }
-
-  static void freebuf (CORBA_NameValuePair *buffer)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-
-  virtual void _allocate_buffer (CORBA::ULong length)
-  {
-    CORBA_NameValuePair* tmp = allocbuf (length);
-
-    if (this->buffer_ != 0)
-    {
-      CORBA_NameValuePair *old = ACE_reinterpret_cast (CORBA_NameValuePair *,this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-
-      if (this->release_)
-        freebuf (old);
-
-    }
-    this->buffer_ = tmp;
-  }
-
-  virtual void _deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-
-    CORBA_NameValuePair *tmp = ACE_reinterpret_cast (CORBA_NameValuePair *,this->buffer_);
-
-    freebuf (tmp);
-    this->buffer_ = 0;
-  }
-
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-  CORBA_NameValuePair *get_buffer (CORBA::Boolean orphan = 0)
-  {
-    CORBA_NameValuePair *result = 0;
-    if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = allocbuf (this->length_);
-        this->buffer_ = result;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA_NameValuePair*, this->buffer_);
-      }
-    }
-    else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA_NameValuePair*,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
-    }
-    return result;
-  }
-
-  const CORBA_NameValuePair *get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const CORBA_NameValuePair * ACE_CAST_CONST, this->buffer_);
-  }
-
-  void replace (CORBA::ULong max,
-  CORBA::ULong length,
-  CORBA_NameValuePair *data,
-  CORBA::Boolean release)
-  {
-    this->maximum_ = max;
-    this->length_ = length;
-    if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA_NameValuePair *tmp = ACE_reinterpret_cast(CORBA_NameValuePair*,this->buffer_);
-      freebuf (tmp);
-    }
-    this->buffer_ = data;
-    this->release_ = release;
-  }
-
-};
-
-// *************************************************************
-// class CORBA::NameValuePairSeq_var
-// *************************************************************
-
-class  CORBA_NameValuePairSeq_var
-{
-public:
-  CORBA_NameValuePairSeq_var (void); // default constructor
-  CORBA_NameValuePairSeq_var (CORBA_NameValuePairSeq *);
-  CORBA_NameValuePairSeq_var (const CORBA_NameValuePairSeq_var &); // copy constructor
-  ~CORBA_NameValuePairSeq_var (void); // destructor
-
-  CORBA_NameValuePairSeq_var &operator= (CORBA_NameValuePairSeq *);
-  CORBA_NameValuePairSeq_var &operator= (const CORBA_NameValuePairSeq_var &);
-  CORBA_NameValuePairSeq *operator-> (void);
-  const CORBA_NameValuePairSeq *operator-> (void) const;
-
-  operator const CORBA_NameValuePairSeq &() const;
-  operator CORBA_NameValuePairSeq &();
-  operator CORBA_NameValuePairSeq &() const;
-  CORBA_NameValuePair &operator[] (CORBA::ULong slot);
-  // in, inout, out, _retn
-  const CORBA_NameValuePairSeq &in (void) const;
-  CORBA_NameValuePairSeq &inout (void);
-  CORBA_NameValuePairSeq *&out (void);
-  CORBA_NameValuePairSeq *_retn (void);
-  CORBA_NameValuePairSeq *ptr (void) const;
-
-private:
-  CORBA_NameValuePairSeq *ptr_;
-};
-
-class  CORBA_NameValuePairSeq_out
-{
-public:
-  CORBA_NameValuePairSeq_out (CORBA_NameValuePairSeq *&);
-  CORBA_NameValuePairSeq_out (CORBA_NameValuePairSeq_var &);
-  CORBA_NameValuePairSeq_out (const CORBA_NameValuePairSeq_out &);
-  CORBA_NameValuePairSeq_out &operator= (const CORBA_NameValuePairSeq_out &);
-  CORBA_NameValuePairSeq_out &operator= (CORBA_NameValuePairSeq *);
-  operator CORBA_NameValuePairSeq *&();
-  CORBA_NameValuePairSeq *&ptr (void);
-  CORBA_NameValuePairSeq *operator-> (void);
-  CORBA_NameValuePair &operator[] (CORBA::ULong slot);
-
-private:
-  CORBA_NameValuePairSeq *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_NameValuePairSeq_var &);
-};
-
-// *************************************************************
-// CORBA::NameValuePairSeq
-// *************************************************************
-class TAO_Export CORBA_NameValuePairSeq : public
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
-       || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) \
-       || !defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
-  _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq
-#else /* AHETI */
-  TAO_Unbounded_Sequence<CORBA_NameValuePair>
-#endif /* AHETI */
-{
-public:
-  CORBA_NameValuePairSeq (void); // default ctor
-  CORBA_NameValuePairSeq (CORBA::ULong max); // uses max size
-  CORBA_NameValuePairSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA_NameValuePair *buffer,
-    CORBA::Boolean release=0
-  );
-  CORBA_NameValuePairSeq (const CORBA_NameValuePairSeq &); // copy ctor
-  ~CORBA_NameValuePairSeq (void); // dtor
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_NameValuePairSeq_ptr _ptr_type;
-  typedef CORBA_NameValuePairSeq_var _var_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
-};
-
-class CORBA_DynStruct;
-typedef CORBA_DynStruct *CORBA_DynStruct_ptr;
-
-class  CORBA_DynStruct_var
-{
-public:
-  CORBA_DynStruct_var (void); // default constructor
-  CORBA_DynStruct_var (CORBA_DynStruct_ptr);
-  CORBA_DynStruct_var (const CORBA_DynStruct_var &); // copy constructor
-  ~CORBA_DynStruct_var (void); // destructor
-
-  CORBA_DynStruct_var &operator= (CORBA_DynStruct_ptr);
-  CORBA_DynStruct_var &operator= (const CORBA_DynStruct_var &);
-  CORBA_DynStruct_ptr operator-> (void) const;
-
-  operator const CORBA_DynStruct_ptr &() const;
-  operator CORBA_DynStruct_ptr &();
-  // in, inout, out, _retn
-  CORBA_DynStruct_ptr in (void) const;
-  CORBA_DynStruct_ptr &inout (void);
-  CORBA_DynStruct_ptr &out (void);
-  CORBA_DynStruct_ptr _retn (void);
-  CORBA_DynStruct_ptr ptr (void) const;
-
-private:
-  CORBA_DynStruct_ptr ptr_;
-};
-
-class  CORBA_DynStruct_out
-{
-public:
-  CORBA_DynStruct_out (CORBA_DynStruct_ptr &);
-  CORBA_DynStruct_out (CORBA_DynStruct_var &);
-  CORBA_DynStruct_out (const CORBA_DynStruct_out &);
-  CORBA_DynStruct_out &operator= (const CORBA_DynStruct_out &);
-  CORBA_DynStruct_out &operator= (const CORBA_DynStruct_var &);
-  CORBA_DynStruct_out &operator= (CORBA_DynStruct_ptr);
-  operator CORBA_DynStruct_ptr &();
-  CORBA_DynStruct_ptr &ptr (void);
-  CORBA_DynStruct_ptr operator-> (void);
-
-private:
-  CORBA_DynStruct_ptr &ptr_;
-};
-
-class TAO_Export CORBA_DynStruct: public virtual CORBA_DynAny
-{
-public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_DynStruct_ptr _ptr_type;
-    typedef CORBA_DynStruct_var _var_type;
-  #endif /* __GNUC__ */
-
-  // the static operations
-  static CORBA_DynStruct_ptr _duplicate (CORBA_DynStruct_ptr obj);
-  static CORBA_DynStruct_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-  static CORBA_DynStruct_ptr _nil (void);
-
-  virtual char * current_member_name (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::TCKind current_member_kind (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA_NameValuePairSeq * get_members (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void set_members (
-      const CORBA_NameValuePairSeq & value,
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-  virtual const char* _interface_repository_id (void) const;
-protected:
-  CORBA_DynStruct (void); // default constructor
-  CORBA_DynStruct (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
-      CORBA::Boolean _tao_collocated = 0
-    );
-  virtual ~CORBA_DynStruct (void);
-private:
-  CORBA_DynStruct (const CORBA_DynStruct &);
-  void operator= (const CORBA_DynStruct &);
-};
-
-extern  CORBA::TypeCode_ptr  _tc_CORBA_DynStruct;
-
-class CORBA_DynUnion;
-typedef CORBA_DynUnion *CORBA_DynUnion_ptr;
-
-class  CORBA_DynUnion_var
-{
-public:
-  CORBA_DynUnion_var (void); // default constructor
-  CORBA_DynUnion_var (CORBA_DynUnion_ptr);
-  CORBA_DynUnion_var (const CORBA_DynUnion_var &); // copy constructor
-  ~CORBA_DynUnion_var (void); // destructor
-
-  CORBA_DynUnion_var &operator= (CORBA_DynUnion_ptr);
-  CORBA_DynUnion_var &operator= (const CORBA_DynUnion_var &);
-  CORBA_DynUnion_ptr operator-> (void) const;
-
-  operator const CORBA_DynUnion_ptr &() const;
-  operator CORBA_DynUnion_ptr &();
-  // in, inout, out, _retn
-  CORBA_DynUnion_ptr in (void) const;
-  CORBA_DynUnion_ptr &inout (void);
-  CORBA_DynUnion_ptr &out (void);
-  CORBA_DynUnion_ptr _retn (void);
-  CORBA_DynUnion_ptr ptr (void) const;
-
-private:
-  CORBA_DynUnion_ptr ptr_;
-};
-
-class  CORBA_DynUnion_out
-{
-public:
-  CORBA_DynUnion_out (CORBA_DynUnion_ptr &);
-  CORBA_DynUnion_out (CORBA_DynUnion_var &);
-  CORBA_DynUnion_out (const CORBA_DynUnion_out &);
-  CORBA_DynUnion_out &operator= (const CORBA_DynUnion_out &);
-  CORBA_DynUnion_out &operator= (const CORBA_DynUnion_var &);
-  CORBA_DynUnion_out &operator= (CORBA_DynUnion_ptr);
-  operator CORBA_DynUnion_ptr &();
-  CORBA_DynUnion_ptr &ptr (void);
-  CORBA_DynUnion_ptr operator-> (void);
-
-private:
-  CORBA_DynUnion_ptr &ptr_;
-};
-
-class TAO_Export CORBA_DynUnion: public virtual CORBA_DynAny
-{
-public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_DynUnion_ptr _ptr_type;
-    typedef CORBA_DynUnion_var _var_type;
-  #endif /* __GNUC__ */
-
-  // the static operations
-  static CORBA_DynUnion_ptr _duplicate (CORBA_DynUnion_ptr obj);
-  static CORBA_DynUnion_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-  static CORBA_DynUnion_ptr _nil (void);
-
-  virtual CORBA::Boolean set_as_default (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void set_as_default (
-      CORBA::Boolean set_as_default,
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA_DynAny_ptr discriminator (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::TCKind discriminator_kind (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA_DynAny_ptr member (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual char * member_name (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void member_name (
-      const char * member_name,
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::TCKind member_kind (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-  virtual const char* _interface_repository_id (void) const;
-protected:
-  CORBA_DynUnion (void); // default constructor
-  CORBA_DynUnion (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
-      CORBA::Boolean _tao_collocated = 0
-    );
-  virtual ~CORBA_DynUnion (void);
-private:
-  CORBA_DynUnion (const CORBA_DynUnion &);
-  void operator= (const CORBA_DynUnion &);
-};
-
-extern  CORBA::TypeCode_ptr  _tc_CORBA_DynUnion;
-
-class _TAO_Unbounded_Sequence_CORBA_AnySeq : public TAO_Unbounded_Base_Sequence
-{
-public:
-  // = Initialization and termination methods.
-
-  _TAO_Unbounded_Sequence_CORBA_AnySeq (void) // Default constructor.
-  {
-  }
-
-  _TAO_Unbounded_Sequence_CORBA_AnySeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, allocbuf (maximum))
-  {
-  }
-
-  _TAO_Unbounded_Sequence_CORBA_AnySeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::Any *data,
-    CORBA::Boolean release = 0)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-  {
-  }
-
-  _TAO_Unbounded_Sequence_CORBA_AnySeq (const _TAO_Unbounded_Sequence_CORBA_AnySeq &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    CORBA::Any *tmp1 = allocbuf (this->maximum_);
-    CORBA::Any * const tmp2 = ACE_reinterpret_cast (CORBA::Any * ACE_CAST_CONST, rhs.buffer_);
-
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-
-    this->buffer_ = tmp1;
-  }
-
-  _TAO_Unbounded_Sequence_CORBA_AnySeq &operator= (const _TAO_Unbounded_Sequence_CORBA_AnySeq &rhs)
-  // Assignment operator.
-  {
-    if (this == &rhs)
-      return *this;
-
-    if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-      {
-        // free the old buffer
-        CORBA::Any *tmp = ACE_reinterpret_cast (CORBA::Any *, this->buffer_);
-        freebuf (tmp);
-        this->buffer_ = allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = allocbuf (rhs.maximum_);
-
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-
-    CORBA::Any *tmp1 = ACE_reinterpret_cast (CORBA::Any *, this->buffer_);
-    CORBA::Any * const tmp2 = ACE_reinterpret_cast (CORBA::Any * ACE_CAST_CONST, rhs.buffer_);
-
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-
-    return *this;
-  }
-
-  ~_TAO_Unbounded_Sequence_CORBA_AnySeq (void) // Dtor.
-  {
-    this->_deallocate_buffer ();
-  }
-
-  // = Accessors.
-  CORBA::Any &operator[] (CORBA::ULong i)
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA::Any* tmp = ACE_reinterpret_cast(CORBA::Any*,this->buffer_);
-    return tmp[i];
-  }
-
-  const CORBA::Any &operator[] (CORBA::ULong i) const
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA::Any * const tmp = ACE_reinterpret_cast (CORBA::Any* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
-  }
-
-  // = Static operations.
-  static CORBA::Any *allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    return new CORBA::Any[size];
-  }
-
-  static void freebuf (CORBA::Any *buffer)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-
-  virtual void _allocate_buffer (CORBA::ULong length)
-  {
-    CORBA::Any* tmp = allocbuf (length);
-
-    if (this->buffer_ != 0)
-    {
-      CORBA::Any *old = ACE_reinterpret_cast (CORBA::Any *,this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-
-      if (this->release_)
-        freebuf (old);
-
-    }
-    this->buffer_ = tmp;
-  }
-
-  virtual void _deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-
-    CORBA::Any *tmp = ACE_reinterpret_cast (CORBA::Any *,this->buffer_);
-
-    freebuf (tmp);
-    this->buffer_ = 0;
-  }
-
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-  CORBA::Any *get_buffer (CORBA::Boolean orphan = 0)
-  {
-    CORBA::Any *result = 0;
-    if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = allocbuf (this->length_);
-        this->buffer_ = result;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA::Any*, this->buffer_);
-      }
-    }
-    else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA::Any*,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
-    }
-    return result;
-  }
-
-  const CORBA::Any *get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const CORBA::Any * ACE_CAST_CONST, this->buffer_);
-  }
-
-  void replace (CORBA::ULong max,
-  CORBA::ULong length,
-  CORBA::Any *data,
-  CORBA::Boolean release)
-  {
-    this->maximum_ = max;
-    this->length_ = length;
-    if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::Any *tmp = ACE_reinterpret_cast(CORBA::Any*,this->buffer_);
-      freebuf (tmp);
-    }
-    this->buffer_ = data;
-    this->release_ = release;
-  }
-
-};
-
-// *************************************************************
-// class CORBA::AnySeq_var
-// *************************************************************
-
-class  CORBA_AnySeq_var
-{
-public:
-  CORBA_AnySeq_var (void); // default constructor
-  CORBA_AnySeq_var (CORBA_AnySeq *);
-  CORBA_AnySeq_var (const CORBA_AnySeq_var &); // copy constructor
-  ~CORBA_AnySeq_var (void); // destructor
-
-  CORBA_AnySeq_var &operator= (CORBA_AnySeq *);
-  CORBA_AnySeq_var &operator= (const CORBA_AnySeq_var &);
-  CORBA_AnySeq *operator-> (void);
-  const CORBA_AnySeq *operator-> (void) const;
-
-  operator const CORBA_AnySeq &() const;
-  operator CORBA_AnySeq &();
-  operator CORBA_AnySeq &() const;
-  CORBA::Any &operator[] (CORBA::ULong slot);
-  // in, inout, out, _retn
-  const CORBA_AnySeq &in (void) const;
-  CORBA_AnySeq &inout (void);
-  CORBA_AnySeq *&out (void);
-  CORBA_AnySeq *_retn (void);
-  CORBA_AnySeq *ptr (void) const;
-
-private:
-  CORBA_AnySeq *ptr_;
-};
-
-class  CORBA_AnySeq_out
-{
-public:
-  CORBA_AnySeq_out (CORBA_AnySeq *&);
-  CORBA_AnySeq_out (CORBA_AnySeq_var &);
-  CORBA_AnySeq_out (const CORBA_AnySeq_out &);
-  CORBA_AnySeq_out &operator= (const CORBA_AnySeq_out &);
-  CORBA_AnySeq_out &operator= (CORBA_AnySeq *);
-  operator CORBA_AnySeq *&();
-  CORBA_AnySeq *&ptr (void);
-  CORBA_AnySeq *operator-> (void);
-  CORBA::Any &operator[] (CORBA::ULong slot);
-
-private:
-  CORBA_AnySeq *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_AnySeq_var &);
-};
-
-// *************************************************************
-// CORBA::AnySeq
-// *************************************************************
-
-class TAO_Export CORBA_AnySeq : public
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
-       || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) \
-       || !defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
-  _TAO_Unbounded_Sequence_CORBA_AnySeq
-#else /* AHETI */
-  TAO_Unbounded_Sequence<CORBA::Any>
-#endif /* AHETI */
-{
-public:
-  CORBA_AnySeq (void); // default ctor
-  CORBA_AnySeq (CORBA::ULong max); // uses max size
-  CORBA_AnySeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::Any *buffer,
-    CORBA::Boolean release=0
-  );
-  CORBA_AnySeq (const CORBA_AnySeq &); // copy ctor
-  ~CORBA_AnySeq (void); // dtor
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_AnySeq_ptr _ptr_type;
-  typedef CORBA_AnySeq_var _var_type;
-#endif /* __GNUC__ */
-
-};
-
-extern  CORBA::TypeCode_ptr  _tc_AnySeq;
-
-class CORBA_DynSequence;
-typedef CORBA_DynSequence *CORBA_DynSequence_ptr;
-
-class  CORBA_DynSequence_var
-{
-public:
-  CORBA_DynSequence_var (void); // default constructor
-  CORBA_DynSequence_var (CORBA_DynSequence_ptr);
-  CORBA_DynSequence_var (const CORBA_DynSequence_var &); // copy constructor
-  ~CORBA_DynSequence_var (void); // destructor
-
-  CORBA_DynSequence_var &operator= (CORBA_DynSequence_ptr);
-  CORBA_DynSequence_var &operator= (const CORBA_DynSequence_var &);
-  CORBA_DynSequence_ptr operator-> (void) const;
-
-  operator const CORBA_DynSequence_ptr &() const;
-  operator CORBA_DynSequence_ptr &();
-  // in, inout, out, _retn
-  CORBA_DynSequence_ptr in (void) const;
-  CORBA_DynSequence_ptr &inout (void);
-  CORBA_DynSequence_ptr &out (void);
-  CORBA_DynSequence_ptr _retn (void);
-  CORBA_DynSequence_ptr ptr (void) const;
-
-private:
-  CORBA_DynSequence_ptr ptr_;
-};
-
-class  CORBA_DynSequence_out
-{
-public:
-  CORBA_DynSequence_out (CORBA_DynSequence_ptr &);
-  CORBA_DynSequence_out (CORBA_DynSequence_var &);
-  CORBA_DynSequence_out (const CORBA_DynSequence_out &);
-  CORBA_DynSequence_out &operator= (const CORBA_DynSequence_out &);
-  CORBA_DynSequence_out &operator= (const CORBA_DynSequence_var &);
-  CORBA_DynSequence_out &operator= (CORBA_DynSequence_ptr);
-  operator CORBA_DynSequence_ptr &();
-  CORBA_DynSequence_ptr &ptr (void);
-  CORBA_DynSequence_ptr operator-> (void);
-
-private:
-  CORBA_DynSequence_ptr &ptr_;
-};
-
-class TAO_Export CORBA_DynSequence: public virtual CORBA_DynAny
-{
-public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_DynSequence_ptr _ptr_type;
-    typedef CORBA_DynSequence_var _var_type;
-  #endif /* __GNUC__ */
-
-  // the static operations
-  static CORBA_DynSequence_ptr _duplicate (CORBA_DynSequence_ptr obj);
-  static CORBA_DynSequence_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-  static CORBA_DynSequence_ptr _nil (void);
-
-  virtual CORBA::ULong length (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void length (
-      CORBA::ULong length,
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA_AnySeq * get_elements (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void set_elements (
-      const CORBA_AnySeq & value,
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-  virtual const char* _interface_repository_id (void) const;
-protected:
-  CORBA_DynSequence (void); // default constructor
-  CORBA_DynSequence (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
-      CORBA::Boolean _tao_collocated = 0
-    );
-  virtual ~CORBA_DynSequence (void);
-private:
-  CORBA_DynSequence (const CORBA_DynSequence &);
-  void operator= (const CORBA_DynSequence &);
-};
-
-extern  CORBA::TypeCode_ptr  _tc_CORBA_DynSequence;
-
-class CORBA_DynArray;
-typedef CORBA_DynArray *CORBA_DynArray_ptr;
-
-class  CORBA_DynArray_var
-{
-public:
-  CORBA_DynArray_var (void); // default constructor
-  CORBA_DynArray_var (CORBA_DynArray_ptr);
-  CORBA_DynArray_var (const CORBA_DynArray_var &); // copy constructor
-  ~CORBA_DynArray_var (void); // destructor
-
-  CORBA_DynArray_var &operator= (CORBA_DynArray_ptr);
-  CORBA_DynArray_var &operator= (const CORBA_DynArray_var &);
-  CORBA_DynArray_ptr operator-> (void) const;
-
-  operator const CORBA_DynArray_ptr &() const;
-  operator CORBA_DynArray_ptr &();
-  // in, inout, out, _retn
-  CORBA_DynArray_ptr in (void) const;
-  CORBA_DynArray_ptr &inout (void);
-  CORBA_DynArray_ptr &out (void);
-  CORBA_DynArray_ptr _retn (void);
-  CORBA_DynArray_ptr ptr (void) const;
-
-private:
-  CORBA_DynArray_ptr ptr_;
-};
-
-class  CORBA_DynArray_out
-{
-public:
-  CORBA_DynArray_out (CORBA_DynArray_ptr &);
-  CORBA_DynArray_out (CORBA_DynArray_var &);
-  CORBA_DynArray_out (const CORBA_DynArray_out &);
-  CORBA_DynArray_out &operator= (const CORBA_DynArray_out &);
-  CORBA_DynArray_out &operator= (const CORBA_DynArray_var &);
-  CORBA_DynArray_out &operator= (CORBA_DynArray_ptr);
-  operator CORBA_DynArray_ptr &();
-  CORBA_DynArray_ptr &ptr (void);
-  CORBA_DynArray_ptr operator-> (void);
-
-private:
-  CORBA_DynArray_ptr &ptr_;
-};
-
-class TAO_Export CORBA_DynArray: public virtual CORBA_DynAny
-{
-public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_DynArray_ptr _ptr_type;
-    typedef CORBA_DynArray_var _var_type;
-  #endif /* __GNUC__ */
-
-  // the static operations
-  static CORBA_DynArray_ptr _duplicate (CORBA_DynArray_ptr obj);
-  static CORBA_DynArray_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-  static CORBA_DynArray_ptr _nil (void);
-
-  virtual CORBA_AnySeq * get_elements (
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void set_elements (
-      const CORBA_AnySeq & value,
-      CORBA::Environment &ACE_TRY_ENVironment =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-  virtual const char* _interface_repository_id (void) const;
-protected:
-  CORBA_DynArray (void); // default constructor
-  CORBA_DynArray (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
-      CORBA::Boolean _tao_collocated = 0
-    );
-  virtual ~CORBA_DynArray (void);
-private:
-  CORBA_DynArray (const CORBA_DynArray &);
-  void operator= (const CORBA_DynArray &);
-};
-
-extern  CORBA::TypeCode_ptr  _tc_CORBA_DynArray;
-
-#if defined (__ACE_INLINE__)
-#include "DynAnyC.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#endif /* if !defined */
diff --git a/TAO/tao/DynAnyC.i b/TAO/tao/DynAnyC.i
deleted file mode 100644
index a495904948f..00000000000
--- a/TAO/tao/DynAnyC.i
+++ /dev/null
@@ -1,1693 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ======================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    DynAnyC.i
-//
-// = AUTHOR
-//
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-//
-//
-// Modified by Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ======================================================================
-
-ACE_INLINE
-CORBA_DynAny::CORBA_DynAny (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA_DynAny::CORBA_DynAny (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA_DynAny::~CORBA_DynAny (void) // destructor
-{}
-
-
-#if !defined (_CORBA_DYNANY___VAR_CI_)
-#define _CORBA_DYNANY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_DynAny_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_DynAny_var::CORBA_DynAny_var (void) // default constructor
-  : ptr_ (CORBA_DynAny::_nil ())
-{}
-
-ACE_INLINE
-CORBA_DynAny_var::CORBA_DynAny_var (CORBA_DynAny_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA_DynAny_ptr 
-CORBA_DynAny_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_DynAny_var::CORBA_DynAny_var (const CORBA_DynAny_var &p) // copy constructor
-  : ptr_ (CORBA_DynAny::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_DynAny_var::~CORBA_DynAny_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_DynAny_var &
-CORBA_DynAny_var::operator= (CORBA_DynAny_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_DynAny_var &
-CORBA_DynAny_var::operator= (const CORBA_DynAny_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_DynAny::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_DynAny_var::operator const CORBA_DynAny_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_DynAny_var::operator CORBA_DynAny_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynAny_ptr 
-CORBA_DynAny_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynAny_ptr
-CORBA_DynAny_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynAny_ptr &
-CORBA_DynAny_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynAny_ptr &
-CORBA_DynAny_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_DynAny::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynAny_ptr 
-CORBA_DynAny_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_DynAny_ptr val = this->ptr_;
-  this->ptr_ = CORBA_DynAny::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_DYNANY___OUT_CI_)
-#define _CORBA_DYNANY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_DynAny_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_DynAny_out::CORBA_DynAny_out (CORBA_DynAny_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA_DynAny::_nil ();
-}
-
-ACE_INLINE
-CORBA_DynAny_out::CORBA_DynAny_out (CORBA_DynAny_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_DynAny::_nil ();
-}
-
-ACE_INLINE
-CORBA_DynAny_out::CORBA_DynAny_out (const CORBA_DynAny_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_DynAny_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_DynAny_out &
-CORBA_DynAny_out::operator= (const CORBA_DynAny_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_DynAny_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_DynAny_out &
-CORBA_DynAny_out::operator= (const CORBA_DynAny_var &p)
-{
-  this->ptr_ = CORBA_DynAny::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_DynAny_out &
-CORBA_DynAny_out::operator= (CORBA_DynAny_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_DynAny_out::operator CORBA_DynAny_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynAny_ptr &
-CORBA_DynAny_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynAny_ptr 
-CORBA_DynAny_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-// *************************************************************
-// Inline operations for exception CORBA_DynAny::Invalid
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception CORBA_DynAny::InvalidValue
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception CORBA_DynAny::TypeMismatch
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception CORBA_DynAny::InvalidSeq
-// *************************************************************
-
-ACE_INLINE
-CORBA_DynEnum::CORBA_DynEnum (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA_DynEnum::CORBA_DynEnum (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA_DynEnum::~CORBA_DynEnum (void) // destructor
-{}
-
-
-#if !defined (_CORBA_DYNENUM___VAR_CI_)
-#define _CORBA_DYNENUM___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_DynEnum_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_DynEnum_var::CORBA_DynEnum_var (void) // default constructor
-  : ptr_ (CORBA_DynEnum::_nil ())
-{}
-
-ACE_INLINE
-CORBA_DynEnum_var::CORBA_DynEnum_var (CORBA_DynEnum_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA_DynEnum_ptr 
-CORBA_DynEnum_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_DynEnum_var::CORBA_DynEnum_var (const CORBA_DynEnum_var &p) // copy constructor
-  : ptr_ (CORBA_DynEnum::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_DynEnum_var::~CORBA_DynEnum_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_DynEnum_var &
-CORBA_DynEnum_var::operator= (CORBA_DynEnum_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_DynEnum_var &
-CORBA_DynEnum_var::operator= (const CORBA_DynEnum_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_DynEnum::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_DynEnum_var::operator const CORBA_DynEnum_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_DynEnum_var::operator CORBA_DynEnum_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynEnum_ptr 
-CORBA_DynEnum_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynEnum_ptr
-CORBA_DynEnum_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynEnum_ptr &
-CORBA_DynEnum_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynEnum_ptr &
-CORBA_DynEnum_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_DynEnum::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynEnum_ptr 
-CORBA_DynEnum_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_DynEnum_ptr val = this->ptr_;
-  this->ptr_ = CORBA_DynEnum::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_DYNENUM___OUT_CI_)
-#define _CORBA_DYNENUM___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_DynEnum_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_DynEnum_out::CORBA_DynEnum_out (CORBA_DynEnum_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA_DynEnum::_nil ();
-}
-
-ACE_INLINE
-CORBA_DynEnum_out::CORBA_DynEnum_out (CORBA_DynEnum_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_DynEnum::_nil ();
-}
-
-ACE_INLINE
-CORBA_DynEnum_out::CORBA_DynEnum_out (const CORBA_DynEnum_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_DynEnum_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_DynEnum_out &
-CORBA_DynEnum_out::operator= (const CORBA_DynEnum_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_DynEnum_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_DynEnum_out &
-CORBA_DynEnum_out::operator= (const CORBA_DynEnum_var &p)
-{
-  this->ptr_ = CORBA_DynEnum::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_DynEnum_out &
-CORBA_DynEnum_out::operator= (CORBA_DynEnum_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_DynEnum_out::operator CORBA_DynEnum_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynEnum_ptr &
-CORBA_DynEnum_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynEnum_ptr 
-CORBA_DynEnum_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-// *************************************************************
-// Inline operations for class CORBA_NameValuePair_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_NameValuePair_var::CORBA_NameValuePair_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA_NameValuePair_var::CORBA_NameValuePair_var (CORBA_NameValuePair *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_NameValuePair_var::CORBA_NameValuePair_var (const CORBA_NameValuePair_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA_NameValuePair(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_NameValuePair_var::~CORBA_NameValuePair_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA_NameValuePair_var &
-CORBA_NameValuePair_var::operator= (CORBA_NameValuePair *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_NameValuePair_var &
-CORBA_NameValuePair_var::operator= (const CORBA_NameValuePair_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA_NameValuePair (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA_NameValuePair *
-CORBA_NameValuePair_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_NameValuePair *
-CORBA_NameValuePair_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_NameValuePair_var::operator const CORBA_NameValuePair &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_NameValuePair_var::operator CORBA_NameValuePair &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_NameValuePair_var::operator CORBA_NameValuePair &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const CORBA_NameValuePair &
-CORBA_NameValuePair_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA_NameValuePair &
-CORBA_NameValuePair_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA_NameValuePair *&
-CORBA_NameValuePair_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_NameValuePair *
-CORBA_NameValuePair_var::_retn (void)
-{
-  CORBA_NameValuePair *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA_NameValuePair *
-CORBA_NameValuePair_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_NameValuePair_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_NameValuePair_out::CORBA_NameValuePair_out (CORBA_NameValuePair *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_NameValuePair_out::CORBA_NameValuePair_out (CORBA_NameValuePair_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_NameValuePair_out::CORBA_NameValuePair_out (const CORBA_NameValuePair_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_NameValuePair_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_NameValuePair_out &
-CORBA_NameValuePair_out::operator= (const CORBA_NameValuePair_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_NameValuePair_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_NameValuePair_out &
-CORBA_NameValuePair_out::operator= (CORBA_NameValuePair *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_NameValuePair_out::operator CORBA_NameValuePair *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_NameValuePair *&
-CORBA_NameValuePair_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_NameValuePair *
-CORBA_NameValuePair_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_NameValuePairSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_NameValuePairSeq_var::CORBA_NameValuePairSeq_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA_NameValuePairSeq_var::CORBA_NameValuePairSeq_var (CORBA_NameValuePairSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_NameValuePairSeq_var::CORBA_NameValuePairSeq_var (const CORBA_NameValuePairSeq_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA_NameValuePairSeq(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_NameValuePairSeq_var::~CORBA_NameValuePairSeq_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA_NameValuePairSeq_var &
-CORBA_NameValuePairSeq_var::operator= (CORBA_NameValuePairSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_NameValuePairSeq_var &
-CORBA_NameValuePairSeq_var::operator= (const CORBA_NameValuePairSeq_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA_NameValuePairSeq (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA_NameValuePairSeq *
-CORBA_NameValuePairSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_NameValuePairSeq *
-CORBA_NameValuePairSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_NameValuePairSeq_var::operator const CORBA_NameValuePairSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_NameValuePairSeq_var::operator CORBA_NameValuePairSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_NameValuePairSeq_var::operator CORBA_NameValuePairSeq &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA_NameValuePair &
-CORBA_NameValuePairSeq_var::operator[] (CORBA::ULong slot)
-{
-  return this->ptr_->operator[] (slot);
-}
-
-ACE_INLINE const CORBA_NameValuePairSeq &
-CORBA_NameValuePairSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA_NameValuePairSeq &
-CORBA_NameValuePairSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA_NameValuePairSeq *&
-CORBA_NameValuePairSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_NameValuePairSeq *
-CORBA_NameValuePairSeq_var::_retn (void)
-{
-  CORBA_NameValuePairSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA_NameValuePairSeq *
-CORBA_NameValuePairSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_NameValuePairSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_NameValuePairSeq_out::CORBA_NameValuePairSeq_out (CORBA_NameValuePairSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_NameValuePairSeq_out::CORBA_NameValuePairSeq_out (CORBA_NameValuePairSeq_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_NameValuePairSeq_out::CORBA_NameValuePairSeq_out (const CORBA_NameValuePairSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_NameValuePairSeq_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_NameValuePairSeq_out &
-CORBA_NameValuePairSeq_out::operator= (const CORBA_NameValuePairSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_NameValuePairSeq_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_NameValuePairSeq_out &
-CORBA_NameValuePairSeq_out::operator= (CORBA_NameValuePairSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_NameValuePairSeq_out::operator CORBA_NameValuePairSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_NameValuePairSeq *&
-CORBA_NameValuePairSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_NameValuePairSeq *
-CORBA_NameValuePairSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_NameValuePair &
-CORBA_NameValuePairSeq_out::operator[] (CORBA::ULong slot)
-{
-  return this->ptr_->operator[] (slot);
-}
-
-ACE_INLINE
-CORBA_DynStruct::CORBA_DynStruct (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA_DynStruct::CORBA_DynStruct (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA_DynStruct::~CORBA_DynStruct (void) // destructor
-{}
-
-
-#if !defined (_CORBA_DYNSTRUCT___VAR_CI_)
-#define _CORBA_DYNSTRUCT___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_DynStruct_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_DynStruct_var::CORBA_DynStruct_var (void) // default constructor
-  : ptr_ (CORBA_DynStruct::_nil ())
-{}
-
-ACE_INLINE
-CORBA_DynStruct_var::CORBA_DynStruct_var (CORBA_DynStruct_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA_DynStruct_ptr 
-CORBA_DynStruct_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_DynStruct_var::CORBA_DynStruct_var (const CORBA_DynStruct_var &p) // copy constructor
-  : ptr_ (CORBA_DynStruct::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_DynStruct_var::~CORBA_DynStruct_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_DynStruct_var &
-CORBA_DynStruct_var::operator= (CORBA_DynStruct_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_DynStruct_var &
-CORBA_DynStruct_var::operator= (const CORBA_DynStruct_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_DynStruct::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_DynStruct_var::operator const CORBA_DynStruct_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_DynStruct_var::operator CORBA_DynStruct_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynStruct_ptr 
-CORBA_DynStruct_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynStruct_ptr
-CORBA_DynStruct_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynStruct_ptr &
-CORBA_DynStruct_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynStruct_ptr &
-CORBA_DynStruct_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_DynStruct::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynStruct_ptr 
-CORBA_DynStruct_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_DynStruct_ptr val = this->ptr_;
-  this->ptr_ = CORBA_DynStruct::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_DYNSTRUCT___OUT_CI_)
-#define _CORBA_DYNSTRUCT___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_DynStruct_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_DynStruct_out::CORBA_DynStruct_out (CORBA_DynStruct_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA_DynStruct::_nil ();
-}
-
-ACE_INLINE
-CORBA_DynStruct_out::CORBA_DynStruct_out (CORBA_DynStruct_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_DynStruct::_nil ();
-}
-
-ACE_INLINE
-CORBA_DynStruct_out::CORBA_DynStruct_out (const CORBA_DynStruct_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_DynStruct_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_DynStruct_out &
-CORBA_DynStruct_out::operator= (const CORBA_DynStruct_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_DynStruct_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_DynStruct_out &
-CORBA_DynStruct_out::operator= (const CORBA_DynStruct_var &p)
-{
-  this->ptr_ = CORBA_DynStruct::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_DynStruct_out &
-CORBA_DynStruct_out::operator= (CORBA_DynStruct_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_DynStruct_out::operator CORBA_DynStruct_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynStruct_ptr &
-CORBA_DynStruct_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynStruct_ptr 
-CORBA_DynStruct_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-CORBA_DynUnion::CORBA_DynUnion (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA_DynUnion::CORBA_DynUnion (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA_DynUnion::~CORBA_DynUnion (void) // destructor
-{}
-
-
-#if !defined (_CORBA_DYNUNION___VAR_CI_)
-#define _CORBA_DYNUNION___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_DynUnion_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_DynUnion_var::CORBA_DynUnion_var (void) // default constructor
-  : ptr_ (CORBA_DynUnion::_nil ())
-{}
-
-ACE_INLINE
-CORBA_DynUnion_var::CORBA_DynUnion_var (CORBA_DynUnion_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA_DynUnion_ptr 
-CORBA_DynUnion_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_DynUnion_var::CORBA_DynUnion_var (const CORBA_DynUnion_var &p) // copy constructor
-  : ptr_ (CORBA_DynUnion::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_DynUnion_var::~CORBA_DynUnion_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_DynUnion_var &
-CORBA_DynUnion_var::operator= (CORBA_DynUnion_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_DynUnion_var &
-CORBA_DynUnion_var::operator= (const CORBA_DynUnion_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_DynUnion::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_DynUnion_var::operator const CORBA_DynUnion_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_DynUnion_var::operator CORBA_DynUnion_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynUnion_ptr 
-CORBA_DynUnion_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynUnion_ptr
-CORBA_DynUnion_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynUnion_ptr &
-CORBA_DynUnion_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynUnion_ptr &
-CORBA_DynUnion_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_DynUnion::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynUnion_ptr 
-CORBA_DynUnion_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_DynUnion_ptr val = this->ptr_;
-  this->ptr_ = CORBA_DynUnion::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_DYNUNION___OUT_CI_)
-#define _CORBA_DYNUNION___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_DynUnion_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_DynUnion_out::CORBA_DynUnion_out (CORBA_DynUnion_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA_DynUnion::_nil ();
-}
-
-ACE_INLINE
-CORBA_DynUnion_out::CORBA_DynUnion_out (CORBA_DynUnion_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_DynUnion::_nil ();
-}
-
-ACE_INLINE
-CORBA_DynUnion_out::CORBA_DynUnion_out (const CORBA_DynUnion_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_DynUnion_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_DynUnion_out &
-CORBA_DynUnion_out::operator= (const CORBA_DynUnion_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_DynUnion_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_DynUnion_out &
-CORBA_DynUnion_out::operator= (const CORBA_DynUnion_var &p)
-{
-  this->ptr_ = CORBA_DynUnion::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_DynUnion_out &
-CORBA_DynUnion_out::operator= (CORBA_DynUnion_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_DynUnion_out::operator CORBA_DynUnion_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynUnion_ptr &
-CORBA_DynUnion_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynUnion_ptr 
-CORBA_DynUnion_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-// *************************************************************
-// Inline operations for class CORBA_AnySeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_AnySeq_var::CORBA_AnySeq_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA_AnySeq_var::CORBA_AnySeq_var (CORBA_AnySeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_AnySeq_var::CORBA_AnySeq_var (const CORBA_AnySeq_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA_AnySeq(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_AnySeq_var::~CORBA_AnySeq_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA_AnySeq_var &
-CORBA_AnySeq_var::operator= (CORBA_AnySeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_AnySeq_var &
-CORBA_AnySeq_var::operator= (const CORBA_AnySeq_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA_AnySeq (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA_AnySeq *
-CORBA_AnySeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_AnySeq *
-CORBA_AnySeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_AnySeq_var::operator const CORBA_AnySeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_AnySeq_var::operator CORBA_AnySeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_AnySeq_var::operator CORBA_AnySeq &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::Any &
-CORBA_AnySeq_var::operator[] (CORBA::ULong slot)
-{
-  return this->ptr_->operator[] (slot);
-}
-
-ACE_INLINE const CORBA_AnySeq &
-CORBA_AnySeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA_AnySeq &
-CORBA_AnySeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA_AnySeq *&
-CORBA_AnySeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_AnySeq *
-CORBA_AnySeq_var::_retn (void)
-{
-  CORBA_AnySeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA_AnySeq *
-CORBA_AnySeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_AnySeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_AnySeq_out::CORBA_AnySeq_out (CORBA_AnySeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_AnySeq_out::CORBA_AnySeq_out (CORBA_AnySeq_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_AnySeq_out::CORBA_AnySeq_out (const CORBA_AnySeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_AnySeq_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_AnySeq_out &
-CORBA_AnySeq_out::operator= (const CORBA_AnySeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_AnySeq_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_AnySeq_out &
-CORBA_AnySeq_out::operator= (CORBA_AnySeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_AnySeq_out::operator CORBA_AnySeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_AnySeq *&
-CORBA_AnySeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_AnySeq *
-CORBA_AnySeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Any &
-CORBA_AnySeq_out::operator[] (CORBA::ULong slot)
-{
-  return this->ptr_->operator[] (slot);
-}
-
-ACE_INLINE
-CORBA_DynSequence::CORBA_DynSequence (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA_DynSequence::CORBA_DynSequence (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA_DynSequence::~CORBA_DynSequence (void) // destructor
-{}
-
-
-#if !defined (_CORBA_DYNSEQUENCE___VAR_CI_)
-#define _CORBA_DYNSEQUENCE___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_DynSequence_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_DynSequence_var::CORBA_DynSequence_var (void) // default constructor
-  : ptr_ (CORBA_DynSequence::_nil ())
-{}
-
-ACE_INLINE
-CORBA_DynSequence_var::CORBA_DynSequence_var (CORBA_DynSequence_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA_DynSequence_ptr 
-CORBA_DynSequence_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_DynSequence_var::CORBA_DynSequence_var (const CORBA_DynSequence_var &p) // copy constructor
-  : ptr_ (CORBA_DynSequence::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_DynSequence_var::~CORBA_DynSequence_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_DynSequence_var &
-CORBA_DynSequence_var::operator= (CORBA_DynSequence_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_DynSequence_var &
-CORBA_DynSequence_var::operator= (const CORBA_DynSequence_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_DynSequence::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_DynSequence_var::operator const CORBA_DynSequence_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_DynSequence_var::operator CORBA_DynSequence_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynSequence_ptr 
-CORBA_DynSequence_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynSequence_ptr
-CORBA_DynSequence_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynSequence_ptr &
-CORBA_DynSequence_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynSequence_ptr &
-CORBA_DynSequence_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_DynSequence::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynSequence_ptr 
-CORBA_DynSequence_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_DynSequence_ptr val = this->ptr_;
-  this->ptr_ = CORBA_DynSequence::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_DYNSEQUENCE___OUT_CI_)
-#define _CORBA_DYNSEQUENCE___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_DynSequence_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_DynSequence_out::CORBA_DynSequence_out (CORBA_DynSequence_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA_DynSequence::_nil ();
-}
-
-ACE_INLINE
-CORBA_DynSequence_out::CORBA_DynSequence_out (CORBA_DynSequence_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_DynSequence::_nil ();
-}
-
-ACE_INLINE
-CORBA_DynSequence_out::CORBA_DynSequence_out (const CORBA_DynSequence_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_DynSequence_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_DynSequence_out &
-CORBA_DynSequence_out::operator= (const CORBA_DynSequence_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_DynSequence_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_DynSequence_out &
-CORBA_DynSequence_out::operator= (const CORBA_DynSequence_var &p)
-{
-  this->ptr_ = CORBA_DynSequence::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_DynSequence_out &
-CORBA_DynSequence_out::operator= (CORBA_DynSequence_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_DynSequence_out::operator CORBA_DynSequence_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynSequence_ptr &
-CORBA_DynSequence_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynSequence_ptr 
-CORBA_DynSequence_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-CORBA_DynArray::CORBA_DynArray (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA_DynArray::CORBA_DynArray (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA_DynArray::~CORBA_DynArray (void) // destructor
-{}
-
-
-#if !defined (_CORBA_DYNARRAY___VAR_CI_)
-#define _CORBA_DYNARRAY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_DynArray_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_DynArray_var::CORBA_DynArray_var (void) // default constructor
-  : ptr_ (CORBA_DynArray::_nil ())
-{}
-
-ACE_INLINE
-CORBA_DynArray_var::CORBA_DynArray_var (CORBA_DynArray_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA_DynArray_ptr 
-CORBA_DynArray_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_DynArray_var::CORBA_DynArray_var (const CORBA_DynArray_var &p) // copy constructor
-  : ptr_ (CORBA_DynArray::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_DynArray_var::~CORBA_DynArray_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_DynArray_var &
-CORBA_DynArray_var::operator= (CORBA_DynArray_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_DynArray_var &
-CORBA_DynArray_var::operator= (const CORBA_DynArray_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_DynArray::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_DynArray_var::operator const CORBA_DynArray_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_DynArray_var::operator CORBA_DynArray_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynArray_ptr 
-CORBA_DynArray_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynArray_ptr
-CORBA_DynArray_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynArray_ptr &
-CORBA_DynArray_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynArray_ptr &
-CORBA_DynArray_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_DynArray::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynArray_ptr 
-CORBA_DynArray_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_DynArray_ptr val = this->ptr_;
-  this->ptr_ = CORBA_DynArray::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_DYNARRAY___OUT_CI_)
-#define _CORBA_DYNARRAY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_DynArray_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_DynArray_out::CORBA_DynArray_out (CORBA_DynArray_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA_DynArray::_nil ();
-}
-
-ACE_INLINE
-CORBA_DynArray_out::CORBA_DynArray_out (CORBA_DynArray_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_DynArray::_nil ();
-}
-
-ACE_INLINE
-CORBA_DynArray_out::CORBA_DynArray_out (const CORBA_DynArray_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_DynArray_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_DynArray_out &
-CORBA_DynArray_out::operator= (const CORBA_DynArray_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_DynArray_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_DynArray_out &
-CORBA_DynArray_out::operator= (const CORBA_DynArray_var &p)
-{
-  this->ptr_ = CORBA_DynArray::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_DynArray_out &
-CORBA_DynArray_out::operator= (CORBA_DynArray_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_DynArray_out::operator CORBA_DynArray_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynArray_ptr &
-CORBA_DynArray_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DynArray_ptr 
-CORBA_DynArray_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
diff --git a/TAO/tao/DynAnyS.cpp b/TAO/tao/DynAnyS.cpp
deleted file mode 100644
index e74f8a6a3a1..00000000000
--- a/TAO/tao/DynAnyS.cpp
+++ /dev/null
@@ -1,1319 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ======================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    DynAnyS.cpp
-//
-// = AUTHOR
-//
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-//
-//
-// Modified by Jeff Parsons <jp4@cs.wustl.edu>
-//
-// ======================================================================
-
-#include "tao/DynAnyC.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#include "tao/POA_CORBA.h"
-#include "tao/Servant_Base.h"
-#include "tao/POAC.h"
-
-ACE_RCSID(tao, DynAnyS, "$Id$")
-
-// constructor
-POA_CORBA::DynAny::DynAny (void)
-{
-}
-
-// copy ctor
-POA_CORBA::DynAny::DynAny (POA_CORBA::DynAny& rhs)
-  : TAO_Local_ServantBase (rhs)
-{}
-// destructor
-POA_CORBA::DynAny::~DynAny (void)
-{
-}
-
-CORBA::Boolean
-POA_CORBA::DynAny::_is_a (const char* value,
-                          CORBA::Environment &_tao_environment)
-{
-  if ((!ACE_OS::strcmp ((char *) value,
-                        "IDL:/CORBA_DynAny:1.0"))
-      || (!ACE_OS::strcmp ((char *) value,
-                           CORBA::_tc_Object->id (_tao_environment))))
-      return 1;
-    else
-      return 0;
-}
-
-void*
-POA_CORBA::DynAny::_downcast (const char* logical_type_id)
-{
-  if (ACE_OS::strcmp (logical_type_id,
-                      "IDL:/CORBA_DynAny:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::DynAny_ptr, this);
-
-  if (ACE_OS::strcmp (logical_type_id,
-                      "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-
-  return 0;
-}
-
-const char*
-POA_CORBA::DynAny::_interface_repository_id (void) const
-{
-  return "IDL:/CORBA_DynAny:1.0";
-}
-
-POA_CORBA::_tao_collocated_DynAny::_tao_collocated_DynAny (
-    POA_CORBA::DynAny_ptr  servant,
-    TAO_Stub *stub
-  )
-  : CORBA_DynAny (),
-    CORBA_Object (stub,
-                  servant,
-                  1),
-    servant_ (servant)
-{
-}
-
-POA_CORBA::DynAny_ptr
-POA_CORBA::_tao_collocated_DynAny::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean
-POA_CORBA::_tao_collocated_DynAny::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      _tao_environment
-    );
-}
-
-CORBA::TypeCode_ptr
-POA_CORBA::_tao_collocated_DynAny::type (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->type (
-    _tao_environment
-  );
-}
-
-void
-POA_CORBA::_tao_collocated_DynAny::assign (
-    CORBA_DynAny_ptr CORBA_Dyn_any,
-    CORBA::Environment &_tao_environment
-   )
-{
-  this->servant_->assign (
-    CORBA_Dyn_any,
-    _tao_environment
-  );
-}
-
-void
-POA_CORBA::_tao_collocated_DynAny::from_any (
-    const CORBA::Any & value,
-    CORBA::Environment &_tao_environment
-   )
-{
-  this->servant_->from_any (
-    value,
-    _tao_environment
-  );
-}
-
-CORBA::Any *
-POA_CORBA::_tao_collocated_DynAny::to_any (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->to_any (
-    _tao_environment
-  );
-}
-
-void
-POA_CORBA::_tao_collocated_DynAny::destroy (
-    CORBA::Environment &_tao_environment
-   )
-{
-  this->servant_->destroy (
-    _tao_environment
-  );
-}
-
-CORBA_DynAny_ptr
-POA_CORBA::_tao_collocated_DynAny::copy (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->copy (
-    _tao_environment
-  );
-}
-
-void
-POA_CORBA::_tao_collocated_DynAny::insert_boolean (
-    CORBA::Boolean value,
-    CORBA::Environment &_tao_environment
-   )
-{
-  this->servant_->insert_boolean (
-    value,
-    _tao_environment
-  );
-}
-
-void
-POA_CORBA::_tao_collocated_DynAny::insert_octet (
-    CORBA::Octet value,
-    CORBA::Environment &_tao_environment
-   )
-{
-  this->servant_->insert_octet (
-    value,
-    _tao_environment
-  );
-}
-
-void
-POA_CORBA::_tao_collocated_DynAny::insert_char (
-    CORBA::Char value,
-    CORBA::Environment &_tao_environment
-   )
-{
-  this->servant_->insert_char (
-    value,
-    _tao_environment
-  );
-}
-
-void
-POA_CORBA::_tao_collocated_DynAny::insert_short (
-    CORBA::Short value,
-    CORBA::Environment &_tao_environment
-   )
-{
-  this->servant_->insert_short (
-    value,
-    _tao_environment
-  );
-}
-
-void
-POA_CORBA::_tao_collocated_DynAny::insert_ushort (
-    CORBA::UShort value,
-    CORBA::Environment &_tao_environment
-   )
-{
-  this->servant_->insert_ushort (
-    value,
-    _tao_environment
-  );
-}
-
-void
-POA_CORBA::_tao_collocated_DynAny::insert_long (
-    CORBA::Long value,
-    CORBA::Environment &_tao_environment
-   )
-{
-  this->servant_->insert_long (
-    value,
-    _tao_environment
-  );
-}
-
-void
-POA_CORBA::_tao_collocated_DynAny::insert_ulong (
-    CORBA::ULong value,
-    CORBA::Environment &_tao_environment
-   )
-{
-  this->servant_->insert_ulong (
-    value,
-    _tao_environment
-  );
-}
-
-void
-POA_CORBA::_tao_collocated_DynAny::insert_float (
-    CORBA::Float value,
-    CORBA::Environment &_tao_environment
-   )
-{
-  this->servant_->insert_float (
-    value,
-    _tao_environment
-  );
-}
-
-void
-POA_CORBA::_tao_collocated_DynAny::insert_double (
-    CORBA::Double value,
-    CORBA::Environment &_tao_environment
-   )
-{
-  this->servant_->insert_double (
-    value,
-    _tao_environment
-  );
-}
-
-void
-POA_CORBA::_tao_collocated_DynAny::insert_string (
-    const char * value,
-    CORBA::Environment &_tao_environment
-   )
-{
-  this->servant_->insert_string (
-    value,
-    _tao_environment
-  );
-}
-
-void
-POA_CORBA::_tao_collocated_DynAny::insert_reference (
-    CORBA::Object_ptr value,
-    CORBA::Environment &_tao_environment
-   )
-{
-  this->servant_->insert_reference (
-    value,
-    _tao_environment
-  );
-}
-
-void
-POA_CORBA::_tao_collocated_DynAny::insert_typecode (
-    CORBA::TypeCode_ptr value,
-    CORBA::Environment &_tao_environment
-   )
-{
-  this->servant_->insert_typecode (
-    value,
-    _tao_environment
-  );
-}
-
-void
-POA_CORBA::_tao_collocated_DynAny::insert_longlong (
-    CORBA::LongLong value,
-    CORBA::Environment &_tao_environment
-   )
-{
-  this->servant_->insert_longlong (
-    value,
-    _tao_environment
-  );
-}
-
-void
-POA_CORBA::_tao_collocated_DynAny::insert_ulonglong (
-    CORBA::ULongLong value,
-    CORBA::Environment &_tao_environment
-   )
-{
-  this->servant_->insert_ulonglong (
-    value,
-    _tao_environment
-  );
-}
-
-void
-POA_CORBA::_tao_collocated_DynAny::insert_wchar (
-    CORBA::WChar value,
-    CORBA::Environment &_tao_environment
-   )
-{
-  this->servant_->insert_wchar (
-    value,
-    _tao_environment
-  );
-}
-
-void
-POA_CORBA::_tao_collocated_DynAny::insert_any (
-    const CORBA::Any & value,
-    CORBA::Environment &_tao_environment
-   )
-{
-  this->servant_->insert_any (
-    value,
-    _tao_environment
-  );
-}
-
-CORBA::Boolean
-POA_CORBA::_tao_collocated_DynAny::get_boolean (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->get_boolean (
-    _tao_environment
-  );
-}
-
-CORBA::Octet
-POA_CORBA::_tao_collocated_DynAny::get_octet (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->get_octet (
-    _tao_environment
-  );
-}
-
-CORBA::Char
-POA_CORBA::_tao_collocated_DynAny::get_char (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->get_char (
-    _tao_environment
-  );
-}
-
-CORBA::Short
-POA_CORBA::_tao_collocated_DynAny::get_short (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->get_short (
-    _tao_environment
-  );
-}
-
-CORBA::UShort
-POA_CORBA::_tao_collocated_DynAny::get_ushort (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->get_ushort (
-    _tao_environment
-  );
-}
-
-CORBA::Long
-POA_CORBA::_tao_collocated_DynAny::get_long (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->get_long (
-    _tao_environment
-  );
-}
-
-CORBA::ULong
-POA_CORBA::_tao_collocated_DynAny::get_ulong (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->get_ulong (
-    _tao_environment
-  );
-}
-
-CORBA::Float
-POA_CORBA::_tao_collocated_DynAny::get_float (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->get_float (
-    _tao_environment
-  );
-}
-
-CORBA::Double
-POA_CORBA::_tao_collocated_DynAny::get_double (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->get_double (
-    _tao_environment
-  );
-}
-
-char *
-POA_CORBA::_tao_collocated_DynAny::get_string (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->get_string (
-    _tao_environment
-  );
-}
-
-CORBA::Object_ptr
-POA_CORBA::_tao_collocated_DynAny::get_reference (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->get_reference (
-    _tao_environment
-  );
-}
-
-CORBA::TypeCode_ptr
-POA_CORBA::_tao_collocated_DynAny::get_typecode (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->get_typecode (
-    _tao_environment
-  );
-}
-
-CORBA::LongLong
-POA_CORBA::_tao_collocated_DynAny::get_longlong (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->get_longlong (
-    _tao_environment
-  );
-}
-
-CORBA::ULongLong
-POA_CORBA::_tao_collocated_DynAny::get_ulonglong (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->get_ulonglong (
-    _tao_environment
-  );
-}
-
-CORBA::WChar
-POA_CORBA::_tao_collocated_DynAny::get_wchar (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->get_wchar (
-    _tao_environment
-  );
-}
-
-CORBA::Any *
-POA_CORBA::_tao_collocated_DynAny::get_any (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->get_any (
-    _tao_environment
-  );
-}
-
-CORBA_DynAny_ptr
-POA_CORBA::_tao_collocated_DynAny::current_component (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->current_component (
-    _tao_environment
-  );
-}
-
-CORBA::Boolean
-POA_CORBA::_tao_collocated_DynAny::next (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->next (
-    _tao_environment
-  );
-}
-
-CORBA::Boolean
-POA_CORBA::_tao_collocated_DynAny::seek (
-    CORBA::Long slot,
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->seek (
-    slot,
-    _tao_environment
-  );
-}
-
-void
-POA_CORBA::_tao_collocated_DynAny::rewind (
-    CORBA::Environment &_tao_environment
-   )
-{
-  this->servant_->rewind (
-    _tao_environment
-  );
-}
-
-
-CORBA_DynAny*
-POA_CORBA::DynAny::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-
-  ACE_CHECK_RETURN (0);
-
-  return new POA_CORBA::_tao_collocated_DynAny (this, 
-                                                stub);
-}
-
-// constructor
-POA_CORBA::DynEnum::DynEnum (void)
-{
-}
-
-// copy ctor
-POA_CORBA::DynEnum::DynEnum (POA_CORBA::DynEnum& rhs)
-  : ACE_NESTED_CLASS (POA_CORBA, DynAny (rhs)),
-    TAO_Local_ServantBase (rhs)
-        {}
-// destructor
-POA_CORBA::DynEnum::~DynEnum (void)
-{
-}
-
-CORBA::Boolean
-POA_CORBA::DynEnum::_is_a (
-    const char* value,
-    CORBA::Environment &_tao_environment
-  )
-{
-  if ((!ACE_OS::strcmp ((char *) value,
-                        "IDL:/CORBA_DynEnum:1.0"))
-      || (!ACE_OS::strcmp ((char *) value,
-                           "IDL:/CORBA_DynAny:1.0"))
-      || (!ACE_OS::strcmp ((char *) value,
-                           CORBA::_tc_Object->id (_tao_environment))))
-      return 1;
-    else
-      return 0;
-}
-
-void*
-POA_CORBA::DynEnum::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (!ACE_OS::strcmp (logical_type_id,
-                       "IDL:/CORBA_DynEnum:1.0"))
-    return ACE_static_cast (POA_CORBA::DynEnum_ptr,
-                            this);
-
-  if (!ACE_OS::strcmp (logical_type_id,
-                       "IDL:/CORBA_DynAny:1.0"))
-    return ACE_static_cast (POA_CORBA::DynAny_ptr,
-                            this);
-
-  if (!ACE_OS::strcmp (logical_type_id,
-                       "IDL:omg.org/CORBA/Object:1.0"))
-    return ACE_static_cast(PortableServer::Servant,
-                           this);
-
-  return 0;
-}
-
-const char*
-POA_CORBA::DynEnum::_interface_repository_id (void) const
-{
-  return "IDL:/CORBA_DynEnum:1.0";
-}
-
-POA_CORBA::_tao_collocated_DynEnum::_tao_collocated_DynEnum (
-    POA_CORBA::DynEnum_ptr servant,
-    TAO_Stub *stub
-  )
-  : CORBA_DynEnum (),
-    ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_DynAny (servant,
-                                                         stub)),
-    CORBA_Object (stub,
-                  servant,
-                  1),
-    servant_ (servant)
-{
-}
-
-POA_CORBA::DynEnum_ptr
-POA_CORBA::_tao_collocated_DynEnum::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean
-POA_CORBA::_tao_collocated_DynEnum::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      _tao_environment
-    );
-}
-
-char *
-POA_CORBA::_tao_collocated_DynEnum::value_as_string (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->value_as_string (
-    _tao_environment
-  );
-}
-
-void
-POA_CORBA::_tao_collocated_DynEnum::value_as_string (
-    const char * value_as_string,
-    CORBA::Environment &_tao_environment
-   )
-{
-  this->servant_->value_as_string (
-    value_as_string,
-    _tao_environment
-  );
-}
-
-CORBA::ULong
-POA_CORBA::_tao_collocated_DynEnum::value_as_ulong (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->value_as_ulong (
-    _tao_environment
-  );
-}
-
-void
-POA_CORBA::_tao_collocated_DynEnum::value_as_ulong (
-    CORBA::ULong value_as_ulong,
-    CORBA::Environment &_tao_environment
-   )
-{
-  this->servant_->value_as_ulong (
-    value_as_ulong,
-    _tao_environment
-  );
-}
-
-
-CORBA_DynEnum*
-POA_CORBA::DynEnum::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-
-  ACE_CHECK_RETURN (0);
-
-  return new POA_CORBA::_tao_collocated_DynEnum (this,
-                                                 stub);
-}
-
-// constructor
-POA_CORBA::DynStruct::DynStruct (void)
-{
-}
-
-// copy ctor
-POA_CORBA::DynStruct::DynStruct (POA_CORBA::DynStruct& rhs)
-  : ACE_NESTED_CLASS (POA_CORBA, DynAny (rhs)),
-    TAO_Local_ServantBase (rhs)
-{}
-// destructor
-POA_CORBA::DynStruct::~DynStruct (void)
-{
-}
-CORBA::Boolean
-POA_CORBA::DynStruct::_is_a (
-    const char* value,
-    CORBA::Environment &_tao_environment
-  )
-{
-  if ((!ACE_OS::strcmp ((char *)value, "IDL:/CORBA_DynStruct:1.0"))
-      || (!ACE_OS::strcmp ((char *)value, "IDL:/CORBA_DynAny:1.0"))
-      || (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-      return 1;
-    else
-      return 0;
-}
-
-void*
-POA_CORBA::DynStruct::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (!ACE_OS::strcmp (logical_type_id,
-                       "IDL:/CORBA_DynStruct:1.0"))
-    return ACE_static_cast (POA_CORBA::DynStruct_ptr,
-                            this);
-
-  if (!ACE_OS::strcmp (logical_type_id,
-                       "IDL:/CORBA_DynAny:1.0"))
-    return ACE_static_cast (POA_CORBA::DynAny_ptr,
-                            this);
-
-  if (!ACE_OS::strcmp (logical_type_id,
-                       "IDL:omg.org/CORBA/Object:1.0"))
-    return ACE_static_cast(PortableServer::Servant,
-                           this);
-
-  return 0;
-}
-
-const char*
-POA_CORBA::DynStruct::_interface_repository_id (void) const
-{
-  return "IDL:/CORBA_DynStruct:1.0";
-}
-
-POA_CORBA::_tao_collocated_DynStruct::_tao_collocated_DynStruct (
-    POA_CORBA::DynStruct_ptr  servant,
-    TAO_Stub *stub
-  )
-  : CORBA_DynStruct (),
-    ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_DynAny (servant,
-                                                         stub)),
-    CORBA_Object (stub,
-                  servant,
-                  1),
-    servant_ (servant)
-{
-}
-
-POA_CORBA::DynStruct_ptr
-POA_CORBA::_tao_collocated_DynStruct::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean
-POA_CORBA::_tao_collocated_DynStruct::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      _tao_environment
-    );
-}
-
-char *
-POA_CORBA::_tao_collocated_DynStruct::current_member_name (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->current_member_name (
-    _tao_environment
-  );
-}
-
-CORBA::TCKind
-POA_CORBA::_tao_collocated_DynStruct::current_member_kind (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->current_member_kind (
-    _tao_environment
-  );
-}
-
-CORBA::NameValuePairSeq *
-POA_CORBA::_tao_collocated_DynStruct::get_members (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->get_members (
-    _tao_environment
-  );
-}
-
-void
-POA_CORBA::_tao_collocated_DynStruct::set_members (
-    const CORBA::NameValuePairSeq & value,
-    CORBA::Environment &_tao_environment
-   )
-{
-  this->servant_->set_members (
-    value,
-    _tao_environment
-  );
-}
-
-
-CORBA_DynStruct*
-POA_CORBA::DynStruct::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-
-  ACE_CHECK_RETURN (0);
-
-  return new POA_CORBA::_tao_collocated_DynStruct (this,
-                                                   stub);
-}
-
-// constructor
-POA_CORBA::DynUnion::DynUnion (void)
-{
-}
-
-// copy ctor
-POA_CORBA::DynUnion::DynUnion (POA_CORBA::DynUnion& rhs)
-  : ACE_NESTED_CLASS (POA_CORBA, DynAny (rhs)),
-    TAO_Local_ServantBase (rhs)
-{}
-// destructor
-POA_CORBA::DynUnion::~DynUnion (void)
-{
-}
-CORBA::Boolean
-POA_CORBA::DynUnion::_is_a (
-    const char* value,
-    CORBA::Environment &_tao_environment
-  )
-{
-  if ((!ACE_OS::strcmp ((char *)value, "IDL:/CORBA_DynUnion:1.0"))
-      || (!ACE_OS::strcmp ((char *)value, "IDL:/CORBA_DynAny:1.0"))
-      || (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-      return 1;
-    else
-      return 0;
-}
-
-void*
-POA_CORBA::DynUnion::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (!ACE_OS::strcmp (logical_type_id,
-                       "IDL:/CORBA_DynUnion:1.0"))
-    return ACE_static_cast (POA_CORBA::DynUnion_ptr,
-                            this);
-
-  if (!ACE_OS::strcmp (logical_type_id,
-                       "IDL:/CORBA_DynAny:1.0"))
-    return ACE_static_cast (POA_CORBA::DynAny_ptr,
-                            this);
-
-  if (!ACE_OS::strcmp (logical_type_id,
-                       "IDL:omg.org/CORBA/Object:1.0"))
-    return ACE_static_cast(PortableServer::Servant,
-                           this);
-
-  return 0;
-}
-
-const char* POA_CORBA::DynUnion::_interface_repository_id (void) const
-{
-  return "IDL:/CORBA_DynUnion:1.0";
-}
-
-POA_CORBA::_tao_collocated_DynUnion::_tao_collocated_DynUnion (
-    POA_CORBA::DynUnion_ptr  servant,
-    TAO_Stub *stub
-  )
-  : CORBA_DynUnion (),
-    ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_DynAny (servant,
-                                                         stub)),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_CORBA::DynUnion_ptr
-POA_CORBA::_tao_collocated_DynUnion::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean
-POA_CORBA::_tao_collocated_DynUnion::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      _tao_environment
-    );
-}
-
-CORBA::Boolean
-POA_CORBA::_tao_collocated_DynUnion::set_as_default (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->set_as_default (
-    _tao_environment
-  );
-}
-
-void
-POA_CORBA::_tao_collocated_DynUnion::set_as_default (
-    CORBA::Boolean set_as_default,
-    CORBA::Environment &_tao_environment
-   )
-{
-  this->servant_->set_as_default (
-    set_as_default,
-    _tao_environment
-  );
-}
-
-CORBA_DynAny_ptr
-POA_CORBA::_tao_collocated_DynUnion::discriminator (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->discriminator (
-    _tao_environment
-  );
-}
-
-CORBA::TCKind
-POA_CORBA::_tao_collocated_DynUnion::discriminator_kind (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->discriminator_kind (
-    _tao_environment
-  );
-}
-
-CORBA_DynAny_ptr
-POA_CORBA::_tao_collocated_DynUnion::member (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->member (
-    _tao_environment
-  );
-}
-
-char *
-POA_CORBA::_tao_collocated_DynUnion::member_name (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->member_name (
-    _tao_environment
-  );
-}
-
-void
-POA_CORBA::_tao_collocated_DynUnion::member_name (
-    const char * member_name,
-    CORBA::Environment &_tao_environment
-   )
-{
-  this->servant_->member_name (
-    member_name,
-    _tao_environment
-  );
-}
-
-CORBA::TCKind
-POA_CORBA::_tao_collocated_DynUnion::member_kind (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->member_kind (
-    _tao_environment
-  );
-}
-
-
-CORBA_DynUnion*
-POA_CORBA::DynUnion::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-
-  ACE_CHECK_RETURN (0);
-
-  return new POA_CORBA::_tao_collocated_DynUnion (this,
-                                                  stub);
-}
-
-// constructor
-POA_CORBA::DynSequence::DynSequence (void)
-{
-}
-
-// copy ctor
-POA_CORBA::DynSequence::DynSequence (POA_CORBA::DynSequence& rhs)
-  : ACE_NESTED_CLASS (POA_CORBA, DynAny (rhs)),
-    TAO_Local_ServantBase (rhs)
-{}
-// destructor
-POA_CORBA::DynSequence::~DynSequence (void)
-{
-}
-CORBA::Boolean
-POA_CORBA::DynSequence::_is_a (
-    const char* value,
-    CORBA::Environment &_tao_environment
-  )
-{
-  if ((!ACE_OS::strcmp ((char *)value, "IDL:/CORBA_DynSequence:1.0"))
-      || (!ACE_OS::strcmp ((char *)value, "IDL:/CORBA_DynAny:1.0"))
-      || (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-      return 1;
-    else
-      return 0;
-}
-
-void*
-POA_CORBA::DynSequence::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (!ACE_OS::strcmp (logical_type_id,
-                       "IDL:/CORBA_DynSequence:1.0"))
-    return ACE_static_cast (POA_CORBA::DynSequence_ptr,
-                            this);
-
-  if (!ACE_OS::strcmp (logical_type_id,
-                       "IDL:/CORBA_DynAny:1.0"))
-    return ACE_static_cast (POA_CORBA::DynAny_ptr,
-                            this);
-
-  if (!ACE_OS::strcmp (logical_type_id,
-                       "IDL:omg.org/CORBA/Object:1.0"))
-    return ACE_static_cast(PortableServer::Servant,
-                           this);
-
-  return 0;
-}
-
-const char*
-POA_CORBA::DynSequence::_interface_repository_id (void) const
-{
-  return "IDL:/CORBA_DynSequence:1.0";
-}
-
-POA_CORBA::_tao_collocated_DynSequence::_tao_collocated_DynSequence (
-    POA_CORBA::DynSequence_ptr  servant,
-    TAO_Stub *stub
-  )
-  : CORBA_DynSequence (),
-    ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_DynAny (servant,
-                                                         stub)),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_CORBA::DynSequence_ptr
-POA_CORBA::_tao_collocated_DynSequence::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean
-POA_CORBA::_tao_collocated_DynSequence::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      _tao_environment
-    );
-}
-
-CORBA::ULong
-POA_CORBA::_tao_collocated_DynSequence::length (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->length (
-    _tao_environment
-  );
-}
-
-void
-POA_CORBA::_tao_collocated_DynSequence::length (
-    CORBA::ULong length,
-    CORBA::Environment &_tao_environment
-   )
-{
-  this->servant_->length (
-    length,
-    _tao_environment
-  );
-}
-
-CORBA_AnySeq *
-POA_CORBA::_tao_collocated_DynSequence::get_elements (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->get_elements (
-    _tao_environment
-  );
-}
-
-void
-POA_CORBA::_tao_collocated_DynSequence::set_elements (
-    const CORBA_AnySeq & value,
-    CORBA::Environment &_tao_environment
-   )
-{
-  this->servant_->set_elements (
-    value,
-    _tao_environment
-  );
-}
-
-
-CORBA_DynSequence*
-POA_CORBA::DynSequence::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-
-  ACE_CHECK_RETURN (0);
-
-  return new POA_CORBA::_tao_collocated_DynSequence (this,
-                                                     stub);
-}
-
-// constructor
-POA_CORBA::DynArray::DynArray (void)
-{
-}
-
-// copy ctor
-POA_CORBA::DynArray::DynArray (POA_CORBA::DynArray& rhs)
-  : ACE_NESTED_CLASS (POA_CORBA, DynAny (rhs)),
-    TAO_Local_ServantBase (rhs)
-{}
-// destructor
-POA_CORBA::DynArray::~DynArray (void)
-{
-}
-CORBA::Boolean
-POA_CORBA::DynArray::_is_a (
-    const char* value,
-    CORBA::Environment &_tao_environment
-  )
-{
-  if ((!ACE_OS::strcmp ((char *)value, "IDL:/CORBA_DynArray:1.0"))
-      || (!ACE_OS::strcmp ((char *)value, "IDL:/CORBA_DynAny:1.0"))
-      || (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-      return 1;
-    else
-      return 0;
-}
-
-void*
-POA_CORBA::DynArray::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (!ACE_OS::strcmp (logical_type_id,
-                       "IDL:/CORBA_DynArray:1.0"))
-    return ACE_static_cast (POA_CORBA::DynArray_ptr,
-                            this);
-
-  if (!ACE_OS::strcmp (logical_type_id,
-                       "IDL:/CORBA_DynAny:1.0"))
-    return ACE_static_cast (POA_CORBA::DynAny_ptr,
-                            this);
-
-  if (!ACE_OS::strcmp (logical_type_id,
-                       "IDL:omg.org/CORBA/Object:1.0"))
-    return ACE_static_cast(PortableServer::Servant,
-                           this);
-
-  return 0;
-}
-
-const char*
-POA_CORBA::DynArray::_interface_repository_id (void) const
-{
-  return "IDL:/CORBA_DynArray:1.0";
-}
-
-POA_CORBA::_tao_collocated_DynArray::_tao_collocated_DynArray (
-    POA_CORBA::DynArray_ptr  servant,
-    TAO_Stub *stub
-  )
-  : CORBA_DynArray (),
-    ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_DynAny (servant,
-                                                         stub)),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_CORBA::DynArray_ptr
-POA_CORBA::_tao_collocated_DynArray::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_CORBA::_tao_collocated_DynArray::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      _tao_environment
-    );
-}
-
-CORBA_AnySeq *
-POA_CORBA::_tao_collocated_DynArray::get_elements (
-    CORBA::Environment &_tao_environment
-   )
-{
-  return this->servant_->get_elements (
-    _tao_environment
-  );
-}
-
-void
-POA_CORBA::_tao_collocated_DynArray::set_elements (
-    const CORBA_AnySeq & value,
-    CORBA::Environment &_tao_environment
-   )
-{
-  this->servant_->set_elements (
-    value,
-    _tao_environment
-  );
-}
-
-
-CORBA_DynArray*
-POA_CORBA::DynArray::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-
-  ACE_CHECK_RETURN (0);
-
-  return new POA_CORBA::_tao_collocated_DynArray (this,
-                                                  stub);
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/DynAny_i.cpp b/TAO/tao/DynAny_i.cpp
deleted file mode 100644
index bc1cbf0aaf9..00000000000
--- a/TAO/tao/DynAny_i.cpp
+++ /dev/null
@@ -1,1196 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// =================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    DynAny_i.cpp
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// =================================================================
-
-#include "tao/DynAny_i.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#include "tao/DynStruct_i.h"
-#include "tao/DynSequence_i.h"
-#include "tao/DynEnum_i.h"
-#include "tao/DynArray_i.h"
-#include "tao/DynUnion_i.h"
-#include "tao/InconsistentTypeCodeC.h"
-#include "ace/Auto_Ptr.h"
-
-// Constructor from typecode
-TAO_DynAny_i::TAO_DynAny_i (CORBA_TypeCode_ptr tc)
-  : value_ (CORBA::TypeCode::_duplicate (tc))
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Check to see if it's a simple type.
-      int tk = unalias (tc, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      switch (tk)
-        {
-          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_longlong:
-          case CORBA::tk_ulonglong:
-          case CORBA::tk_boolean:
-          case CORBA::tk_char:
-          case CORBA::tk_wchar:
-          case CORBA::tk_octet:
-          case CORBA::tk_any:
-          case CORBA::tk_TypeCode:
-          case CORBA::tk_objref:
-          case CORBA::tk_string:
-            break;
-          default:
-            ACE_THROW (CORBA_ORB_InconsistentTypeCode ());
-        }
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-// Constructor from Any
-TAO_DynAny_i::TAO_DynAny_i (const CORBA_Any& any)
-  : value_ (any)
-{
-  // Check to see if it's a simple type.
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // @@ Is the typecode duplicate in Any.type()???
-      int tk = unalias (any.type (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      switch (tk)
-        {
-          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_longlong:
-          case CORBA::tk_ulonglong:
-          case CORBA::tk_boolean:
-          case CORBA::tk_char:
-          case CORBA::tk_wchar:
-          case CORBA::tk_octet:
-          case CORBA::tk_any:
-          case CORBA::tk_TypeCode:
-          case CORBA::tk_objref:
-          case CORBA::tk_string:
-            break;
-          default:
-            ACE_THROW (CORBA_DynAny::Invalid ());
-        }
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-// Destructor
-TAO_DynAny_i::~TAO_DynAny_i (void)
-{
-}
-
-// Common functions
-
-CORBA::TypeCode_ptr
-TAO_DynAny_i::type (CORBA::Environment &)
-{
-  return CORBA_TypeCode::_duplicate (this->value_.type ());
-}
-
-void
-TAO_DynAny_i::assign (CORBA_DynAny_ptr dyn_any,
-                      CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TypeCode_ptr tp = dyn_any->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::Boolean equal = this->value_.type ()->equal (tp,
-                                                      ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (equal)
-    {
-      this->value_ = *dyn_any->to_any (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::Invalid ());
-    }
-}
-
-CORBA_DynAny_ptr
-TAO_DynAny_i::copy (CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_DynAny_i* tmp = new TAO_DynAny_i (this->value_);
-
-  CORBA_DynAny_ptr retval = tmp->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return retval;
-}
-
-void
-TAO_DynAny_i::destroy (CORBA::Environment &)
-{
-  delete this;
-}
-
-void
-TAO_DynAny_i::from_any (const CORBA_Any& any,
-                        CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Boolean equal =
-    this->value_.type ()->equal (any.type (),
-                                 ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (!equal || any._tao_get_cdr () == 0)
-    {
-      ACE_THROW (CORBA_DynAny::Invalid ());
-    }
-
-  this->value_ = any;
-}
-
-CORBA::Any_ptr
-TAO_DynAny_i::to_any (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (this->value_._tao_get_cdr ())
-    {
-      CORBA_Any_ptr retval;
-
-      ACE_NEW_RETURN (retval,
-                      CORBA::Any (this->value_),
-                      0);
-
-      return retval;
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        0);
-    }
-}
-
-CORBA_DynAny_ptr
-TAO_DynAny_i::current_component (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_DynAny_ptr retval = this->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-  return retval;
-}
-
-CORBA::Boolean
-TAO_DynAny_i::next (CORBA::Environment &)
-{
-  return 0;
-}
-
-CORBA::Boolean
-TAO_DynAny_i::seek (CORBA::Long slot,
-                    CORBA::Environment &)
-{
-  return slot == 0 ? 1 : 0;
-}
-
-// Nothing to rewind in this class.
-void
-TAO_DynAny_i::rewind (CORBA::Environment &)
-{
-}
-
-// Insert functions
-
-void
-TAO_DynAny_i::insert_boolean (CORBA::Boolean value,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_boolean)
-    {
-      CORBA::Any::from_boolean tmp (value);
-      this->value_ <<= tmp;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynAny_i::insert_octet (CORBA::Octet value,
-                            CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_octet)
-    {
-      CORBA::Any::from_octet tmp (value);
-      this->value_ <<= tmp;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynAny_i::insert_char (CORBA::Char value,
-                           CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_char)
-    {
-      CORBA::Any::from_char tmp (value);
-      this->value_ <<= tmp;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynAny_i::insert_short (CORBA::Short value,
-                            CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_short)
-    {
-      this->value_ <<= value;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynAny_i::insert_ushort (CORBA::UShort value,
-                             CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_ushort)
-    {
-      this->value_ <<= value;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynAny_i::insert_long (CORBA::Long value,
-                           CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_long)
-    {
-      this->value_ <<= value;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynAny_i::insert_ulong (CORBA::ULong value,
-                            CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_ulong)
-    {
-      this->value_ <<= value;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynAny_i::insert_float (CORBA::Float value,
-                            CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_float)
-    {
-      this->value_ <<= value;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynAny_i::insert_double (CORBA::Double value,
-                             CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_double)
-    {
-      this->value_ <<= value;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynAny_i::insert_string (const char * value,
-                             CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind = this->value_.type ()->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_string)
-    {
-      this->value_ <<= value;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynAny_i::insert_reference (CORBA::Object_ptr value,
-                                CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind = this->value_.type ()->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_objref)
-    {
-      this->value_ <<= value;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynAny_i::insert_typecode (CORBA::TypeCode_ptr value,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind = this->value_.type ()->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_TypeCode)
-    {
-      this->value_ <<= value;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynAny_i::insert_longlong (CORBA::LongLong value,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_longlong)
-    {
-      this->value_ <<= value;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynAny_i::insert_ulonglong (CORBA::ULongLong value,
-                                CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind = unalias (this->value_.type (),
-                                ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_ulonglong)
-    {
-      this->value_ <<= value;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynAny_i::insert_wchar (CORBA::WChar value,
-                            CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (this->value_.type (),
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_wchar)
-    {
-      CORBA::Any::from_wchar tmp (value);
-      this->value_ <<= tmp;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynAny_i::insert_any (const CORBA::Any& value,
-                          CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind = this->value_.type ()->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_any)
-    {
-      this->value_ <<= value;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-// Get functions
-
-CORBA::Boolean
-TAO_DynAny_i::get_boolean (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Boolean val;
-  CORBA::Any::to_boolean tmp (val);
-
-  if (!(this->value_ >>= tmp))
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::Octet
-TAO_DynAny_i::get_octet (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Octet val;
-  CORBA::Any::to_octet tmp (val);
-
-  if (!(this->value_ >>= tmp))
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::Char
-TAO_DynAny_i::get_char (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Char val;
-  CORBA::Any::to_char tmp (val);
-
-  if (!(this->value_ >>= tmp))
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::Short
-TAO_DynAny_i::get_short (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Short val;
-
-  if (!(this->value_ >>= val))
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::UShort
-TAO_DynAny_i::get_ushort (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::UShort val;
-
-  if (!(this->value_ >>= val))
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::Long
-TAO_DynAny_i::get_long (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Long val;
-
-  if (!(this->value_ >>= val))
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::ULong
-TAO_DynAny_i::get_ulong (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::ULong val;
-
-  if (!(this->value_ >>= val))
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::Float
-TAO_DynAny_i::get_float (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Float val;
-
-  if (!(this->value_ >>= val))
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::Double
-TAO_DynAny_i::get_double (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Double val;
-
-  if (!(this->value_ >>= val))
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                        val);
-    }
-
-  return val;
-}
-
-char *
-TAO_DynAny_i::get_string (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Char *val;
-
-  if (!(this->value_ >>= val))
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::Object_ptr
-TAO_DynAny_i::get_reference (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_Object_ptr val;
-  CORBA::Any::to_object tmp (val);
-
-  if (!(this->value_ >>= tmp))
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::TypeCode_ptr
-TAO_DynAny_i::get_typecode (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr val;
-
-  if (!(this->value_ >>= val))
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::LongLong
-TAO_DynAny_i::get_longlong (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::LongLong val;
-
-  if (!(this->value_ >>= val))
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::ULongLong
-TAO_DynAny_i::get_ulonglong (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::ULongLong val;
-
-  if (!(this->value_ >>= val))
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::WChar
-TAO_DynAny_i::get_wchar (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::WChar val;
-  CORBA::Any::to_wchar tmp (val);
-
-  if (!(this->value_ >>= tmp))
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::Any_ptr
-TAO_DynAny_i::get_any (CORBA::Environment& ACE_TRY_ENV)
-{
-  CORBA_Any_var val;
-
-  ACE_NEW_THROW_EX (val.out (),
-                    CORBA_Any,
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  if (!(this->value_ >>= *val.out ()))
-    {
-      val = 0;
-      ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                        0);
-    }
-
-  return val._retn ();
-}
-
-// The factory functions
-
-CORBA_DynAny_ptr
-TAO_DynAny_i::create_dyn_any (const CORBA_Any &any,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (any.type (),
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-  switch (kind)
-    {
-      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_longlong:
-      case CORBA::tk_ulonglong:
-      case CORBA::tk_boolean:
-      case CORBA::tk_char:
-      case CORBA::tk_wchar:
-      case CORBA::tk_octet:
-      case CORBA::tk_any:
-      case CORBA::tk_TypeCode:
-      case CORBA::tk_objref:
-      case CORBA::tk_string:
-        {
-          CORBA_DynAny_var retval;
-
-          TAO_DynAny_i *dp;
-
-          ACE_NEW_THROW_EX (dp,
-                            TAO_DynAny_i (any),
-                            CORBA::NO_MEMORY ());
-
-          ACE_CHECK_RETURN (retval._retn ());
-
-          ACE_Auto_Basic_Ptr<TAO_DynAny_i> temp (dp);
-
-          retval = dp->_this (ACE_TRY_ENV);
-
-          ACE_CHECK_RETURN (retval._retn ());
-
-          temp.release ();
-
-          return retval._retn ();
-        }
-      case CORBA::tk_struct:
-      case CORBA::tk_except:
-        {
-          CORBA_DynAny_var retval;
-
-          TAO_DynStruct_i *dp;
-
-          ACE_NEW_THROW_EX (dp,
-                            TAO_DynStruct_i (any),
-                            CORBA::NO_MEMORY ());
-
-          ACE_CHECK_RETURN (retval._retn ());
-
-          ACE_Auto_Basic_Ptr<TAO_DynStruct_i> temp (dp);
-
-          retval = dp->_this (ACE_TRY_ENV);
-
-          ACE_CHECK_RETURN (retval._retn ());
-
-          temp.release ();
-
-          return retval._retn ();
-        }
-      case CORBA::tk_sequence:
-        {
-          CORBA_DynAny_var retval;
-
-          TAO_DynSequence_i *dp;
-
-          ACE_NEW_THROW_EX (dp,
-                            TAO_DynSequence_i (any),
-                            CORBA::NO_MEMORY ());
-
-          ACE_CHECK_RETURN (retval._retn ());
-
-          ACE_Auto_Basic_Ptr<TAO_DynSequence_i> temp (dp);
-
-          retval = dp->_this (ACE_TRY_ENV);
-
-          ACE_CHECK_RETURN (retval._retn ());
-
-          temp.release ();
-
-          return retval._retn ();
-        }
-      case CORBA::tk_union:
-        {
-          CORBA_DynAny_var retval;
-
-          TAO_DynUnion_i *dp;
-
-          ACE_NEW_THROW_EX (dp,
-                            TAO_DynUnion_i (any),
-                            CORBA::NO_MEMORY ());
-
-          ACE_CHECK_RETURN (retval._retn ());
-
-          ACE_Auto_Basic_Ptr<TAO_DynUnion_i> temp (dp);
-
-          retval = dp->_this (ACE_TRY_ENV);
-
-          ACE_CHECK_RETURN (retval._retn ());
-
-          temp.release ();
-
-          return retval._retn ();
-        }
-      case CORBA::tk_enum:
-        {
-          CORBA_DynAny_var retval;
-
-          TAO_DynEnum_i *dp;
-
-          ACE_NEW_THROW_EX (dp,
-                            TAO_DynEnum_i (any),
-                            CORBA::NO_MEMORY ());
-
-          ACE_CHECK_RETURN (retval._retn ());
-
-          ACE_Auto_Basic_Ptr<TAO_DynEnum_i> temp (dp);
-
-          retval = dp->_this (ACE_TRY_ENV);
-
-          ACE_CHECK_RETURN (retval._retn ());
-
-          temp.release ();
-
-          return retval._retn ();
-        }
-      case CORBA::tk_array:
-        {
-          CORBA_DynAny_var retval;
-
-          TAO_DynArray_i *dp;
-
-          ACE_NEW_THROW_EX (dp,
-                            TAO_DynArray_i (any),
-                            CORBA::NO_MEMORY ());
-
-          ACE_CHECK_RETURN (retval._retn ());
-
-          ACE_Auto_Basic_Ptr<TAO_DynArray_i> temp (dp);
-
-          retval = dp->_this (ACE_TRY_ENV);
-
-          ACE_CHECK_RETURN (retval._retn ());
-
-          temp.release ();
-
-          return retval._retn ();
-        }
-      default:
-        break;
-    }
-
-  return CORBA_DynAny::_nil ();
-}
-
-CORBA_DynAny_ptr
-TAO_DynAny_i::create_basic_dyn_any (CORBA_TypeCode_ptr tc,
-                                    CORBA::Environment& ACE_TRY_ENV)
-{
-  CORBA_DynAny_var retval;
-
-  TAO_DynAny_i *dp;
-
-  ACE_NEW_THROW_EX (dp,
-                    TAO_DynAny_i (tc),
-                    CORBA::NO_MEMORY ());
-
-  ACE_CHECK_RETURN (retval._retn ());
-
-  ACE_Auto_Basic_Ptr<TAO_DynAny_i> temp (dp);
-
-  retval = dp->_this (ACE_TRY_ENV);
-
-  ACE_CHECK_RETURN (retval._retn ());
-
-  temp.release ();
-
-  return retval._retn ();
-}
-
-CORBA_DynStruct_ptr
-TAO_DynAny_i::create_dyn_struct (CORBA_TypeCode_ptr tc,
-                                 CORBA::Environment& ACE_TRY_ENV)
-{
-  CORBA_DynStruct_var retval;
-
-  TAO_DynStruct_i *dp;
-
-  ACE_NEW_THROW_EX (dp,
-                    TAO_DynStruct_i (tc),
-                    CORBA::NO_MEMORY ());
-
-  ACE_CHECK_RETURN (retval._retn ());
-
-  ACE_Auto_Basic_Ptr<TAO_DynStruct_i> temp (dp);
-
-  retval = dp->_this (ACE_TRY_ENV);
-
-  ACE_CHECK_RETURN (retval._retn ());
-
-  temp.release ();
-
-  return retval._retn ();
-}
-
-CORBA_DynSequence_ptr
-TAO_DynAny_i::create_dyn_sequence (CORBA_TypeCode_ptr tc,
-                                   CORBA::Environment& ACE_TRY_ENV)
-{
-  CORBA_DynSequence_var retval;
-
-  TAO_DynSequence_i *dp;
-
-  ACE_NEW_THROW_EX (dp,
-                    TAO_DynSequence_i (tc),
-                    CORBA::NO_MEMORY ());
-
-  ACE_CHECK_RETURN (retval._retn ());
-
-  ACE_Auto_Basic_Ptr<TAO_DynSequence_i> temp (dp);
-
-  retval = dp->_this (ACE_TRY_ENV);
-
-  ACE_CHECK_RETURN (retval._retn ());
-
-  temp.release ();
-
-  return retval._retn ();
-}
-
-CORBA_DynArray_ptr
-TAO_DynAny_i::create_dyn_array (CORBA_TypeCode_ptr tc,
-                                CORBA::Environment& ACE_TRY_ENV)
-{
-  CORBA_DynArray_var retval;
-
-  TAO_DynArray_i *dp;
-
-  ACE_NEW_THROW_EX (dp,
-                    TAO_DynArray_i (tc),
-                    CORBA::NO_MEMORY ());
-
-  ACE_CHECK_RETURN (retval._retn ());
-
-  ACE_Auto_Basic_Ptr<TAO_DynArray_i> temp (dp);
-
-  retval = dp->_this (ACE_TRY_ENV);
-
-  ACE_CHECK_RETURN (retval._retn ());
-
-  temp.release ();
-
-  return retval._retn ();
-}
-
-CORBA_DynUnion_ptr
-TAO_DynAny_i::create_dyn_union (CORBA_TypeCode_ptr tc,
-                                CORBA::Environment& ACE_TRY_ENV)
-{
-  CORBA_DynUnion_var retval;
-
-  TAO_DynUnion_i *dp;
-
-  ACE_NEW_THROW_EX (dp,
-                    TAO_DynUnion_i (tc),
-                    CORBA::NO_MEMORY ());
-
-  ACE_CHECK_RETURN (retval._retn ());
-
-  ACE_Auto_Basic_Ptr<TAO_DynUnion_i> temp (dp);
-
-  retval = dp->_this (ACE_TRY_ENV);
-
-  ACE_CHECK_RETURN (retval._retn ());
-
-  temp.release ();
-
-  return retval._retn ();
-}
-
-CORBA_DynEnum_ptr
-TAO_DynAny_i::create_dyn_enum (CORBA_TypeCode_ptr tc,
-                               CORBA::Environment& ACE_TRY_ENV)
-{
-  CORBA_DynEnum_var retval;
-
-  TAO_DynEnum_i *dp;
-
-  ACE_NEW_THROW_EX (dp,
-                    TAO_DynEnum_i (tc),
-                    CORBA::NO_MEMORY ());
-
-  ACE_CHECK_RETURN (retval._retn ());
-
-  ACE_Auto_Basic_Ptr<TAO_DynEnum_i> temp (dp);
-
-  retval = dp->_this (ACE_TRY_ENV);
-
-  ACE_CHECK_RETURN (retval._retn ());
-
-  temp.release ();
-
-  return retval._retn ();
-}
-
-CORBA_DynAny_ptr
-TAO_DynAny_i::create_dyn_any (CORBA_TypeCode_ptr tc,
-                              CORBA::Environment& ACE_TRY_ENV)
-{
-  CORBA_DynAny_var retval;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-  switch (kind)
-    {
-      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_longlong:
-      case CORBA::tk_ulonglong:
-      case CORBA::tk_boolean:
-      case CORBA::tk_char:
-      case CORBA::tk_wchar:
-      case CORBA::tk_octet:
-      case CORBA::tk_any:
-      case CORBA::tk_TypeCode:
-      case CORBA::tk_objref:
-      case CORBA::tk_string:
-        retval = create_basic_dyn_any (tc,
-                                       ACE_TRY_ENV);
-
-        ACE_CHECK_RETURN (retval._retn ());
-
-        return retval._retn ();
-      case CORBA::tk_struct:
-      case CORBA::tk_except:
-        retval = create_dyn_struct (tc,
-                                    ACE_TRY_ENV);
-
-        ACE_CHECK_RETURN (retval._retn ());
-
-        return retval._retn ();
-      case CORBA::tk_sequence:
-        retval = create_dyn_sequence (tc,
-                                      ACE_TRY_ENV);
-
-        ACE_CHECK_RETURN (retval._retn ());
-
-        return retval._retn ();
-      case CORBA::tk_union:
-        retval = create_dyn_union (tc,
-                                   ACE_TRY_ENV);
-
-        ACE_CHECK_RETURN (retval._retn ());
-
-        return retval._retn ();
-      case CORBA::tk_enum:
-        retval = create_dyn_enum (tc,
-                                  ACE_TRY_ENV);
-
-        ACE_CHECK_RETURN (retval._retn ());
-
-        return retval._retn ();
-      case CORBA::tk_array:
-        retval = create_dyn_array (tc,
-                                   ACE_TRY_ENV);
-
-        ACE_CHECK_RETURN (retval._retn ());
-
-        return retval._retn ();
-      default:
-        break;
-    }
-
-  ACE_THROW_RETURN (CORBA_ORB_InconsistentTypeCode (),
-                    CORBA_DynAny::_nil ());
-}
-
-// Utility function called by all the DynAny classes
-// to extract the TCKind of possibly aliased types.
-CORBA::TCKind
-TAO_DynAny_i::unalias (CORBA_TypeCode_ptr tc,
-                       CORBA::Environment& ACE_TRY_ENV)
-{
-  CORBA::TCKind tck = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::tk_null);
-
-  while (tck == CORBA::tk_alias)
-    {
-      CORBA_TypeCode_ptr temp = tc->content_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::tk_null);
-
-      tck = TAO_DynAny_i::unalias (temp,
-                                   ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::tk_null);
-    }
-
-  return tck;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Auto_Basic_Ptr<TAO_DynAny_i>;
-template class ACE_Auto_Basic_Ptr<TAO_DynArray_i>;
-template class ACE_Auto_Basic_Ptr<TAO_DynEnum_i>;
-template class ACE_Auto_Basic_Ptr<TAO_DynSequence_i>;
-template class ACE_Auto_Basic_Ptr<TAO_DynStruct_i>;
-template class ACE_Auto_Basic_Ptr<TAO_DynUnion_i>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_DynAny_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_DynArray_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_DynEnum_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_DynSequence_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_DynStruct_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_DynUnion_i>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/DynAny_i.h b/TAO/tao/DynAny_i.h
deleted file mode 100644
index 3ecafe45dfd..00000000000
--- a/TAO/tao/DynAny_i.h
+++ /dev/null
@@ -1,227 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// =========================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    DynAny_i.h
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// =========================================================================
-
-#ifndef TAO_DYNANY_I_H
-#define TAO_DYNANY_I_H
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#include "tao/corbafwd.h"
-#include "tao/POA_CORBA.h"
-
-class TAO_Export TAO_DynAny_i : public POA_CORBA::DynAny
-{
-  // = TITLE
-  //    TAO_DynAny_i
-  //
-  // = DESCRIPTION
-  //    Implementation of the basic Dynamic Any datatype.
-public:
-  TAO_DynAny_i (CORBA_TypeCode_ptr tc);
-  // constructor with TypeCode argument
-
-  TAO_DynAny_i (const CORBA_Any& any);
-  // constructor with Any argument
-
-  ~TAO_DynAny_i (void);
-  // destructor
-
-  // = Functions common to all Dynamic Any types
-
-  void assign (CORBA_DynAny_ptr dyn_any,
-               CORBA::Environment &ACE_TRY_ENV =
-                 TAO_default_environment ());
-  // Sets the value of the receiver to the value of the argument.
-
-  CORBA_DynAny_ptr copy (CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
-  // Creates a copy
-
-  void destroy (CORBA::Environment &ACE_TRY_ENV =
-                  TAO_default_environment ());
-  // Makes sure the contents are disposed of correctly
-
-  void from_any (const CORBA::Any& any,
-                 CORBA::Environment &ACE_TRY_ENV =
-                   TAO_default_environment ());
-  // Assigns value from an Any argument
-
-  CORBA::Any_ptr to_any (CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
-  // Outputs contents as an Any
-
-  CORBA::TypeCode_ptr type (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  // Returns the (constant) type
-
-  CORBA_DynAny_ptr current_component (CORBA::Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ());
-  // In this class, there is only one
-
-  CORBA::Boolean next (CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
-  // Returns next component, again here there is only one
-
-  CORBA::Boolean seek (CORBA::Long slot,
-                       CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
-  // In this class, returns true only for slot of 0
-
-  void rewind (CORBA::Environment &ACE_TRY_ENV =
-                 TAO_default_environment ());
-  // Makes first component the current one
-
-  // Insert and get functions
-
-  void insert_boolean (CORBA::Boolean value,
-                       CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
-  void insert_octet (CORBA::Octet value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-  void insert_char (CORBA::Char value,
-                    CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
-  void insert_short (CORBA::Short value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-  void insert_ushort (CORBA::UShort value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-  void insert_long (CORBA::Long value,
-                    CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
-  void insert_ulong (CORBA::ULong value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-  void insert_float (CORBA::Float value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-  void insert_double (CORBA::Double value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
-  void insert_string (const char * value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
-  void insert_reference (CORBA::Object_ptr value,
-                         CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
-  void insert_typecode (CORBA::TypeCode_ptr value,
-                        CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  void insert_longlong (CORBA::LongLong value,
-                        CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  void insert_ulonglong (CORBA::ULongLong value,
-                         CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
-  void insert_wchar (CORBA::WChar value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
-  void insert_any (const CORBA::Any& value,
-                   CORBA::Environment &ACE_TRY_ENV =
-                     TAO_default_environment ());
-  CORBA::Boolean get_boolean (CORBA::Environment &ACE_TRY_ENV =
-                                TAO_default_environment ());
-  CORBA::Octet get_octet (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Char get_char (CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  CORBA::Short get_short (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::UShort get_ushort (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  CORBA::Long get_long (CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  CORBA::ULong get_ulong (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Float get_float (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Double get_double (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  char *get_string (CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
-  CORBA::Object_ptr get_reference (CORBA::Environment &ACE_TRY_ENV =
-                                     TAO_default_environment ());
-  CORBA::TypeCode_ptr get_typecode (CORBA::Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ());
-  CORBA::LongLong get_longlong (CORBA::Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ());
-  CORBA::ULongLong get_ulonglong (CORBA::Environment &ACE_TRY_ENV =
-                                    TAO_default_environment ());
-  CORBA::WChar get_wchar (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Any_ptr get_any (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-
-  // The ORB DynAny-factory functions will call these so we don't need
-  // to keep an orb pointer in each DynAny object.
-
-  static CORBA_DynAny_ptr create_dyn_any (const CORBA_Any& any,
-                                          CORBA::Environment &ACE_TRY_ENV =
-                                            TAO_default_environment ());
-  static CORBA_DynAny_ptr create_basic_dyn_any (CORBA_TypeCode_ptr tc,
-                                                CORBA::Environment &ACE_TRY_ENV =
-                                                  TAO_default_environment ());
-  static CORBA_DynStruct_ptr create_dyn_struct (CORBA_TypeCode_ptr tc,
-                                                CORBA::Environment &ACE_TRY_ENV =
-                                                  TAO_default_environment ());
-  static CORBA_DynSequence_ptr create_dyn_sequence (CORBA_TypeCode_ptr tc,
-                                                    CORBA::Environment &ACE_TRY_ENV =
-                                                      TAO_default_environment ());
-  static CORBA_DynArray_ptr create_dyn_array (CORBA_TypeCode_ptr tc,
-                                              CORBA::Environment &ACE_TRY_ENV =
-                                                TAO_default_environment ());
-  static CORBA_DynUnion_ptr create_dyn_union (CORBA_TypeCode_ptr tc,
-                                              CORBA::Environment &ACE_TRY_ENV =
-                                                TAO_default_environment ());
-  static CORBA_DynEnum_ptr create_dyn_enum (CORBA_TypeCode_ptr tc,
-                                            CORBA::Environment &ACE_TRY_ENV =
-                                              TAO_default_environment ());
-
-  static CORBA_DynAny_ptr create_dyn_any (CORBA_TypeCode_ptr tc,
-                                          CORBA::Environment &ACE_TRY_ENV =
-                                            TAO_default_environment ());
-  // And an extra generic one (not required in the spec) that calls
-  // one of the above passing a typecode.  Comes in handy in
-  // implementing some versions of current_component().
-
-  static CORBA::TCKind unalias (CORBA_TypeCode_ptr tc,
-                                CORBA::Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ());
-  // Utility, in case we have tk_alias.
-
-private:
-  CORBA_Any value_;
-  // contents
-
-  TAO_DynAny_i (void);
-  // Must be instantiated with at least a typecode
-
-  // Use copy() or assign() instead of these
-  TAO_DynAny_i (const TAO_DynAny_i &src);
-  TAO_DynAny_i &operator= (const TAO_DynAny_i &src);
-};
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#endif /* TAO_DYNANY_I_H */
diff --git a/TAO/tao/DynArray_i.cpp b/TAO/tao/DynArray_i.cpp
deleted file mode 100644
index a4b7e130d56..00000000000
--- a/TAO/tao/DynArray_i.cpp
+++ /dev/null
@@ -1,1483 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ====================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    DynArray_i.cpp
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ====================================================================
-
-#include "tao/DynAny_i.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#include "tao/DynArray_i.h"
-#include "tao/InconsistentTypeCodeC.h"
-
-// Constructors and destructor
-
-TAO_DynArray_i::TAO_DynArray_i (const CORBA_Any& any)
-  : type_ (any.type ()),
-    current_index_ (0),
-    da_members_ (0)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      CORBA::TypeCode_ptr tc = this->type_.in ();
-
-      // The type will be correct if this constructor called from a
-      // factory function, but it could also be called by the user,
-      // so.....
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (kind == CORBA::tk_array)
-        {
-          CORBA::ULong numfields = this->get_arg_length (any.type (),
-                                                         ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          // Resize the array.
-          this->da_members_.size (numfields);
-
-          // Get the CDR stream of the argument.
-          ACE_Message_Block* mb = any._tao_get_cdr ();
-
-          TAO_InputCDR cdr (mb);
-
-          CORBA::TypeCode_ptr field_tc =
-            this->get_element_type (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          for (CORBA::ULong i = 0; i < numfields; i++)
-            {
-              // This Any constructor is a TAO extension.
-              CORBA_Any field_any (field_tc,
-                                   0,
-                                   cdr.start ());
-
-              // This recursive step will call the correct constructor
-              // based on the type of field_any.
-              this->da_members_[i] =
-                TAO_DynAny_i::create_dyn_any (field_any,
-                                              ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-
-              // Move to the next field in the CDR stream.
-              cdr.skip (field_tc);
-            }
-        }
-      else
-        {
-          ACE_THROW (CORBA_ORB_InconsistentTypeCode ());
-        }
-    }
-  ACE_CATCHANY
-    {
-      // do nothing...
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-TAO_DynArray_i::TAO_DynArray_i (CORBA_TypeCode_ptr tc)
-  : type_ (CORBA::TypeCode::_duplicate (tc)),
-    current_index_ (0),
-    da_members_ (0)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Need to check if called by user.
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (kind == CORBA::tk_array)
-        {
-          CORBA::ULong numfields = this->get_arg_length (tc,
-                                                         ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          // Resize the array.
-          this->da_members_.size (numfields);
-
-          for (CORBA::ULong i = 0; i < numfields; i++)
-            // With a typecode arg, we just create the top level.
-            this->da_members_[i] = 0;
-        }
-      else
-        ACE_THROW (CORBA_ORB_InconsistentTypeCode ());
-    }
-  ACE_CATCHANY
-    {
-      // do nothing...
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-TAO_DynArray_i::~TAO_DynArray_i (void)
-{
-}
-
-// Functions specific to DynArray
-
-CORBA_AnySeq_ptr
-TAO_DynArray_i::get_elements (CORBA::Environment& ACE_TRY_ENV)
-{
-  CORBA::ULong length = this->da_members_.size ();
-
-  if (length == 0)
-    return 0;
-
-  // Arg only sets maximum, so...
-  CORBA_AnySeq_ptr elements;
-
-  ACE_NEW_THROW_EX (elements,
-                    CORBA_AnySeq (length),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  // ...we must do this explicitly.
-  elements->length (length);
-
-  // Initialize each Any.
-  for (CORBA::ULong i = 0; i < length; i++)
-    {
-      CORBA::Any_var temp = this->da_members_[i]->to_any (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      (*elements)[i] = temp.in ();
-    }
-
-  return elements;
-}
-
-void
-TAO_DynArray_i::set_elements (const CORBA_AnySeq& value,
-                              CORBA::Environment& ACE_TRY_ENV)
-{
-  CORBA::ULong length = value.length ();
-  CORBA::ULong size = this->da_members_.size ();
-
-  if (size != length)
-    {
-      ACE_THROW (CORBA_DynAny::InvalidSeq ());
-    }
-
-  CORBA::TypeCode_ptr element_type =
-    this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  for (CORBA::ULong i = 0; i < length; i++)
-    {
-      // Check each arg element for type match.
-      CORBA::Boolean equal = value[i].type ()->equal (element_type,
-                                                      ACE_TRY_ENV);
-      ACE_CHECK;
-
-      if (equal)
-        {
-          if (!CORBA::is_nil (this->da_members_[i].in ()))
-            {
-              this->da_members_[i]->destroy (ACE_TRY_ENV);
-              ACE_CHECK;
-            }
-
-          this->da_members_[i] =
-            TAO_DynAny_i::create_dyn_any (value[i],
-                                          ACE_TRY_ENV);
-          ACE_CHECK;
-        }
-      else
-        {
-          ACE_THROW (CORBA_DynAny::InvalidSeq ());
-        }
-    }
-}
-
-// Common functions
-
-void
-TAO_DynArray_i::assign (CORBA_DynAny_ptr dyn_any,
-                        CORBA::Environment &ACE_TRY_ENV)
-{
-  // *dyn_any->to_any raises Invalid if arg is bad.
-  CORBA_TypeCode_ptr tc = dyn_any->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::Boolean equal = this->type_.in ()->equal (tc,
-                                                   ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (equal)
-    {
-      CORBA_Any any = *dyn_any->to_any (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->from_any (any,
-                      ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::Invalid ());
-    }
-}
-
-CORBA_DynAny_ptr
-TAO_DynArray_i::copy (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_Any_ptr any = this->to_any (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-  CORBA_DynAny_ptr retval = TAO_DynAny_i::create_dyn_any (*any,
-                                                          ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-  return retval;
-}
-
-void
-TAO_DynArray_i::destroy (CORBA::Environment &ACE_TRY_ENV)
-{
-  // Do a deep destroy
-  for (CORBA::ULong i = 0;
-       i < this->da_members_.size ();
-       i++)
-    if (!CORBA::is_nil (this->da_members_[i].in ()))
-      {
-        this->da_members_[i]->destroy (ACE_TRY_ENV);
-        ACE_CHECK;
-      }
-
-  // Free the top level
-  delete this;
-}
-
-void
-TAO_DynArray_i::from_any (const CORBA_Any& any,
-                          CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Boolean equal = this->type_.in ()->equal (any.type (),
-                                                   ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (equal)
-    {
-      // Get the CDR stream of the argument.
-      ACE_Message_Block* mb = any._tao_get_cdr ();
-      TAO_InputCDR cdr (mb);
-
-      CORBA::ULong length = this->da_members_.size ();
-      CORBA::ULong arg_length = this->get_arg_length (any.type (),
-                                                      ACE_TRY_ENV);
-      ACE_CHECK;
-
-      if (length != arg_length)
-        {
-          ACE_THROW (CORBA_DynAny::Invalid ());
-        }
-
-      CORBA::TypeCode_ptr field_tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      for (CORBA::ULong i = 0; i < arg_length; i++)
-        {
-          // This Any constructor is a TAO extension.
-          CORBA_Any field_any (field_tc,
-                               0,
-                               cdr.start ());
-
-          if (!CORBA::is_nil (this->da_members_[i].in ()))
-            {
-              this->da_members_[i]->destroy (ACE_TRY_ENV);
-              ACE_CHECK;
-            }
-
-          this->da_members_[i] =
-            TAO_DynAny_i::create_dyn_any (field_any,
-                                          ACE_TRY_ENV);
-          ACE_CHECK;
-
-          // Move to the next field in the CDR stream.
-          cdr.skip (field_tc);
-        }
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::Invalid ());
-    }
-}
-
-CORBA::Any_ptr
-TAO_DynArray_i::to_any (CORBA::Environment& ACE_TRY_ENV)
-{
-  TAO_OutputCDR out_cdr;
-
-  CORBA_TypeCode_ptr field_tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  for (CORBA::ULong i = 0;
-       i < this->da_members_.size ();
-       i++)
-    {
-      // Each component must have been initialized.
-      if (!this->da_members_[i].in ())
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 0);
-        }
-
-      // Recursive step
-      CORBA_Any_var field_any =
-        this->da_members_[i]->to_any (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      ACE_Message_Block* field_mb = field_any->_tao_get_cdr ();
-
-      TAO_InputCDR field_cdr (field_mb);
-
-      out_cdr.append (field_tc,
-                      &field_cdr,
-                      ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-    }
-
-  TAO_InputCDR in_cdr (out_cdr);
-
-  CORBA_Any *retval;
-
-  CORBA_TypeCode_ptr my_tc = this->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  ACE_NEW_THROW_EX (retval,
-                    CORBA_Any (my_tc,
-                               0,
-                               in_cdr.start ()),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  return retval;
-}
-
-CORBA::TypeCode_ptr
-TAO_DynArray_i::type (CORBA::Environment &)
-{
-  return this->type_.in ();
-}
-
-// If the DynAny has been initialized but this component has not, the
-// first call to current_component will create the pointer and return
-// it.
-
-CORBA_DynAny_ptr
-TAO_DynArray_i::current_component (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (this->da_members_.size () == 0)
-    return 0;
-
-  if (!this->da_members_[this->current_index_].in ())
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-      this->da_members_[this->current_index_] =
-        TAO_DynAny_i::create_dyn_any (tc,
-                                      ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-    }
-
-  return this->da_members_[this->current_index_].in ();
-}
-
-CORBA::Boolean
-TAO_DynArray_i::next (CORBA::Environment &)
-{
-  CORBA::Long size = (CORBA::Long) this->da_members_.size ();
-
-  if (size == 0 || this->current_index_ + 1 == size)
-    return 0;
-
-  ++this->current_index_;
-  return 1;
-}
-
-CORBA::Boolean
-TAO_DynArray_i::seek (CORBA::Long slot,
-                      CORBA::Environment &)
-{
-  if (slot < 0 || slot >= (CORBA::Long) this->da_members_.size ())
-    {
-      return 0;
-    }
-
-  this->current_index_ = slot;
-  return 1;
-}
-
-void
-TAO_DynArray_i::rewind (CORBA::Environment &)
-{
-  this->current_index_ = 0;
-}
-
-// The insert-primitive and get-primitive functions are required by
-// the spec of all types of DynAny, although if the top level members
-// aren't primitive types, these functions aren't too helpful.  Also,
-// while not mentioned in the spec, the example code seems to indicate
-// that next() is called in the body of each of these, and it has been
-// so implemented here.
-
-// Insert functions
-
-void
-TAO_DynArray_i::insert_boolean (CORBA::Boolean value,
-                                CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr type = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = type->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_boolean)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_boolean (value,
-                          ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynArray_i::insert_octet (CORBA::Octet value,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr type = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = type->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_octet)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_octet (value,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynArray_i::insert_char (CORBA::Char value,
-                             CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr type = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = type->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_char)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_char (value,
-                       ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynArray_i::insert_short (CORBA::Short value,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr type = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = type->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_short)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_short (value,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynArray_i::insert_ushort (CORBA::UShort value,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr type = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = type->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_ushort)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_ushort (value,
-                         ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynArray_i::insert_long (CORBA::Long value,
-                             CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr type = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = type->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_long)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_long (value,
-                       ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynArray_i::insert_ulong (CORBA::ULong value,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr type = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = type->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_ulong)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_ulong (value,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynArray_i::insert_float (CORBA::Float value,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr type = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = type->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_float)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_float (value,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynArray_i::insert_double (CORBA::Double value,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr type = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = type->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_double)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_double (value,
-                         ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynArray_i::insert_string (const char * value,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr type = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = type->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_string)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_string (value,
-                         ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynArray_i::insert_reference (CORBA::Object_ptr value,
-                                  CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr type = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = type->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_objref)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_reference (value,
-                            ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynArray_i::insert_typecode (CORBA::TypeCode_ptr value,
-                                 CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr type = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = type->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_TypeCode)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_typecode (value,
-                           ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynArray_i::insert_longlong (CORBA::LongLong value,
-                                 CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr type = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = type->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_longlong)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_longlong (value,
-                           ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynArray_i::insert_ulonglong (CORBA::ULongLong value,
-                                  CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr type = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = type->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_ulonglong)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_ulonglong (value,
-                            ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynArray_i::insert_wchar (CORBA::WChar value,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr type = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = type->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_wchar)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_wchar (value,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynArray_i::insert_any (const CORBA::Any& value,
-                            CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr type = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = type->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_any)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_any (value,
-                      ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-// Get functions
-
-// If the current component has not been intialized, these
-// raise Invalid, which is not required by the spec, but which
-// seems like a courteous thing to do.
-
-CORBA::Boolean
-TAO_DynArray_i::get_boolean (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Boolean val = 0;
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_boolean)
-        {
-          val = dp->get_boolean (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                          val);
-    }
-  else
-    ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                      val);
-
-  return val;
-}
-
-CORBA::Octet
-TAO_DynArray_i::get_octet (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Octet val = 0;
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_octet)
-        {
-          val = dp->get_octet (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                          val);
-    }
-  else
-    ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                      val);
-
-  return val;
-}
-
-CORBA::Char
-TAO_DynArray_i::get_char (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Char val = 0;
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_char)
-        {
-          val = dp->get_char (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                          val);
-    }
-  else
-    ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                      val);
-
-  return val;
-}
-
-CORBA::Short
-TAO_DynArray_i::get_short (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Short val = 0;
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_short)
-        {
-          val = dp->get_short (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                          val);
-    }
-  else
-    ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                      val);
-
-  return val;
-}
-
-CORBA::UShort
-TAO_DynArray_i::get_ushort (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::UShort val = 0;
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_ushort)
-        {
-          val = dp->get_ushort (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                          val);
-    }
-  else
-    ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                      val);
-
-  return val;
-}
-
-CORBA::Long
-TAO_DynArray_i::get_long (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Long val = 0;
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_long)
-        {
-          val = dp->get_long (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                          val);
-    }
-  else
-    ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                      val);
-
-  return val;
-}
-
-CORBA::ULong
-TAO_DynArray_i::get_ulong (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::ULong val = 0;
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_ulong)
-        {
-          val = dp->get_ulong (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                          val);
-    }
-  else
-    ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                      val);
-
-  return val;
-}
-
-CORBA::Float
-TAO_DynArray_i::get_float (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Float val = 0;
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_float)
-        {
-          val = dp->get_float (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                          val);
-    }
-  else
-    ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                      val);
-
-  return val;
-}
-
-CORBA::Double
-TAO_DynArray_i::get_double (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Double val = 0;
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_double)
-        {
-          val = dp->get_double (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                          val);
-    }
-  else
-    ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                      val);
-
-  return val;
-}
-
-char *
-TAO_DynArray_i::get_string (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Char *val = 0;
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_string)
-        {
-          val = dp->get_string (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                          val);
-    }
-  else
-    ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                      val);
-
-  return val;
-}
-
-CORBA::Object_ptr
-TAO_DynArray_i::get_reference (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_Object_ptr val = 0;
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_objref)
-        {
-          val = dp->get_reference (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                          val);
-    }
-  else
-    ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                      val);
-
-  return val;
-}
-
-CORBA::TypeCode_ptr
-TAO_DynArray_i::get_typecode (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr val = 0;
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_TypeCode)
-        {
-          val = dp->get_typecode (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                          val);
-    }
-  else
-    ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                      val);
-
-  return val;
-}
-
-CORBA::LongLong
-TAO_DynArray_i::get_longlong (CORBA::Environment &ACE_TRY_ENV)
-{
-#if defined (ACE_LACKS_LONGLONG_T)
-  CORBA::LongLong val = {0, 0};
-#else  /* ! ACE_LACKS_LONGLONG_T */
-  CORBA::LongLong val = 0;
-#endif /* ! ACE_LACKS_LONGLONG_T */
-
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_longlong)
-        {
-          val = dp->get_longlong (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                          val);
-    }
-  else
-    ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                      val);
-
-  return val;
-}
-
-CORBA::ULongLong
-TAO_DynArray_i::get_ulonglong (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::ULongLong val = 0;
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_ulonglong)
-        {
-          val = dp->get_ulonglong (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                          val);
-    }
-  else
-    ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                      val);
-
-  return val;
-}
-
-CORBA::WChar
-TAO_DynArray_i::get_wchar (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::WChar val = 0;
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_wchar)
-        {
-          val = dp->get_wchar (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                          val);
-    }
-  else
-    ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                      val);
-
-  return val;
-}
-
-CORBA::Any_ptr
-TAO_DynArray_i::get_any (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_Any_ptr val = 0;
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_any)
-        {
-          val = dp->get_any (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                          val);
-    }
-  else
-    ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                      val);
-
-  return val;
-}
-
-// Private utility function.
-
-CORBA::TypeCode_ptr
-TAO_DynArray_i::get_element_type (CORBA::Environment& ACE_TRY_ENV)
-{
-  CORBA::TypeCode_ptr element_type = this->type_.in ();
-
-  // Strip away aliases (if any) on top of the outer type
-  CORBA::TCKind kind = element_type->kind (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
-
-  while (kind != CORBA::tk_array)
-    {
-      element_type = element_type->content_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
-
-      kind = element_type->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
-    }
-
-  // Return the content type.
-  CORBA_TypeCode_ptr retval = element_type->content_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
-
-  return retval;
-}
-
-// Get the argument length from the (aliased) typecode.
-CORBA::ULong
-TAO_DynArray_i::get_arg_length (CORBA::TypeCode_ptr tc,
-                                CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  while (kind == CORBA::tk_alias)
-    {
-      tc = tc->content_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-    }
-
-  CORBA::ULong retval = tc->length (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return retval;
-}
-
-// **********************************************************
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Array_Base<CORBA_DynAny_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Array_Base<CORBA_DynAny_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/DynArray_i.h b/TAO/tao/DynArray_i.h
deleted file mode 100644
index cff78c0119d..00000000000
--- a/TAO/tao/DynArray_i.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ===================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    DynArray_i.h
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ===================================================================
-
-#ifndef TAO_DYNARRAY_I_H
-#define TAO_DYNARRAY_I_H
-
-#include "tao/orbconf.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#include "ace/Containers.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_Export TAO_DynArray_i : public POA_CORBA::DynArray
-{
-  // = TITLE
-  //    TAO_DynArray_i
-  //
-  // = DESCRIPTION
-  //    Implementation of Dynamic Any type for arrays
-  //
-public:
-  TAO_DynArray_i      (const CORBA_Any& any);
-  // constructor taking an Any argument
-
-  TAO_DynArray_i (CORBA_TypeCode_ptr tc);
-  // constructor taking a typecode argument
-
-  ~TAO_DynArray_i (void);
-  // destructor
-
-  // = Functions specific to DynArray
-
-  CORBA_AnySeq_ptr get_elements (CORBA::Environment &ACE_TRY_ENV =
-                                   TAO_default_environment ());
-  // Assign/dump elements using IDL defined type AnySeq
-
-  void set_elements (const CORBA_AnySeq& value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-
-  // = Functions common to all Dynamic Any types
-
-  void assign (CORBA_DynAny_ptr dyn_any,
-               CORBA::Environment &ACE_TRY_ENV =
-                 TAO_default_environment ());
-  // Sets the value of the receiver to the value of the argument.
-
-  CORBA_DynAny_ptr copy (CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
-  // Creates a copy
-
-  void destroy (CORBA::Environment &ACE_TRY_ENV =
-                  TAO_default_environment ());
-  // Makes sure the contents are disposed of correctly
-
-  void from_any (const CORBA::Any& any,
-                 CORBA::Environment &ACE_TRY_ENV =
-                   TAO_default_environment ());
-  // Assigns value from an Any argument
-
-  CORBA::Any_ptr to_any (CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
-  // Outputs contents as an Any
-
-  CORBA::TypeCode_ptr type (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  // Returns the (constant) type
-
-  CORBA_DynAny_ptr current_component (CORBA::Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ());
-  // Used in iterating through the contents.
-
-  CORBA::Boolean next (CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
-  // Returns next component
-
-  CORBA::Boolean seek (CORBA::Long slot,
-                       CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
-  // Jump to component at <slot>
-
-  void rewind (CORBA::Environment &ACE_TRY_ENV =
-                 TAO_default_environment ());
-  // Makes first component the current one
-
-  // Insert and get functions
-
-  void insert_boolean (CORBA::Boolean value,
-                       CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
-  void insert_octet (CORBA::Octet value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-  void insert_char (CORBA::Char value,
-                    CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
-  void insert_short (CORBA::Short value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-  void insert_ushort (CORBA::UShort value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
-  void insert_long (CORBA::Long value,
-                    CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
-  void insert_ulong (CORBA::ULong value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-  void insert_float (CORBA::Float value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-  void insert_double (CORBA::Double value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
-  void insert_string (const char * value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
-  void insert_reference (CORBA::Object_ptr value,
-                         CORBA::Environment &ACE_TRY_ENV =
-                                   TAO_default_environment ());
-  void insert_typecode (CORBA::TypeCode_ptr value,
-                        CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  void insert_longlong (CORBA::LongLong value,
-                        CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  void insert_ulonglong (CORBA::ULongLong value,
-                         CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
-  void insert_wchar (CORBA::WChar value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
-  void insert_any (const CORBA::Any& value,
-                   CORBA::Environment &ACE_TRY_ENV =
-                     TAO_default_environment ());
-  CORBA::Boolean get_boolean (CORBA::Environment &ACE_TRY_ENV =
-                                TAO_default_environment ());
-  CORBA::Octet get_octet (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Char get_char (CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  CORBA::Short get_short (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::UShort get_ushort (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  CORBA::Long get_long (CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  CORBA::ULong get_ulong (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Float get_float (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Double get_double (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  char *get_string (CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
-  CORBA::Object_ptr get_reference (CORBA::Environment &ACE_TRY_ENV =
-                                     TAO_default_environment ());
-  CORBA::TypeCode_ptr get_typecode (CORBA::Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ());
-  CORBA::LongLong get_longlong (CORBA::Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ());
-  CORBA::ULongLong get_ulonglong (CORBA::Environment &ACE_TRY_ENV =
-                                    TAO_default_environment ());
-  CORBA::WChar get_wchar (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Any_ptr get_any (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-
-private:
-  CORBA::TypeCode_ptr get_element_type (CORBA::Environment &ACE_TRY_ENV =
-                                          TAO_default_environment ());
-  // Returns the type of elements contained in the array.
-
-  CORBA::ULong get_arg_length (CORBA::TypeCode_ptr tc,
-                               CORBA::Environment &ACE_TRY_ENV =
-                                 TAO_default_environment ());
-  // Gets the length of the array from the typecode
-
-  CORBA::TypeCode_var type_;
-  // Holds the typecode of the array
-
-  CORBA::Long current_index_;
-  // Slot of the current component
-
-  ACE_Array_Base<CORBA_DynAny_var> da_members_;
-  // Each component is also a DynAny
-
-  TAO_DynArray_i (void);
-  // Must be instantiated with at least a typecode
-
-  // Use copy() or assign() instead of these
-  TAO_DynArray_i (const TAO_DynArray_i &src);
-  TAO_DynArray_i &operator= (const TAO_DynArray_i &src);
-};
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#endif /* TAO_DYNARRAY_I_H */
diff --git a/TAO/tao/DynEnum_i.cpp b/TAO/tao/DynEnum_i.cpp
deleted file mode 100644
index 03d0a619172..00000000000
--- a/TAO/tao/DynEnum_i.cpp
+++ /dev/null
@@ -1,504 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ===================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    DynEnum_i.cpp
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ===================================================================
-
-#include "tao/DynAny_i.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#include "tao/DynEnum_i.h"
-#include "tao/InconsistentTypeCodeC.h"
-
-// Constructors and destructor
-
-TAO_DynEnum_i::TAO_DynEnum_i (const CORBA_Any &any)
-  : type_ (any.type ()),
-    value_ (0)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // The type will be correct if this constructor called from a
-      // factory function, but it could also be called by the user,
-      // so.....
-      int tk =
-        TAO_DynAny_i::unalias (this->type_.in (),
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (tk == CORBA::tk_enum)
-        {
-          // Get the CDR stream of the argument.
-          ACE_Message_Block* mb = any._tao_get_cdr ();
-
-          TAO_InputCDR cdr (mb);
-
-          cdr.read_ulong (this->value_);
-        }
-      else
-        {
-          ACE_THROW (CORBA_ORB_InconsistentTypeCode ());
-        }
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-TAO_DynEnum_i::TAO_DynEnum_i (CORBA_TypeCode_ptr tc)
-  : type_ (CORBA::TypeCode::_duplicate (tc)),
-    value_ (0)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Need to check if called by user.
-      int tk = TAO_DynAny_i::unalias (tc,
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      if (tk != CORBA::tk_enum)
-        ACE_THROW (CORBA_ORB_InconsistentTypeCode ());
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-TAO_DynEnum_i::~TAO_DynEnum_i (void)
-{
-}
-
-// Functions specific to DynEnum
-
-char *
-TAO_DynEnum_i::value_as_string (CORBA::Environment& ACE_TRY_ENV)
-{
-  const char *retval = this->type_.in ()->member_name (this->value_,
-                                                       ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return CORBA::string_dup (retval);
-}
-
-void
-TAO_DynEnum_i::value_as_string (const char *value_as_string,
-                                CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::ULong count = this->type_.in ()->member_count (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::ULong i;
-
-  for (i = 0; i < count; i++)
-    {
-      const char *temp = this->type_.in ()->member_name (i,
-                                                         ACE_TRY_ENV);
-      ACE_CHECK;
-
-      if (!ACE_OS::strcmp (value_as_string,
-                           temp))
-        {
-          break;
-        }
-    }
-
-  if (i < count)
-    {
-      this->value_ = i;
-    }
-  else
-    {
-      // *** NOT part of CORBA spec ***
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-CORBA::ULong
-TAO_DynEnum_i::value_as_ulong (CORBA::Environment &)
-{
-  return this->value_;
-}
-
-void
-TAO_DynEnum_i::value_as_ulong (CORBA::ULong value_as_ulong,
-                               CORBA::Environment& ACE_TRY_ENV)
-{
-  CORBA::ULong max = this->type_.in ()->member_count (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (value_as_ulong < max)
-    {
-      this->value_ = value_as_ulong;
-    }
-  else
-    {
-      // *** NOT part of CORBA spec ***
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-// Common functions
-
-void
-TAO_DynEnum_i::assign (CORBA_DynAny_ptr dyn_any,
-                       CORBA::Environment &ACE_TRY_ENV)
-{
-  // *dyn_any->to_any raises Invalid if arg is bad.
-  CORBA_TypeCode_ptr tc = dyn_any->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::Boolean equal = this->type_.in ()->equal (tc,
-                                                   ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (equal)
-    {
-      CORBA_Any_ptr any_ptr = dyn_any->to_any (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->from_any (*any_ptr,
-                      ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::Invalid ());
-    }
-}
-
-CORBA_DynAny_ptr
-TAO_DynEnum_i::copy (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_Any_ptr a = this->to_any (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-  CORBA_DynAny_ptr dp = TAO_DynAny_i::create_dyn_any (*a,
-                                                      ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-  return dp;
-}
-
-void
-TAO_DynEnum_i::destroy (CORBA::Environment &)
-{
-  // Freeing the top level is all we have to do.
-  delete this;
-}
-
-void
-TAO_DynEnum_i::from_any (const CORBA_Any& any,
-                         CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (any.type (),
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_enum)
-    {
-      // Get the CDR stream of the argument.
-      ACE_Message_Block* mb = any._tao_get_cdr ();
-
-      TAO_InputCDR cdr (mb);
-
-      cdr.read_ulong (this->value_);
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::Invalid ());
-    }
-}
-
-CORBA::Any_ptr
-TAO_DynEnum_i::to_any (CORBA::Environment& ACE_TRY_ENV)
-{
-  TAO_OutputCDR out_cdr;
-
-  out_cdr.write_ulong (this->value_);
-
-  CORBA_Any *retval;
-  ACE_NEW_THROW_EX (retval,
-                    CORBA_Any (this->type_.in (),
-                               0,
-                               out_cdr.begin ()),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-  return retval;
-}
-
-CORBA::TypeCode_ptr
-TAO_DynEnum_i::type (CORBA::Environment &)
-{
-  return this->type_.in ();
-}
-
-CORBA_DynAny_ptr
-TAO_DynEnum_i::current_component (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_DynAny_ptr retval = this->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-  return retval;
-}
-
-CORBA::Boolean
-TAO_DynEnum_i::next (CORBA::Environment &)
-{
-  return 0;
-}
-
-CORBA::Boolean
-TAO_DynEnum_i::seek (CORBA::Long slot,
-                     CORBA::Environment &)
-{
-  if (slot == 0)
-    return 1;
-  else
-    return 0;
-}
-
-// Nothing to do here.
-void
-TAO_DynEnum_i::rewind (CORBA::Environment &)
-{
-}
-
-// Insert and get functions
-//
-// These have no meaning for the enum type, but someone could
-// try to call one, so they are implemented here to throw an
-// enlightening exception.
-
-void
-TAO_DynEnum_i::insert_boolean (CORBA::Boolean,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::BAD_OPERATION ());
-}
-
-void
-TAO_DynEnum_i::insert_octet (CORBA::Octet,
-                             CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::BAD_OPERATION ());
-}
-
-void
-TAO_DynEnum_i::insert_char (CORBA::Char,
-                            CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::BAD_OPERATION ());
-}
-
-void
-TAO_DynEnum_i::insert_short (CORBA::Short,
-                             CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::BAD_OPERATION ());
-}
-
-void
-TAO_DynEnum_i::insert_ushort (CORBA::UShort,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::BAD_OPERATION ());
-}
-
-void
-TAO_DynEnum_i::insert_long (CORBA::Long,
-                            CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::BAD_OPERATION ());
-}
-
-void
-TAO_DynEnum_i::insert_ulong (CORBA::ULong,
-                             CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::BAD_OPERATION ());
-}
-
-void
-TAO_DynEnum_i::insert_float (CORBA::Float,
-                             CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::BAD_OPERATION ());
-}
-
-void
-TAO_DynEnum_i::insert_double (CORBA::Double,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::BAD_OPERATION ());
-}
-
-void
-TAO_DynEnum_i::insert_string (const char *,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::BAD_OPERATION ());
-}
-
-void
-TAO_DynEnum_i::insert_reference (CORBA::Object_ptr,
-                                 CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::BAD_OPERATION ());
-}
-
-void
-TAO_DynEnum_i::insert_typecode (CORBA::TypeCode_ptr,
-                                CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::BAD_OPERATION ());
-}
-
-void
-TAO_DynEnum_i::insert_longlong (CORBA::LongLong,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::BAD_OPERATION ());
-}
-
-void
-TAO_DynEnum_i::insert_ulonglong (CORBA::ULongLong,
-                                 CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::BAD_OPERATION ());
-}
-
-void
-TAO_DynEnum_i::insert_wchar (CORBA::WChar,
-                             CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::BAD_OPERATION ());
-}
-
-void
-TAO_DynEnum_i::insert_any (const CORBA::Any&,
-                           CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::BAD_OPERATION ());
-}
-
-CORBA::Boolean
-TAO_DynEnum_i::get_boolean (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW_RETURN (CORBA::BAD_OPERATION (), 0);
-}
-
-CORBA::Octet
-TAO_DynEnum_i::get_octet (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW_RETURN (CORBA::BAD_OPERATION (), 0);
-}
-
-CORBA::Char
-TAO_DynEnum_i::get_char (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW_RETURN (CORBA::BAD_OPERATION (), 0);
-}
-
-CORBA::Short
-TAO_DynEnum_i::get_short (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW_RETURN (CORBA::BAD_OPERATION (), 0);
-}
-
-CORBA::UShort
-TAO_DynEnum_i::get_ushort (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW_RETURN (CORBA::BAD_OPERATION (), 0);
-}
-
-CORBA::Long
-TAO_DynEnum_i::get_long (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW_RETURN (CORBA::BAD_OPERATION (), 0);
-}
-
-CORBA::ULong
-TAO_DynEnum_i::get_ulong (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW_RETURN (CORBA::BAD_OPERATION (), 0);
-}
-
-CORBA::Float
-TAO_DynEnum_i::get_float (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW_RETURN (CORBA::BAD_OPERATION (), 0);
-}
-
-CORBA::Double
-TAO_DynEnum_i::get_double (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW_RETURN (CORBA::BAD_OPERATION (), 0);
-}
-
-char *
-TAO_DynEnum_i::get_string (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW_RETURN (CORBA::BAD_OPERATION (), 0);
-}
-
-CORBA::Object_ptr
-TAO_DynEnum_i::get_reference (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW_RETURN (CORBA::BAD_OPERATION (), 0);
-}
-
-CORBA::TypeCode_ptr
-TAO_DynEnum_i::get_typecode (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW_RETURN (CORBA::BAD_OPERATION (), 0);
-}
-
-CORBA::LongLong
-TAO_DynEnum_i::get_longlong (CORBA::Environment &ACE_TRY_ENV)
-{
-#if defined (ACE_LACKS_LONGLONG_T)
-  CORBA::LongLong val = {0, 0};
-#else  /* ! ACE_LACKS_LONGLONG_T */
-  CORBA::LongLong val = 0;
-#endif /* ! ACE_LACKS_LONGLONG_T */
-
-  ACE_UNUSED_ARG (val);
-  ACE_THROW_RETURN (CORBA::BAD_OPERATION (), val;);
-}
-
-CORBA::ULongLong
-TAO_DynEnum_i::get_ulonglong (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW_RETURN (CORBA::BAD_OPERATION (), 0);
-}
-
-CORBA::WChar
-TAO_DynEnum_i::get_wchar (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW_RETURN (CORBA::BAD_OPERATION (), 0);
-}
-
-CORBA::Any_ptr
-TAO_DynEnum_i::get_any (CORBA::Environment& ACE_TRY_ENV)
-{
-  ACE_THROW_RETURN (CORBA::BAD_OPERATION (), 0);
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/DynEnum_i.h b/TAO/tao/DynEnum_i.h
deleted file mode 100644
index 241b248edd1..00000000000
--- a/TAO/tao/DynEnum_i.h
+++ /dev/null
@@ -1,212 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// =======================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    DynEnum_i.h
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ========================================================================
-
-#ifndef TAO_DYNENUM_I_H
-#define TAO_DYNENUM_I_H
-
-#include "tao/orbconf.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#include "ace/Containers.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_Export TAO_DynEnum_i : public POA_CORBA::DynEnum
-{
-  // = TITLE
-  //    TAO_DynEnum_i
-  //
-  // = DESCRIPTION
-  //    Implementation of Dynamic Any type for enums
-  //
-public:
-  TAO_DynEnum_i (const CORBA_Any& any);
-  // constructor taking an Any argument
-
-  TAO_DynEnum_i (CORBA_TypeCode_ptr tc);
-  // constructor taking a typecode argument
-
-  ~TAO_DynEnum_i (void);
-  // destructor
-
-  // = Functions specific to DynEnum
-
-  char *value_as_string (CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
-  // Get method for enum's string and numeric value.
-
-  void value_as_string (const char *value_as_string,
-                        CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  // Set method for enum's string and numeric value.
-
-  CORBA::ULong value_as_ulong (CORBA::Environment&);
-
-  void value_as_ulong (CORBA::ULong value_as_ulong,
-                       CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
-  // Functions common to all Dynamic Any types
-
-  void assign (CORBA_DynAny_ptr dyn_any,
-               CORBA::Environment &ACE_TRY_ENV =
-                 TAO_default_environment ());
-  // Sets the value of the receiver to the value of the argument.
-
-  CORBA_DynAny_ptr copy (CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
-  // Creates a copy.
-
-  void destroy (CORBA::Environment &ACE_TRY_ENV =
-                  TAO_default_environment ());
-  // Makes sure the contents are disposed of correctly.
-
-  void from_any (const CORBA::Any& any,
-                 CORBA::Environment &ACE_TRY_ENV =
-                   TAO_default_environment ());
-  // Assigns value from an Any argument.
-
-  CORBA::Any_ptr to_any (CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
-  // Outputs contents as an Any.
-
-  CORBA::TypeCode_ptr type (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  // Returns the (constant) type.
-
-  CORBA_DynAny_ptr current_component (CORBA::Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ());
-  // Used in iterating through the contents.
-
-  CORBA::Boolean next (CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
-  // Returns next component.
-
-  CORBA::Boolean seek (CORBA::Long slot,
-                       CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
-  // Jump to component at <slot>.
-
-  void rewind (CORBA::Environment &ACE_TRY_ENV =
-                 TAO_default_environment ());
-  // Makes first component the current one.
-
-  // = Insert and get functions
-
-  // In DynEnum, these have no pertinence, so since spec requires
-  // their presence, they will just throw an exception
-
-  void insert_boolean (CORBA::Boolean value,
-                       CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
-  void insert_octet (CORBA::Octet value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-  void insert_char (CORBA::Char value,
-                    CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
-  void insert_short (CORBA::Short value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-  void insert_ushort (CORBA::UShort value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
-  void insert_long (CORBA::Long value,
-                    CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
-  void insert_ulong (CORBA::ULong value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-  void insert_float (CORBA::Float value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-  void insert_double (CORBA::Double value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
-  void insert_string (const char * value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
-  void insert_reference (CORBA::Object_ptr value,
-                         CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
-  void insert_typecode (CORBA::TypeCode_ptr value,
-                        CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  void insert_longlong (CORBA::LongLong value,
-                        CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  void insert_ulonglong (CORBA::ULongLong value,
-                         CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
-  void insert_wchar (CORBA::WChar value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
-  void insert_any (const CORBA::Any& value,
-                   CORBA::Environment &ACE_TRY_ENV =
-                     TAO_default_environment ());
-  CORBA::Boolean get_boolean (CORBA::Environment &ACE_TRY_ENV =
-                                TAO_default_environment ());
-  CORBA::Octet get_octet (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Char get_char (CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  CORBA::Short get_short (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::UShort get_ushort (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  CORBA::Long get_long (CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  CORBA::ULong get_ulong (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Float get_float (CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
-  CORBA::Double get_double (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  char *get_string (CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
-  CORBA::Object_ptr get_reference (CORBA::Environment &ACE_TRY_ENV =
-                                     TAO_default_environment ());
-  CORBA::TypeCode_ptr get_typecode (CORBA::Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ());
-  CORBA::LongLong get_longlong (CORBA::Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ());
-  CORBA::ULongLong get_ulonglong (CORBA::Environment &ACE_TRY_ENV =
-                                    TAO_default_environment ());
-  CORBA::WChar get_wchar (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Any_ptr get_any (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-
-private:
-  CORBA::TypeCode_var type_;
-  // Holds the typecode of the enum.
-
-  CORBA::ULong value_;
-  // Current numeric value of the enum.
-
-  TAO_DynEnum_i (void);
-  // Must be instantiated with at least a typecode.
-
-  // = Use copy() or assign() instead of these
-  TAO_DynEnum_i (const TAO_DynEnum_i &src);
-  TAO_DynEnum_i &operator= (const TAO_DynEnum_i &src);
-};
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#endif /* TAO_DYNENUM_I_H */
diff --git a/TAO/tao/DynSequence_i.cpp b/TAO/tao/DynSequence_i.cpp
deleted file mode 100644
index 2e02ecd6d6e..00000000000
--- a/TAO/tao/DynSequence_i.cpp
+++ /dev/null
@@ -1,1558 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ===================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    DynSequence_i.cpp
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ===================================================================
-
-#include "tao/DynAny_i.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#include "tao/DynSequence_i.h"
-#include "tao/InconsistentTypeCodeC.h"
-
-// Constructors and destructor.
-
-TAO_DynSequence_i::TAO_DynSequence_i (const CORBA_Any& any)
-  : type_ (any.type ()),
-    current_index_ (0),
-    da_members_ (0)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      int tk =
-        TAO_DynAny_i::unalias (this->type_.in (),
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // The type will be correct if this constructor called from a
-      // factory function, but it could also be called by the user,
-      // so.....
-      if (tk == CORBA::tk_sequence)
-        {
-          // Get the CDR stream of the argument.
-          ACE_Message_Block *mb = any._tao_get_cdr ();
-
-          TAO_InputCDR cdr (mb);
-
-          CORBA::ULong length;
-
-          // If the any is a sequence, first 4 bytes of cdr hold the
-          // length.
-          cdr.read_ulong (length);
-
-          // Resize the array.
-          this->da_members_.size (length);
-
-          // Get the type of the sequence elments.
-          CORBA::TypeCode_ptr field_tc =
-            this->get_element_type (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          for (CORBA::ULong i = 0; i < length; i++)
-            {
-              // This Any constructor is a TAO extension.
-              CORBA_Any field_any (field_tc,
-                                   0,
-                                   cdr.start ());
-
-              // This recursive step will call the correct constructor
-              // based on the type of field_any.
-              this->da_members_[i] =
-                TAO_DynAny_i::create_dyn_any (field_any,
-                                              ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-              // Move to the next field in the CDR stream.
-              cdr.skip (field_tc);
-            }
-        }
-      else
-        ACE_THROW (CORBA_ORB_InconsistentTypeCode ());
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-}
-
-// Can't set the length from just the typecode, so we'll
-// do it upon initialization.
-
-TAO_DynSequence_i::TAO_DynSequence_i (CORBA_TypeCode_ptr tc)
-  : type_ (CORBA::TypeCode::_duplicate (tc)),
-    current_index_ (0),
-    da_members_ (0)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Need to check if called by user.
-      int tk = TAO_DynAny_i::unalias (tc,
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      if (tk != CORBA::tk_sequence)
-        ACE_THROW (CORBA_ORB_InconsistentTypeCode ());
-    }
-  ACE_CATCHANY
-    {
-      // Do nothing
-    }
-  ACE_ENDTRY;
-}
-
-TAO_DynSequence_i::~TAO_DynSequence_i (void)
-{
-}
-
-// Functions specific to DynSequence
-
-CORBA::ULong
-TAO_DynSequence_i::length (CORBA::Environment &)
-{
-  return this->da_members_.size ();
-}
-
-// There is no way to resize an ACE_Array except by assignment to
-// another ACE_Array of a different size, so we have to copy over
-// and copy back, even if the result is only to decrease the size.
-void
-TAO_DynSequence_i::length (CORBA::ULong length,
-                           CORBA::Environment &)
-{
-  this->da_members_.size (length);
-}
-
-CORBA_AnySeq_ptr
-TAO_DynSequence_i::get_elements (CORBA::Environment& ACE_TRY_ENV)
-{
-  CORBA::ULong length = this->da_members_.size ();
-
-  if (length == 0)
-    return 0;
-
-  CORBA_AnySeq_ptr elements;
-  ACE_NEW_THROW_EX (elements,
-                    CORBA_AnySeq (length),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  // We must do this explicitly.
-  elements->length (length);
-
-  // Initialize each Any.
-  for (CORBA::ULong i = 0; i < length; i++)
-    {
-      CORBA::Any_var temp =
-        this->da_members_[i]->to_any (ACE_TRY_ENV);
-
-      ACE_CHECK_RETURN (0);
-
-      (*elements)[i] = temp.in ();
-    }
-
-  return elements;
-}
-
-void
-TAO_DynSequence_i::set_elements (const CORBA_AnySeq& value,
-                                 CORBA::Environment& ACE_TRY_ENV)
-{
-  CORBA::ULong length = value.length ();
-  CORBA::ULong size = this->da_members_.size ();
-
-  if (size == 0)
-    {
-      // Resize the array, it hasn't yet been initialized.
-      this->da_members_.size (length);
-    }
-  else if (size != length)
-    {
-      ACE_THROW (CORBA_DynAny::InvalidSeq ());
-    }
-
-  CORBA::TypeCode_ptr element_type =
-    this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  for (CORBA::ULong i = 0; i < length; i++)
-    {
-      // Check each arg element for type match.
-      CORBA::Boolean equal = value[i].type ()->equal (element_type,
-                                                      ACE_TRY_ENV);
-      ACE_CHECK;
-
-      if (equal)
-        {
-          if (!CORBA::is_nil (this->da_members_[i].in ()))
-            {
-              this->da_members_[i]->destroy (ACE_TRY_ENV);
-              ACE_CHECK;
-            }
-
-          this->da_members_[i] =
-            TAO_DynAny_i::create_dyn_any (value[i],
-                                          ACE_TRY_ENV);
-          ACE_CHECK;
-        }
-      else
-        {
-          ACE_THROW (CORBA_DynAny::InvalidSeq ());
-        }
-    }
-}
-
-// Common functions
-
-void
-TAO_DynSequence_i::assign (CORBA_DynAny_ptr dyn_any,
-                           CORBA::Environment &ACE_TRY_ENV)
-{
-  // *dyn_any->to_any raises Invalid if arg is bad.
-  CORBA_TypeCode_ptr tc = dyn_any->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::Boolean equal = this->type_.in ()->equal (tc,
-                                                   ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (equal)
-    {
-      CORBA_Any_ptr any_ptr = dyn_any->to_any (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->from_any (*any_ptr,
-                      ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::Invalid ());
-    }
-}
-
-CORBA_DynAny_ptr
-TAO_DynSequence_i::copy (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_Any_ptr a = this->to_any (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-  CORBA_DynAny_ptr retval = TAO_DynAny_i::create_dyn_any (*a,
-                                                          ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-  return retval;
-}
-
-void
-TAO_DynSequence_i::destroy (CORBA::Environment &ACE_TRY_ENV)
-{
-  // Do a deep destroy
-  for (CORBA::ULong i = 0;
-       i < this->da_members_.size ();
-       i++)
-    if (!CORBA::is_nil (this->da_members_[i].in ()))
-      {
-        this->da_members_[i]->destroy (ACE_TRY_ENV);
-        ACE_CHECK;
-      }
-
-  // Free the top level
-  delete this;
-}
-
-void
-TAO_DynSequence_i::from_any (const CORBA_Any& any,
-                             CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Boolean equal = this->type_.in ()->equal (any.type (),
-                                                   ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (equal)
-    {
-      // Get the CDR stream of the argument.
-      ACE_Message_Block *mb = any._tao_get_cdr ();
-
-      TAO_InputCDR cdr (mb);
-
-      CORBA::ULong arg_length;
-
-      // If the any is a sequence, first 4 bytes of cdr hold the
-      // length.
-      cdr.read_ulong (arg_length);
-
-      CORBA::ULong length = this->da_members_.size ();
-
-      if (length == 0)
-        {
-          // Resize the array, it hasn't yet been initialized.
-          this->da_members_.size (arg_length);
-        }
-      else if (length != arg_length)
-        {
-          ACE_THROW (CORBA_DynAny::Invalid ());
-        }
-
-      CORBA::TypeCode_ptr field_tc =
-        this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      for (CORBA::ULong i = 0;
-           i < arg_length;
-           i++)
-        {
-          // This Any constructor is a TAO extension.
-          CORBA_Any field_any (field_tc,
-                               0,
-                               cdr.start ());
-
-          if (!CORBA::is_nil (this->da_members_[i].in ()))
-            {
-              this->da_members_[i]->destroy (ACE_TRY_ENV);
-              ACE_CHECK;
-            }
-
-          this->da_members_[i] =
-            TAO_DynAny_i::create_dyn_any (field_any,
-                                          ACE_TRY_ENV);
-          ACE_CHECK;
-
-          // Move to the next field in the CDR stream.
-          cdr.skip (field_tc);
-        }
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::Invalid ());
-    }
-}
-
-CORBA::Any_ptr
-TAO_DynSequence_i::to_any (CORBA::Environment& ACE_TRY_ENV)
-{
-  TAO_OutputCDR out_cdr;
-
-  out_cdr.write_ulong (this->da_members_.size ());
-
-  CORBA_TypeCode_ptr field_tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  for (CORBA::ULong i = 0; i < this->da_members_.size (); i++)
-    {
-      // Each component must have been initialized.
-      if (!this->da_members_[i].in ())
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                            0);
-        }
-
-      // Recursive step
-      CORBA_Any_var field_any =
-        this->da_members_[i]->to_any (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      ACE_Message_Block *field_mb =
-        field_any->_tao_get_cdr ();
-
-      TAO_InputCDR field_cdr (field_mb);
-
-      out_cdr.append (field_tc,
-                      &field_cdr,
-                      ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-    }
-
-  TAO_InputCDR in_cdr (out_cdr);
-
-  CORBA_Any* retval;
-
-  CORBA_TypeCode_ptr tc = this->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  ACE_NEW_THROW_EX (retval,
-                    CORBA_Any (tc,
-                               0,
-                               in_cdr.start ()),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  return retval;
-}
-
-CORBA::TypeCode_ptr
-TAO_DynSequence_i::type (CORBA::Environment &)
-{
-  return this->type_.in ();
-}
-
-// If the DynAny has been initialized but this component has not, the
-// first call to current_component will create the pointer and return
-// it.
-
-CORBA_DynAny_ptr
-TAO_DynSequence_i::current_component (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (this->da_members_.size () == 0)
-    {
-      return CORBA_DynAny::_nil ();
-    }
-
-  if (!this->da_members_[this->current_index_].in ())
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-      this->da_members_[this->current_index_] =
-        TAO_DynAny_i::create_dyn_any (tc,
-                                      ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-    }
-
-  return this->da_members_[this->current_index_].in ();
-}
-
-CORBA::Boolean
-TAO_DynSequence_i::next (CORBA::Environment &)
-{
-  CORBA::Long size = (CORBA::Long) this->da_members_.size ();
-
-  if (size == 0 || this->current_index_ + 1 == size)
-    return 0;
-
-  ++this->current_index_;
-  return 1;
-}
-
-CORBA::Boolean
-TAO_DynSequence_i::seek (CORBA::Long slot,
-                         CORBA::Environment &)
-{
-  if (slot < 0 || slot >= (CORBA::Long) this->da_members_.size ())
-    return 0;
-
-  this->current_index_ = slot;
-  return 1;
-}
-
-void
-TAO_DynSequence_i::rewind (CORBA::Environment &)
-{
-  this->current_index_ = 0;
-}
-
-// The insert-primitive and get-primitive functions are required
-// by the spec of all types of DynAny, although if the top level
-// members aren't primitive types, these functions aren't too helpful.
-// Also, while not mentioned in the spec, the example code seems to
-// indicate that next() is called in the body of each of these, and
-// it has been so implemented here.
-
-// Insert functions
-
-void
-TAO_DynSequence_i::insert_boolean (CORBA::Boolean value,
-                                   CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_boolean)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_boolean (value,
-                          ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynSequence_i::insert_octet (CORBA::Octet value,
-                                 CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_octet)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_octet (value,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynSequence_i::insert_char (CORBA::Char value,
-                                CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_char)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_char (value,
-                       ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynSequence_i::insert_short (CORBA::Short value,
-                                 CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_short)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_short (value,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynSequence_i::insert_ushort (CORBA::UShort value,
-                                  CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_ushort)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_ushort (value,
-                         ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynSequence_i::insert_long (CORBA::Long value,
-                                CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_long)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_long (value,
-                       ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynSequence_i::insert_ulong (CORBA::ULong value,
-                                 CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_ulong)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_ulong (value,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynSequence_i::insert_float (CORBA::Float value,
-                                 CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_float)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_float (value,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynSequence_i::insert_double (CORBA::Double value,
-                                  CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_double)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_double (value,
-                         ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynSequence_i::insert_string (const char * value,
-                                  CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_string)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_string (value,
-                         ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynSequence_i::insert_reference (CORBA::Object_ptr value,
-                                     CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_objref)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_reference (value,
-                            ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynSequence_i::insert_typecode (CORBA::TypeCode_ptr value,
-                                    CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_TypeCode)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_typecode (value,
-                           ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynSequence_i::insert_longlong (CORBA::LongLong value,
-                                    CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_longlong)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_longlong (value,
-                           ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynSequence_i::insert_ulonglong (CORBA::ULongLong value,
-                                     CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_ulonglong)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_ulonglong (value,
-                            ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynSequence_i::insert_wchar (CORBA::WChar value,
-                                 CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_wchar)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_wchar (value,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynSequence_i::insert_any (const CORBA::Any& value,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_any)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_any (value,
-                      ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-// Get functions
-
-// If the current component has not been intialized, these
-// raise Invalid, which is not required by the spec, but which
-// seems like a courteous thing to do.
-
-CORBA::Boolean
-TAO_DynSequence_i::get_boolean (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Boolean val = 0;
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_boolean)
-        {
-          val = dp->get_boolean (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::Octet
-TAO_DynSequence_i::get_octet (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Octet val = 0;
-  CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_octet)
-        {
-          val = dp->get_octet (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::Char
-TAO_DynSequence_i::get_char (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Char val = 0;
-  CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_char)
-        {
-          val = dp->get_char (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::Short
-TAO_DynSequence_i::get_short (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Short val = 0;
-  CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_short)
-        {
-          val = dp->get_short (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::UShort
-TAO_DynSequence_i::get_ushort (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::UShort val = 0;
-  CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_ushort)
-        {
-          val = dp->get_ushort (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::Long
-TAO_DynSequence_i::get_long (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Long val = 0;
-  CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_long)
-        {
-          val = dp->get_long (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::ULong
-TAO_DynSequence_i::get_ulong (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::ULong val = 0;
-  CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_ulong)
-        {
-          val = dp->get_ulong (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::Float
-TAO_DynSequence_i::get_float (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Float val = 0;
-  CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_float)
-        {
-          val = dp->get_float (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::Double
-TAO_DynSequence_i::get_double (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Double val = 0;
-  CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_double)
-        {
-          val = dp->get_double (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
-
-  return val;
-}
-
-char *
-TAO_DynSequence_i::get_string (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Char *val = 0;
-  CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_string)
-        {
-          val = dp->get_string (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::Object_ptr
-TAO_DynSequence_i::get_reference (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_Object_ptr val = 0;
-  CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_objref)
-        {
-          val = dp->get_reference (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::TypeCode_ptr
-TAO_DynSequence_i::get_typecode (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr val = 0;
-  CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_TypeCode)
-        {
-          val = dp->get_typecode (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::LongLong
-TAO_DynSequence_i::get_longlong (CORBA::Environment &ACE_TRY_ENV)
-{
-#if defined (ACE_LACKS_LONGLONG_T)
-  CORBA::LongLong val = {0, 0};
-#else  /* ! ACE_LACKS_LONGLONG_T */
-  CORBA::LongLong val = 0;
-#endif /* ! ACE_LACKS_LONGLONG_T */
-
-  CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_longlong)
-        {
-          val = dp->get_longlong (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::ULongLong
-TAO_DynSequence_i::get_ulonglong (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::ULongLong val = 0;
-  CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_ulonglong)
-        {
-          val = dp->get_ulonglong (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::WChar
-TAO_DynSequence_i::get_wchar (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::WChar val = 0;
-  CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_wchar)
-        {
-          val = dp->get_wchar (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::Any_ptr
-TAO_DynSequence_i::get_any (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_Any_ptr val = 0;
-  CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = this->get_element_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_any)
-        {
-          val = dp->get_any (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-          this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
-
-  return val;
-}
-
-// Private utility function.
-
-CORBA::TypeCode_ptr
-TAO_DynSequence_i::get_element_type (CORBA::Environment& ACE_TRY_ENV)
-{
-  CORBA::TypeCode_ptr element_type =
-    this->type_.in ();
-
-  // Strip away aliases (if any) on top of the outer type
-  CORBA::TCKind kind = element_type->kind (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
-
-  while (kind != CORBA::tk_sequence)
-    {
-      element_type = element_type->content_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
-
-      kind = element_type->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
-    }
-
-  // Return the content type.
-  CORBA::TypeCode_ptr retval = element_type->content_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
-
-  return retval;
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/DynSequence_i.h b/TAO/tao/DynSequence_i.h
deleted file mode 100644
index 8efbc72c68e..00000000000
--- a/TAO/tao/DynSequence_i.h
+++ /dev/null
@@ -1,220 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ===================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    DynSequence_i.h
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ===================================================================
-
-#ifndef TAO_DYNSEQUENCE_I_H
-#define TAO_DYNSEQUENCE_I_H
-
-#include "tao/orbconf.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#include "ace/Containers.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_Export TAO_DynSequence_i : public POA_CORBA::DynSequence
-{
-  // = TITLE
-  //    TAO_DynSequence_i
-  //
-  // = DESCRIPTION
-  //    Implementation of Dynamic Any type for Sequences
-  //
-public:
-  TAO_DynSequence_i (const CORBA_Any& any);
-  // constructor taking an Any argument
-
-  TAO_DynSequence_i (CORBA_TypeCode_ptr tc);
-  // constructor taking a typecode argument
-
-  ~TAO_DynSequence_i (void);
-  // destructor
-
-  // = Functions specific to DynSequence
-
-  CORBA::ULong length (CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
-  // Get length of sequence.
-
-  void length (CORBA::ULong length,
-               CORBA::Environment &ACE_TRY_ENV =
-                 TAO_default_environment ());
-  // Set length of sequence.
-
-  CORBA_AnySeq_ptr get_elements (CORBA::Environment &ACE_TRY_ENV =
-                                   TAO_default_environment ());
-  // Get elements using IDL defined type AnySeq.
-
-  void set_elements (const CORBA_AnySeq& value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-  // Set elements using IDL defined type AnySeq.
-
-  // = Functions common to all Dynamic Any types
-
-  void assign (CORBA_DynAny_ptr dyn_any,
-               CORBA::Environment &ACE_TRY_ENV =
-                 TAO_default_environment ());
-  // Sets the value of the receiver to the value of the argument.
-
-  CORBA_DynAny_ptr copy (CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
-  // Creates a copy.
-
-  void destroy (CORBA::Environment &ACE_TRY_ENV =
-                  TAO_default_environment ());
-  // Makes sure the contents are disposed of correctly.
-
-  void from_any (const CORBA::Any& any,
-                 CORBA::Environment &ACE_TRY_ENV =
-                   TAO_default_environment ());
-  // Assigns value from an Any argument.
-
-  CORBA::Any_ptr to_any (CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
-  // Outputs contents as an Any.
-
-  CORBA::TypeCode_ptr type (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  // Returns the (constant) type.
-
-  CORBA_DynAny_ptr current_component (CORBA::Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ());
-  // Used in iterating through the contents.
-
-  CORBA::Boolean next (CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
-  // Returns next component.
-
-  CORBA::Boolean seek (CORBA::Long slot,
-                       CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
-  // Jump to component at <slot>.
-
-  void rewind (CORBA::Environment &ACE_TRY_ENV =
-                 TAO_default_environment ());
-  // Makes first component the current one.
-
-  // = Insert and get functions
-
-  void insert_boolean (CORBA::Boolean value,
-                       CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
-  void insert_octet (CORBA::Octet value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-  void insert_char (CORBA::Char value,
-                    CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
-  void insert_short (CORBA::Short value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-  void insert_ushort (CORBA::UShort value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
-  void insert_long (CORBA::Long value,
-                    CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
-  void insert_ulong (CORBA::ULong value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-  void insert_float (CORBA::Float value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-  void insert_double (CORBA::Double value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
-  void insert_string (const char * value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
-  void insert_reference (CORBA::Object_ptr value,
-                         CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
-  void insert_typecode (CORBA::TypeCode_ptr value,
-                        CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  void insert_longlong (CORBA::LongLong value,
-                        CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  void insert_ulonglong (CORBA::ULongLong value,
-                         CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
-  void insert_wchar (CORBA::WChar value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-  void insert_any (const CORBA::Any& value,
-                   CORBA::Environment &ACE_TRY_ENV =
-                     TAO_default_environment ());
-  CORBA::Boolean get_boolean (CORBA::Environment &ACE_TRY_ENV =
-                                TAO_default_environment ());
-  CORBA::Octet get_octet (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Char get_char (CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  CORBA::Short get_short (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::UShort get_ushort (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  CORBA::Long get_long (CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  CORBA::ULong get_ulong (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Float get_float (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Double get_double (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  char *get_string (CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
-  CORBA::Object_ptr get_reference (CORBA::Environment &ACE_TRY_ENV =
-                                     TAO_default_environment ());
-  CORBA::TypeCode_ptr get_typecode (CORBA::Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ());
-  CORBA::LongLong get_longlong (CORBA::Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ());
-  CORBA::ULongLong get_ulonglong (CORBA::Environment &ACE_TRY_ENV =
-                                    TAO_default_environment ());
-  CORBA::WChar get_wchar (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Any_ptr get_any (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-
-private:
-  CORBA::TypeCode_ptr get_element_type (CORBA::Environment &ACE_TRY_ENV =
-                                          TAO_default_environment ());
-  // Utility, turns the type of elements contained in the sequence.
-
-  CORBA::TypeCode_var type_;
-  // Holds the typecode of the Sequence
-
-  CORBA::Long current_index_;
-  // Index of the current component
-
-  ACE_Array_Base<CORBA_DynAny_var> da_members_;
-  // Each component is also a DynAny
-
-  TAO_DynSequence_i (void);
-  // Must be instantiated with at least a typecode
-
-  // = Use copy() or assign() instead of these
-  TAO_DynSequence_i (const TAO_DynSequence_i &src);
-  TAO_DynSequence_i &operator= (const TAO_DynSequence_i &src);
-};
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#endif /* TAO_DYNSEQUENCE_I_H */
diff --git a/TAO/tao/DynStruct_i.cpp b/TAO/tao/DynStruct_i.cpp
deleted file mode 100644
index 03f3c94a4af..00000000000
--- a/TAO/tao/DynStruct_i.cpp
+++ /dev/null
@@ -1,1518 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ====================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    DynStruct_i.cpp
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ====================================================================
-
-#include "tao/DynAny_i.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#include "tao/DynStruct_i.h"
-#include "tao/InconsistentTypeCodeC.h"
-
-// Constructors and destructor
-
-TAO_DynStruct_i::TAO_DynStruct_i (const CORBA_Any& any)
-  : type_ (any.type ()),
-    current_index_ (0),
-    da_members_ (0)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // The type will be correct if this constructor called from a
-      // factory function, but it could also be called by the user,
-      // so.....
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (this->type_.in (),
-                                                  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (kind == CORBA::tk_struct)
-        {
-          CORBA::ULong numfields =
-            this->type_.in ()->member_count (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          // Resize the array.
-          this->da_members_.size (numfields);
-
-          // Get the CDR stream of the argument.
-          ACE_Message_Block *mb = any._tao_get_cdr ();
-
-          TAO_InputCDR cdr (mb);
-
-          for (CORBA::ULong i = 0; i < numfields; i++)
-            {
-              CORBA::TypeCode_ptr field_tc =
-                this->type_.in ()->member_type (i,
-                                                ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-
-              // This Any constructor is a TAO extension.
-              CORBA_Any field_any (field_tc,
-                                  0,
-                                  cdr.start ());
-
-              // This recursive step will call the correct constructor
-              // based on the type of field_any.
-              this->da_members_[i] =
-                TAO_DynAny_i::create_dyn_any (field_any,
-                                              ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-
-              // Move to the next field in the CDR stream.
-              cdr.skip (field_tc);
-            }
-        }
-      else
-        {
-          ACE_THROW (CORBA_ORB_InconsistentTypeCode ());
-        }
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-TAO_DynStruct_i::TAO_DynStruct_i (CORBA_TypeCode_ptr tc)
-  : type_ (CORBA::TypeCode::_duplicate (tc)),
-    current_index_ (0),
-    da_members_ (0)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Need to check if called by user.
-      if (TAO_DynAny_i::unalias (tc, ACE_TRY_ENV) == CORBA::tk_struct)
-        {
-          CORBA::ULong numfields = tc->member_count (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          // Resize the array.
-          this->da_members_.size (numfields);
-
-          for (CORBA::ULong i = 0; i < numfields; i++)
-
-            // With a typecode arg, we just create the top level.
-            this->da_members_[i] = 0;
-        }
-      else
-        {
-          ACE_THROW (CORBA_ORB_InconsistentTypeCode ());
-        }
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-TAO_DynStruct_i::~TAO_DynStruct_i (void)
-{
-}
-
-// Functions specific to DynStruct
-
-CORBA::FieldName
-TAO_DynStruct_i::current_member_name (CORBA::Environment &)
-{
-  return CORBA::string_dup (this->type_.in ()->member_name (this->current_index_));
-}
-
-// Returns the unaliased TCKind.
-CORBA::TCKind
-TAO_DynStruct_i::current_member_kind (CORBA::Environment& ACE_TRY_ENV)
-{
-  CORBA::TypeCode_ptr tc = this->type_.in ()->member_type (this->current_index_,
-                                                           ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::tk_null);
-
-  CORBA::TCKind retval = TAO_DynAny_i::unalias (tc,
-                                                ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::tk_null);
-
-  return retval;
-}
-
-CORBA::NameValuePairSeq*
-TAO_DynStruct_i::get_members (CORBA::Environment& ACE_TRY_ENV)
-{
-  CORBA::ULong length = this->da_members_.size ();
-
-  CORBA::NameValuePairSeq* members;
-  ACE_NEW_THROW_EX (members,
-                    CORBA::NameValuePairSeq (length),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  // We must do this explicitly.
-  members->length (length);
-
-  // Assign name and value to each pearl on the string.
-  for (CORBA::ULong i = 0; i < length; i++)
-    {
-      (*members)[i].id =
-        CORBA::string_dup (this->type_.in ()->member_name (i));
-
-      CORBA::Any_var temp = this->da_members_[i]->to_any (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      (*members)[i].value = temp.in ();
-    }
-
-  return members;
-}
-
-void
-TAO_DynStruct_i::set_members (const CORBA::NameValuePairSeq& value,
-                              CORBA::Environment& ACE_TRY_ENV)
-{
-  CORBA::ULong length = value.length ();
-
-  // Check for length match.
-  if (length == this->da_members_.size ())
-    {
-      for (CORBA::ULong i = 0; i < length; i++)
-        {
-          // Check for type and name match.
-          CORBA_TypeCode_ptr tc = this->type_.in ()->member_type (i,
-                                                                  ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (value[i].value.type ()->equal (tc)
-              && !ACE_OS::strcmp (value[i].id,
-                                  this->type_.in ()->member_name (i)))
-            {
-              if (!CORBA::is_nil (this->da_members_[i].in ()))
-                {
-                  this->da_members_[i]->destroy (ACE_TRY_ENV);
-                  ACE_CHECK;
-                }
-
-              this->da_members_[i] =
-                TAO_DynAny_i::create_dyn_any (value[i].value,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-            }
-          else
-            {
-              ACE_THROW (CORBA_DynAny::InvalidSeq ());
-            }
-        }
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidSeq ());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////
-// Common functions
-
-void
-TAO_DynStruct_i::assign (CORBA_DynAny_ptr dyn_any,
-                         CORBA::Environment &ACE_TRY_ENV)
-{
-  // *dyn_any->to_any raises Invalid if arg is bad.
-  CORBA::TypeCode_ptr tc = dyn_any->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::Boolean equal = this->type_.in ()->equal (tc,
-                                                   ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (equal)
-    {
-      CORBA_Any_ptr any_ptr = dyn_any->to_any (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->from_any (*any_ptr,
-                      ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::Invalid ());
-    }
-}
-
-CORBA_DynAny_ptr
-TAO_DynStruct_i::copy (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_Any_ptr a = this->to_any (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-  CORBA_DynAny_ptr retval = TAO_DynAny_i::create_dyn_any (*a,
-                                                          ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-  return retval;
-}
-
-void
-TAO_DynStruct_i::destroy (CORBA::Environment &ACE_TRY_ENV)
-{
-  // Do a deep destroy
-  for (CORBA::ULong i = 0; i < this->da_members_.size (); i++)
-    {
-      if (!CORBA::is_nil (this->da_members_[i].in ()))
-        {
-          this->da_members_[i]->destroy (ACE_TRY_ENV);
-          ACE_CHECK;
-        }
-    }
-
-  // Free the top level
-  delete this;
-}
-
-void
-TAO_DynStruct_i::from_any (const CORBA_Any& any,
-                           CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Boolean equal = this->type_.in ()->equal (any.type (),
-                                                   ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (equal)
-    {
-      // Get the CDR stream of the argument.
-      ACE_Message_Block* mb = any._tao_get_cdr ();
-      TAO_InputCDR cdr (mb);
-
-      for (CORBA::ULong i = 0;
-           i < this->da_members_.size ();
-           i++)
-        {
-          CORBA::TypeCode_ptr field_tc =
-            this->type_.in ()->member_type (i,
-                                            ACE_TRY_ENV);
-          ACE_CHECK;
-
-          // This Any constructor is a TAO extension.
-          CORBA_Any field_any (field_tc,
-                               0,
-                               cdr.start ());
-
-          if (!CORBA::is_nil (this->da_members_[i].in ()))
-            {
-              this->da_members_[i]->destroy (ACE_TRY_ENV);
-              ACE_CHECK;
-            }
-
-          this->da_members_[i] =
-            TAO_DynAny_i::create_dyn_any (field_any,
-                                          ACE_TRY_ENV);
-          ACE_CHECK;
-
-          // Move to the next field in the CDR stream.
-          cdr.skip (field_tc);
-        }
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::Invalid ());
-    }
-}
-
-CORBA::Any_ptr
-TAO_DynStruct_i::to_any (CORBA::Environment& ACE_TRY_ENV)
-{
-  TAO_OutputCDR out_cdr;
-
-  for (CORBA::ULong i = 0;
-       i < this->da_members_.size ();
-       i++)
-    {
-      // Each component must have been initialied.
-      if (!this->da_members_[i].in ())
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                            0);
-        }
-
-      CORBA_TypeCode_ptr field_tc =
-        this->da_members_[i]->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      // Recursive step
-      CORBA_Any_var field_any =
-        this->da_members_[i]->to_any (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      ACE_Message_Block *field_mb = field_any->_tao_get_cdr ();
-
-      TAO_InputCDR field_cdr (field_mb);
-
-      out_cdr.append (field_tc,
-                      &field_cdr,
-                      ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-    }
-
-  TAO_InputCDR in_cdr (out_cdr);
-
-  CORBA_Any *retval;
-
-  CORBA_TypeCode_ptr tc = this->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  ACE_NEW_THROW_EX (retval,
-                    CORBA_Any (tc,
-                               0,
-                               in_cdr.start ()),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  return retval;
-}
-
-CORBA::TypeCode_ptr
-TAO_DynStruct_i::type (CORBA::Environment &)
-{
-  return this->type_.in ();
-}
-
-// If this component hasn't been initialized yet, the first call to
-// current_component will create the pointer and return it.
-
-CORBA_DynAny_ptr
-TAO_DynStruct_i::current_component (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (!this->da_members_[this->current_index_].in ())
-    {
-      CORBA_TypeCode_ptr tc =
-        this->type_.in ()->member_type (this->current_index_,
-                                        ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-      CORBA_DynAny_ptr dp = TAO_DynAny_i::create_dyn_any (tc,
-                                                          ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-      this->da_members_[this->current_index_] = dp;
-    }
-
-  return this->da_members_[this->current_index_].in ();
-}
-
-CORBA::Boolean
-TAO_DynStruct_i::next (CORBA::Environment &)
-{
-  if (this->current_index_ + 1 == (CORBA::Long) this->da_members_.size ())
-    return 0;
-
-  ++this->current_index_;
-  return 1;
-}
-
-CORBA::Boolean
-TAO_DynStruct_i::seek (CORBA::Long slot,
-                       CORBA::Environment &)
-{
-  if (slot < 0
-      || slot >= (CORBA::Long) this->da_members_.size ())
-    return 0;
-
-  this->current_index_ = slot;
-  return 1;
-}
-
-void
-TAO_DynStruct_i::rewind (CORBA::Environment &)
-{
-  this->current_index_ = 0;
-}
-
-// The insert-primitive and get-primitive functions are required
-// by the spec of all types of DynAny, although if the top level
-// members aren't primitive types, these functions aren't too helpful.
-// Also, while not mentioned in the spec, the example code seems to
-// indicate that next() is called in the body of each of these, and
-// it has been so implemented here.
-
-// Insert functions
-
-void
-TAO_DynStruct_i::insert_boolean (CORBA::Boolean value,
-                                 CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind =
-    TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
-                                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_boolean)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_boolean (value,
-                          ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynStruct_i::insert_octet (CORBA::Octet value,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind =
-    TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
-                                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_octet)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_octet (value,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynStruct_i::insert_char (CORBA::Char value,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind =
-    TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
-                                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_char)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_char (value,
-                       ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynStruct_i::insert_short (CORBA::Short value,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind =
-    TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
-                                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_short)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_short (value,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynStruct_i::insert_ushort (CORBA::UShort value,
-                                CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind =
-    TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
-                                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_ushort)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_ushort (value,
-                         ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynStruct_i::insert_long (CORBA::Long value,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind =
-    TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
-                                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_long)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_long (value,
-                       ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynStruct_i::insert_ulong (CORBA::ULong value,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind =
-    TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
-                                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_ulong)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_ulong (value,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynStruct_i::insert_float (CORBA::Float value,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind =
-    TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
-                                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_float)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_float (value,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynStruct_i::insert_double (CORBA::Double value,
-                                CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind =
-    TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
-                                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_double)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_double (value,
-                         ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynStruct_i::insert_string (const char * value,
-                                CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind =
-    TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
-                                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_string)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_string (value,
-                         ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynStruct_i::insert_reference (CORBA::Object_ptr value,
-                                   CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind =
-    TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
-                                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_objref)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_reference (value,
-                            ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynStruct_i::insert_typecode (CORBA::TypeCode_ptr value,
-                                  CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind =
-    TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
-                                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_TypeCode)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_typecode (value,
-                           ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynStruct_i::insert_longlong (CORBA::LongLong value,
-                                  CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind =
-    TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
-                                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_longlong)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_longlong (value,
-                           ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynStruct_i::insert_ulonglong (CORBA::ULongLong value,
-                                   CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind =
-    TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
-                                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_ulonglong)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_ulonglong (value,
-                            ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynStruct_i::insert_wchar (CORBA::WChar value,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind =
-    TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
-                                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_wchar)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_wchar (value,
-                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynStruct_i::insert_any (const CORBA::Any& value,
-                             CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind kind =
-    TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
-                                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_any)
-    {
-      CORBA_DynAny_ptr dp = this->current_component (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      dp->insert_any (value,
-                      ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->next (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-// Get functions
-
-// If the current component has not been intialized, these raise
-// Invalid, which is not required by the spec, but which seems like a
-// courteous thing to do.
-
-CORBA::Boolean
-TAO_DynStruct_i::get_boolean (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Boolean val = 0;
-  CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (kind == CORBA::tk_boolean)
-        {
-          val = dp->get_boolean (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-         this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::Octet
-TAO_DynStruct_i::get_octet (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Octet val = 0;
-  CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (kind == CORBA::tk_octet)
-        {
-          val = dp->get_octet (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-         this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::Char
-TAO_DynStruct_i::get_char (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Char val = 0;
-  CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (kind == CORBA::tk_char)
-        {
-          val = dp->get_char (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-         this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::Short
-TAO_DynStruct_i::get_short (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Short val = 0;
-  CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (kind == CORBA::tk_short)
-        {
-          val = dp->get_short (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-         this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::UShort
-TAO_DynStruct_i::get_ushort (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::UShort val = 0;
-  CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (kind == CORBA::tk_ushort)
-        {
-          val = dp->get_ushort (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-         this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::Long
-TAO_DynStruct_i::get_long (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Long val = 0;
-  CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (kind == CORBA::tk_long)
-        {
-          val = dp->get_long (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-         this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::ULong
-TAO_DynStruct_i::get_ulong (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::ULong val = 0;
-  CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (kind == CORBA::tk_ulong)
-        {
-          val = dp->get_ulong (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-         this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::Float
-TAO_DynStruct_i::get_float (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Float val = 0;
-  CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (kind == CORBA::tk_float)
-        {
-          val = dp->get_float (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-         this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::Double
-TAO_DynStruct_i::get_double (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Double val = 0;
-  CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (kind == CORBA::tk_double)
-        {
-          val = dp->get_double (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-         this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
-
-  return val;
-}
-
-char *
-TAO_DynStruct_i::get_string (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Char *val = 0;
-  CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (kind == CORBA::tk_string)
-        {
-          val = dp->get_string (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-         this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::Object_ptr
-TAO_DynStruct_i::get_reference (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_Object_ptr val = 0;
-  CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (kind == CORBA::tk_objref)
-        {
-          val = dp->get_reference (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-         this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::TypeCode_ptr
-TAO_DynStruct_i::get_typecode (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr val = 0;
-  CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (kind == CORBA::tk_TypeCode)
-        {
-          val = dp->get_typecode (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-         this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::LongLong
-TAO_DynStruct_i::get_longlong (CORBA::Environment &ACE_TRY_ENV)
-{
-#if defined (ACE_LACKS_LONGLONG_T)
-  CORBA::LongLong val = {0, 0};
-#else  /* ! ACE_LACKS_LONGLONG_T */
-  CORBA::LongLong val = 0;
-#endif /* ! ACE_LACKS_LONGLONG_T */
-
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (val);
-
-      if (kind == CORBA::tk_longlong)
-        {
-          val = dp->get_longlong (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-
-         this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (val);
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::ULongLong
-TAO_DynStruct_i::get_ulonglong (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::ULongLong val = 0;
-  CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (kind == CORBA::tk_ulonglong)
-        {
-          val = dp->get_ulonglong (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-         this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::WChar
-TAO_DynStruct_i::get_wchar (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::WChar val = 0;
-  CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (kind == CORBA::tk_wchar)
-        {
-          val = dp->get_wchar (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-         this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
-
-  return val;
-}
-
-CORBA::Any_ptr
-TAO_DynStruct_i::get_any (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_Any_ptr val = 0;
-  CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
-
-  if (dp)
-    {
-      CORBA_TypeCode_ptr tc = dp->type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (kind == CORBA::tk_any)
-        {
-          val = dp->get_any (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-         this->next (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (),
-                            val);
-        }
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (),
-                        val);
-    }
-
-  return val;
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/DynStruct_i.h b/TAO/tao/DynStruct_i.h
deleted file mode 100644
index 4ac52eb4aae..00000000000
--- a/TAO/tao/DynStruct_i.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ========================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    DynStruct_i.h
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ========================================================================
-
-#ifndef TAO_DYNSTRUCT_I_H
-#define TAO_DYNSTRUCT_I_H
-
-#include "tao/orbconf.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#include "ace/Containers.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_Export TAO_DynStruct_i : public POA_CORBA::DynStruct
-{
-  // = TITLE
-  //    TAO_DynStruct_i
-  //
-  // = DESCRIPTION
-  //    Implementation of Dynamic Any type for Structs
-  //
-public:
-  TAO_DynStruct_i (const CORBA_Any& any);
-  // constructor taking an Any argument
-
-  TAO_DynStruct_i (CORBA_TypeCode_ptr tc);
-  // constructor taking a typecode argument
-
-  ~TAO_DynStruct_i (void);
-  // destructor
-
-  // = Functions specific to DynStruct
-
-  CORBA::FieldName current_member_name (CORBA::Environment &ACE_TRY_ENV =
-                                          TAO_default_environment ());
-  // FieldName is IDL typedef for string
-
-  CORBA::TCKind current_member_kind (CORBA::Environment &ACE_TRY_ENV =
-                                          TAO_default_environment ());
-
-  CORBA::NameValuePairSeq *get_members (CORBA::Environment &ACE_TRY_ENV =
-                                          TAO_default_environment ());
-  // Get elements using IDL defined type NameValuePairSeq.
-
-  void set_members (const CORBA::NameValuePairSeq& value,
-                    CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
-  // Set elements using IDL defined type NameValuePairSeq.
-
-  // = Functions common to all Dynamic Any types
-
-  void assign (CORBA_DynAny_ptr dyn_any,
-               CORBA::Environment &ACE_TRY_ENV =
-                 TAO_default_environment ());
-  // Sets the value of the receiver to the value of the argument
-
-  CORBA_DynAny_ptr copy (CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
-  // Creates a copy
-
-  void destroy (CORBA::Environment &ACE_TRY_ENV =
-                  TAO_default_environment ());
-  // Makes sure the contents are disposed of correctly
-
-  void from_any (const CORBA::Any& any,
-                 CORBA::Environment &ACE_TRY_ENV =
-                   TAO_default_environment ());
-  // Assigns value from an Any argument
-
-  CORBA::Any_ptr to_any (CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
-  // Outputs contents as an Any
-
-  CORBA::TypeCode_ptr type (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  // Returns the (constant) type
-
-  CORBA_DynAny_ptr current_component (CORBA::Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ());
-  // Used in iterating through the contents
-
-  CORBA::Boolean next (CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
-  // Returns next component
-
-  CORBA::Boolean seek (CORBA::Long slot,
-                       CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
-  // Jump to component at <slot>
-
-  void rewind (CORBA::Environment &ACE_TRY_ENV =
-                 TAO_default_environment ());
-  // Makes first component the current one
-
-  // = Insert and get functions
-
-  void insert_boolean (CORBA::Boolean value,
-                       CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
-  void insert_octet (CORBA::Octet value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-  void insert_char (CORBA::Char value,
-                    CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
-  void insert_short (CORBA::Short value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-  void insert_ushort (CORBA::UShort value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
-  void insert_long (CORBA::Long value,
-                    CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
-  void insert_ulong (CORBA::ULong value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-  void insert_float (CORBA::Float value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-  void insert_double (CORBA::Double value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
-  void insert_string (const char * value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
-  void insert_reference (CORBA::Object_ptr value,
-                         CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
-  void insert_typecode (CORBA::TypeCode_ptr value,
-                        CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  void insert_longlong (CORBA::LongLong value,
-                        CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  void insert_ulonglong (CORBA::ULongLong value,
-                         CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
-  void insert_wchar (CORBA::WChar value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
-  void insert_any (const CORBA::Any& value,
-                   CORBA::Environment &ACE_TRY_ENV =
-                     TAO_default_environment ());
-  CORBA::Boolean get_boolean (CORBA::Environment &ACE_TRY_ENV =
-                                TAO_default_environment ());
-  CORBA::Octet get_octet (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Char get_char (CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
-  CORBA::Short get_short (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::UShort get_ushort (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  CORBA::Long get_long (CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  CORBA::ULong get_ulong (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Float get_float (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Double get_double (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  char *get_string (CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
-  CORBA::Object_ptr get_reference (CORBA::Environment &ACE_TRY_ENV =
-                                     TAO_default_environment ());
-  CORBA::TypeCode_ptr get_typecode (CORBA::Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ());
-  CORBA::LongLong get_longlong (CORBA::Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ());
-  CORBA::ULongLong get_ulonglong (CORBA::Environment &ACE_TRY_ENV =
-                                    TAO_default_environment ());
-  CORBA::WChar get_wchar (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Any_ptr get_any (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-
-private:
-  CORBA::TypeCode_var type_;
-  // Holds the typecode of the Struct
-
-  CORBA::Long current_index_;
-  // Index of the current component
-
-  ACE_Array_Base<CORBA_DynAny_var> da_members_;
-  // Each component is also a DynAny
-
-  TAO_DynStruct_i (void);
-  // Must be instantiated with at least a typecode
-
-  // = Use copy() or assign() instead of these
-  TAO_DynStruct_i (const TAO_DynStruct_i &src);
-  TAO_DynStruct_i &operator= (const TAO_DynStruct_i &src);
-};
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#endif /* TAO_DYNSTRUCT_I_H */
diff --git a/TAO/tao/DynUnion_i.cpp b/TAO/tao/DynUnion_i.cpp
deleted file mode 100644
index c241308ca64..00000000000
--- a/TAO/tao/DynUnion_i.cpp
+++ /dev/null
@@ -1,2222 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ====================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    DynUnion_i.cpp
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ====================================================================
-
-#include "tao/DynAny_i.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#include "tao/DynUnion_i.h"
-#include "tao/InconsistentTypeCodeC.h"
-
-// Constructors and destructor
-
-TAO_DynUnion_i::TAO_DynUnion_i (const CORBA_Any& any)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      int tk = TAO_DynAny_i::unalias (any.type (),
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (tk == CORBA::tk_union)
-        {
-          // Initialize the typecode holder
-          this->type_ = any.type ();
-
-          this->set_from_any (any, 
-                              ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-      else
-        {
-          ACE_THROW (CORBA_ORB_InconsistentTypeCode ());
-        }
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-TAO_DynUnion_i::TAO_DynUnion_i (CORBA_TypeCode_ptr tc)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      int tk = TAO_DynAny_i::unalias (tc,
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (tk == CORBA::tk_union)
-        {
-          // Initialize the typecode holder
-          this->type_ = CORBA::TypeCode::_duplicate (tc);
-
-          CORBA::TypeCode_ptr disc_tc = tc->discriminator_type (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          // Get a typecode into the discriminator holder.
-          this->discriminator_ = TAO_DynAny_i::create_dyn_any (disc_tc,
-                                                               ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          // To be filled in by from_any() or assign().
-          this->member_ = 0;
-        }
-      else
-        {
-          ACE_THROW (CORBA_ORB_InconsistentTypeCode ());
-        }
-    }
-  ACE_CATCHANY
-    {
-      // do nothing
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-TAO_DynUnion_i::~TAO_DynUnion_i (void)
-{
-}
-
-// Functions specific to DynUnion
-
-// If an invalid value has been passed in to the discriminator, we
-// don't save it but instead set the member index to the default
-// value, if one exists.
-
-CORBA::Boolean
-TAO_DynUnion_i::set_as_default (CORBA::Environment& ACE_TRY_ENV)
-{
-  if ((CORBA::Long) this->current_index_ == this->type_->default_index (ACE_TRY_ENV))
-    return 1;
-  else
-    return 0;
-}
-
-void
-TAO_DynUnion_i::set_as_default (CORBA::Boolean set_as_default,
-                                CORBA::Environment&)
-{
-  // Set_as_default should be treated as read-only and
-  // probably will be in a future spec. For now, since
-  // the IDL compiler generated the virtual function,
-  // we override it as a no-op.
-}
-
-CORBA_DynAny_ptr
-TAO_DynUnion_i::discriminator (CORBA::Environment &)
-{
-  return this->discriminator_.in ();
-}
-
-CORBA::TCKind
-TAO_DynUnion_i::discriminator_kind (CORBA::Environment& ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr tc = this->type_->discriminator_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::tk_null);
-
-  CORBA::TCKind retval = TAO_DynAny_i::unalias (tc,
-                                                ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::tk_null);
-
-  return retval;
-}
-
-CORBA_DynAny_ptr
-TAO_DynUnion_i::member (CORBA::Environment &)
-{
-  return this->member_.in ();
-}
-
-char*
-TAO_DynUnion_i::member_name (CORBA::Environment& ACE_TRY_ENV)
-{
-  const char *retval = this->type_->member_name (this->current_index_,
-                                                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return CORBA::string_dup (retval);
-}
-
-// If a valid member name is supplied, this function creates a new
-// member which is NOT initialized.
-
-void
-TAO_DynUnion_i::member_name (const char* member_name,
-                             CORBA::Environment& ACE_TRY_ENV)
-{
-  CORBA::ULong count =
-    this->type_->member_count (ACE_TRY_ENV);
-
-  for (CORBA::ULong i = 0;
-       i < count;
-       i++)
-    {
-      const char *temp = this->type_->member_name (i,
-                                                   ACE_TRY_ENV);
-      ACE_CHECK;
-
-      if (!ACE_OS::strcmp (member_name, 
-                           temp))
-        {
-          // No sense doing anything if we're just "resetting" to the
-          // current member.
-          if (i == this->current_index_)
-            {
-              return;
-            }
-          else
-            {
-              CORBA_TypeCode_ptr member_type = 
-                this->type_->member_type (i,
-                                          ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->member_ =
-                TAO_DynAny_i::create_dyn_any (member_type,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr disc_any = 
-                this->type_->member_label (i,
-                                           ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*disc_any,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->current_index_ = i;
-              return;
-            }
-        }
-    }
-}
-
-CORBA::TCKind
-TAO_DynUnion_i::member_kind (CORBA::Environment& ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr tc = this->type_->member_type (this->current_index_,
-                                                    ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::tk_null);
-
-  CORBA::TCKind retval = TAO_DynAny_i::unalias (tc,
-                                                ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::tk_null);
-
-  return retval;
-}
-
-// Common functions
-
-void
-TAO_DynUnion_i::assign (CORBA_DynAny_ptr dyn_any,
-                        CORBA::Environment &ACE_TRY_ENV)
-{
-  // *dyn_any->to_any raises Invalid if arg is bad.
-  CORBA_TypeCode_ptr tc = dyn_any->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::Boolean equal = this->type_->equal (tc,
-                                             ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (equal)
-    {
-      CORBA_Any_ptr any_ptr = dyn_any->to_any (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->from_any (*any_ptr,
-                      ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::Invalid ());
-    }
-}
-
-CORBA_DynAny_ptr
-TAO_DynUnion_i::copy (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_Any_ptr a = this->to_any (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-  CORBA_DynAny_ptr retval = 
-    TAO_DynAny_i::create_dyn_any (*a,
-                                  ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-
-  return retval;
-}
-
-void
-TAO_DynUnion_i::destroy (CORBA::Environment &ACE_TRY_ENV)
-{
-  // Free the two DynAnys.
-  this->member_->destroy (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->discriminator_->destroy (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // Free the top level
-  delete this;
-}
-
-void
-TAO_DynUnion_i::from_any (const CORBA_Any& any,
-                          CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Boolean equal = this->type_.in ()->equal (any.type (),
-                                                   ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (equal)
-    {
-      this->set_from_any (any,
-                          ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (CORBA_DynAny::Invalid ());
-    }
-}
-
-CORBA::Any_ptr
-TAO_DynUnion_i::to_any (CORBA::Environment& ACE_TRY_ENV)
-{
-  // Both Dynanys must have been initialied.
-  if (this->member_.in () == 0
-      || this->discriminator_.in () == 0)
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        0);
-    }
-
-  TAO_OutputCDR out_cdr;
-
-  // Add the discriminator to the CDR stream.
-
-  CORBA_TypeCode_ptr disc_tc =
-    this->discriminator_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  CORBA_Any_var disc_any =
-    this->discriminator_->to_any (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  ACE_Message_Block *disc_mb =
-    disc_any->_tao_get_cdr ();
-
-  TAO_InputCDR disc_cdr (disc_mb);
-
-  out_cdr.append (disc_tc,
-                  &disc_cdr,
-                  ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  // Add the member to the CDR stream.
-
-  CORBA_TypeCode_ptr member_tc =
-    this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  CORBA_Any_var member_any =
-    this->member_->to_any (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  ACE_Message_Block *member_mb =
-    member_any->_tao_get_cdr ();
-
-  TAO_InputCDR member_cdr (member_mb);
-
-  out_cdr.append (member_tc,
-                  &member_cdr,
-                  ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  // Make the Any.
-  TAO_InputCDR in_cdr (out_cdr);
-
-  CORBA_Any *retval;
-  CORBA_TypeCode_ptr tc = this->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  ACE_NEW_THROW_EX (retval,
-                    CORBA_Any (tc,
-                               0,
-                               in_cdr.start ()),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  return retval;
-}
-
-CORBA::TypeCode_ptr
-TAO_DynUnion_i::type (CORBA::Environment &)
-{
-  return this->type_.in ();
-}
-
-CORBA_DynAny_ptr
-TAO_DynUnion_i::current_component (CORBA::Environment &)
-{
-  return this->member_.in ();
-}
-
-CORBA::Boolean
-TAO_DynUnion_i::next (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::ULong count = this->type_->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  if (this->current_index_ + 1 == count)
-    {
-      return 0;
-    }
-
-  ++this->current_index_;
-
-  if (!CORBA::is_nil (this->member_.in ()))
-    {
-      this->member_->destroy (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-    }
-
-  CORBA_TypeCode_ptr tc = this->type_->member_type (this->current_index_,
-                                                    ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  this->member_ =
-    TAO_DynAny_i::create_dyn_any (tc,
-                                  ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return 1;
-}
-
-CORBA::Boolean
-TAO_DynUnion_i::seek (CORBA::Long slot,
-                      CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::ULong count = this->type_->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  if (slot < 0 || slot >= (CORBA::Long) count)
-    {
-      return 0;
-    }
-
-  this->current_index_ = slot;
-
-  if (!CORBA::is_nil (this->member_.in ()))
-    {
-      this->member_->destroy (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-    }
-
-  CORBA_TypeCode_ptr tc = this->type_->member_type (this->current_index_,
-                                                    ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  this->member_ =
-    TAO_DynAny_i::create_dyn_any (tc,
-                                  ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return 1;
-}
-
-void
-TAO_DynUnion_i::rewind (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (this->current_index_ == 0)
-    return;
-
-  this->current_index_ = 0;
-
-  if (!CORBA::is_nil (this->member_.in ()))
-    {
-      this->member_->destroy (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-
-  CORBA_TypeCode_ptr tc = this->type_->member_type (this->current_index_,
-                                                    ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->member_ =
-    TAO_DynAny_i::create_dyn_any (tc,
-                                  ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-// Insert and get functions
-//
-// Note that next() is not called in the body of these functions as it is
-// with DynStruct, DynSequence and DynArray. It doesn't seem to make sense
-// for unions.
-
-// Insert functions
-
-void
-TAO_DynUnion_i::insert_boolean (CORBA::Boolean value,
-                                CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_boolean)
-    {
-      this->member_->insert_boolean (value,
-                                     ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      CORBA::ULong count =
-        this->type_->member_count (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      for (CORBA::ULong i = 0;
-           i < count;
-           i++)
-        {
-          CORBA::TypeCode_ptr tc =
-            this->type_->member_type (i,
-                                      ACE_TRY_ENV);
-          ACE_CHECK;
-
-          CORBA::TCKind try_kind = TAO_DynAny_i::unalias (tc,
-                                                          ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (try_kind == CORBA::tk_boolean)
-            {
-              this->member_ =
-                TAO_DynAny_i::create_dyn_any (tc,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->member_->insert_boolean (value,
-                                             ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr any_ptr = this->type_->member_label (i,
-                                                                 ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*any_ptr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->current_index_ = i;
-              return;
-            }
-        }
-
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynUnion_i::insert_octet (CORBA::Octet value,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_octet)
-    {
-      this->member_->insert_octet (value,
-                                   ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      CORBA::ULong count =
-        this->type_->member_count (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      for (CORBA::ULong i = 0;
-           i < count;
-           i++)
-        {
-          CORBA::TypeCode_ptr tc =
-            this->type_->member_type (i,
-                                      ACE_TRY_ENV);
-          ACE_CHECK;
-
-          CORBA::TCKind try_kind = TAO_DynAny_i::unalias (tc,
-                                                          ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (try_kind == CORBA::tk_octet)
-            {
-              this->member_ =
-                TAO_DynAny_i::create_dyn_any (tc,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->member_->insert_octet (value,
-                                           ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr any_ptr = this->type_->member_label (i,
-                                                                 ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*any_ptr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->current_index_ = i;
-              return;
-            }
-        }
-
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynUnion_i::insert_char (CORBA::Char value,
-                             CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_char)
-    {
-      this->member_->insert_char (value,
-                                  ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      CORBA::ULong count =
-        this->type_->member_count (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      for (CORBA::ULong i = 0;
-           i < count;
-           i++)
-        {
-          CORBA::TypeCode_ptr tc =
-            this->type_->member_type (i,
-                                      ACE_TRY_ENV);
-          ACE_CHECK;
-
-          CORBA::TCKind try_kind = TAO_DynAny_i::unalias (tc,
-                                                          ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (try_kind == CORBA::tk_char)
-            {
-              this->member_ =
-                TAO_DynAny_i::create_dyn_any (tc,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->member_->insert_char (value,
-                                          ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr any_ptr = this->type_->member_label (i,
-                                                                 ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*any_ptr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->current_index_ = i;
-              return;
-            }
-        }
-
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynUnion_i::insert_short (CORBA::Short value,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_short)
-    {
-      this->member_->insert_short (value,
-                                   ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      CORBA::ULong count =
-        this->type_->member_count (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      for (CORBA::ULong i = 0;
-           i < count;
-           i++)
-        {
-          CORBA::TypeCode_ptr tc =
-            this->type_->member_type (i,
-                                      ACE_TRY_ENV);
-          ACE_CHECK;
-
-          CORBA::TCKind try_kind = TAO_DynAny_i::unalias (tc,
-                                                          ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (try_kind == CORBA::tk_short)
-            {
-              this->member_ =
-                TAO_DynAny_i::create_dyn_any (tc,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->member_->insert_short (value,
-                                           ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr any_ptr = this->type_->member_label (i,
-                                                                 ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*any_ptr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->current_index_ = i;
-              return;
-            }
-        }
-
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynUnion_i::insert_long (CORBA::Long value,
-                             CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_long)
-    {
-      this->member_->insert_long (value,
-                                  ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      CORBA::ULong count =
-        this->type_->member_count (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      for (CORBA::ULong i = 0;
-           i < count;
-           i++)
-        {
-          CORBA::TypeCode_ptr tc =
-            this->type_->member_type (i,
-                                      ACE_TRY_ENV);
-          ACE_CHECK;
-
-          CORBA::TCKind try_kind = TAO_DynAny_i::unalias (tc,
-                                                          ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (try_kind == CORBA::tk_long)
-            {
-              this->member_ =
-                TAO_DynAny_i::create_dyn_any (tc,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->member_->insert_long (value,
-                                             ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr any_ptr = this->type_->member_label (i,
-                                                                 ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*any_ptr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->current_index_ = i;
-              return;
-            }
-        }
-
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynUnion_i::insert_ushort (CORBA::UShort value,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_ushort)
-    {
-      this->member_->insert_ushort (value,
-                                    ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      CORBA::ULong count =
-        this->type_->member_count (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      for (CORBA::ULong i = 0;
-           i < count;
-           i++)
-        {
-          CORBA::TypeCode_ptr tc =
-            this->type_->member_type (i,
-                                      ACE_TRY_ENV);
-          ACE_CHECK;
-
-          CORBA::TCKind try_kind = TAO_DynAny_i::unalias (tc,
-                                                          ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (try_kind == CORBA::tk_ushort)
-            {
-              this->member_ =
-                TAO_DynAny_i::create_dyn_any (tc,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->member_->insert_ushort (value,
-                                            ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr any_ptr = this->type_->member_label (i,
-                                                                 ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*any_ptr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->current_index_ = i;
-              return;
-            }
-        }
-
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynUnion_i::insert_ulong (CORBA::ULong value,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_ulong)
-    {
-      this->member_->insert_ulong (value,
-                                     ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      CORBA::ULong count =
-        this->type_->member_count (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      for (CORBA::ULong i = 0;
-           i < count;
-           i++)
-        {
-          CORBA::TypeCode_ptr tc =
-            this->type_->member_type (i,
-                                      ACE_TRY_ENV);
-          ACE_CHECK;
-
-          CORBA::TCKind try_kind = TAO_DynAny_i::unalias (tc,
-                                                          ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (try_kind == CORBA::tk_ulong)
-            {
-              this->member_ =
-                TAO_DynAny_i::create_dyn_any (tc,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->member_->insert_ulong (value,
-                                             ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr any_ptr = this->type_->member_label (i,
-                                                                 ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*any_ptr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->current_index_ = i;
-              return;
-            }
-        }
-
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynUnion_i::insert_float (CORBA::Float value,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_float)
-    {
-      this->member_->insert_float (value,
-                                   ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      CORBA::ULong count =
-        this->type_->member_count (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      for (CORBA::ULong i = 0;
-           i < count;
-           i++)
-        {
-          CORBA::TypeCode_ptr tc =
-            this->type_->member_type (i,
-                                      ACE_TRY_ENV);
-          ACE_CHECK;
-
-          CORBA::TCKind try_kind = TAO_DynAny_i::unalias (tc,
-                                                          ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (try_kind == CORBA::tk_float)
-            {
-              this->member_ =
-                TAO_DynAny_i::create_dyn_any (tc,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->member_->insert_float (value,
-                                           ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr any_ptr = this->type_->member_label (i,
-                                                                 ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*any_ptr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->current_index_ = i;
-              return;
-            }
-        }
-
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynUnion_i::insert_double (CORBA::Double value,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_double)
-    {
-      this->member_->insert_double (value,
-                                    ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      CORBA::ULong count =
-        this->type_->member_count (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      for (CORBA::ULong i = 0;
-           i < count;
-           i++)
-        {
-          CORBA::TypeCode_ptr tc =
-            this->type_->member_type (i,
-                                      ACE_TRY_ENV);
-          ACE_CHECK;
-
-          CORBA::TCKind try_kind = TAO_DynAny_i::unalias (tc,
-                                                          ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (try_kind == CORBA::tk_double)
-            {
-              this->member_ =
-                TAO_DynAny_i::create_dyn_any (tc,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->member_->insert_double (value,
-                                             ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr any_ptr = this->type_->member_label (i,
-                                                                 ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*any_ptr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->current_index_ = i;
-              return;
-            }
-        }
-
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynUnion_i::insert_string (const char* value,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_string)
-    {
-      this->member_->insert_string (value,
-                                    ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      CORBA::ULong count =
-        this->type_->member_count (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      for (CORBA::ULong i = 0;
-           i < count;
-           i++)
-        {
-          CORBA::TypeCode_ptr tc =
-            this->type_->member_type (i,
-                                      ACE_TRY_ENV);
-          ACE_CHECK;
-
-          CORBA::TCKind try_kind = TAO_DynAny_i::unalias (tc,
-                                                          ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (try_kind == CORBA::tk_string)
-            {
-              this->member_ =
-                TAO_DynAny_i::create_dyn_any (tc,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->member_->insert_string (value,
-                                            ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr any_ptr = this->type_->member_label (i,
-                                                                 ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*any_ptr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->current_index_ = i;
-              return;
-            }
-        }
-
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynUnion_i::insert_reference (CORBA::Object_ptr value,
-                                  CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_objref)
-    {
-      this->member_->insert_reference (value,
-                                       ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      CORBA::ULong count =
-        this->type_->member_count (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      for (CORBA::ULong i = 0;
-           i < count;
-           i++)
-        {
-          CORBA::TypeCode_ptr tc =
-            this->type_->member_type (i,
-                                      ACE_TRY_ENV);
-          ACE_CHECK;
-
-          CORBA::TCKind try_kind = TAO_DynAny_i::unalias (tc,
-                                                          ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (try_kind == CORBA::tk_objref)
-            {
-              this->member_ =
-                TAO_DynAny_i::create_dyn_any (tc,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->member_->insert_reference (value,
-                                               ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr any_ptr = this->type_->member_label (i,
-                                                                 ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*any_ptr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->current_index_ = i;
-              return;
-            }
-        }
-
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynUnion_i::insert_typecode (CORBA::TypeCode_ptr value,
-                                 CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_TypeCode)
-    {
-      this->member_->insert_typecode (value,
-                                      ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      CORBA::ULong count =
-        this->type_->member_count (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      for (CORBA::ULong i = 0;
-           i < count;
-           i++)
-        {
-          CORBA::TypeCode_ptr tc =
-            this->type_->member_type (i,
-                                      ACE_TRY_ENV);
-          ACE_CHECK;
-
-          CORBA::TCKind try_kind = TAO_DynAny_i::unalias (tc,
-                                                          ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (try_kind == CORBA::tk_TypeCode)
-            {
-              this->member_ =
-                TAO_DynAny_i::create_dyn_any (tc,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->member_->insert_typecode (value,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr any_ptr = this->type_->member_label (i,
-                                                                 ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*any_ptr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->current_index_ = i;
-              return;
-            }
-        }
-
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynUnion_i::insert_longlong (CORBA::LongLong value,
-                                 CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_longlong)
-    {
-      this->member_->insert_longlong (value,
-                                      ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      CORBA::ULong count =
-        this->type_->member_count (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      for (CORBA::ULong i = 0;
-           i < count;
-           i++)
-        {
-          CORBA::TypeCode_ptr tc =
-            this->type_->member_type (i,
-                                      ACE_TRY_ENV);
-          ACE_CHECK;
-
-          CORBA::TCKind try_kind = TAO_DynAny_i::unalias (tc,
-                                                          ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (try_kind == CORBA::tk_longlong)
-            {
-              this->member_ =
-                TAO_DynAny_i::create_dyn_any (tc,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->member_->insert_longlong (value,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr any_ptr = this->type_->member_label (i,
-                                                                 ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*any_ptr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->current_index_ = i;
-              return;
-            }
-        }
-
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynUnion_i::insert_ulonglong (CORBA::ULongLong value,
-                                  CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_ulonglong)
-    {
-      this->member_->insert_ulonglong (value,
-                                       ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      CORBA::ULong count =
-        this->type_->member_count (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      for (CORBA::ULong i = 0;
-           i < count;
-           i++)
-        {
-          CORBA::TypeCode_ptr tc =
-            this->type_->member_type (i,
-                                      ACE_TRY_ENV);
-          ACE_CHECK;
-
-          CORBA::TCKind try_kind = TAO_DynAny_i::unalias (tc,
-                                                          ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (try_kind == CORBA::tk_ulonglong)
-            {
-              this->member_ =
-                TAO_DynAny_i::create_dyn_any (tc,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->member_->insert_ulonglong (value,
-                                               ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr any_ptr = this->type_->member_label (i,
-                                                                 ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*any_ptr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->current_index_ = i;
-              return;
-            }
-        }
-
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynUnion_i::insert_wchar (CORBA::WChar value,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_wchar)
-    {
-      this->member_->insert_wchar (value,
-                                   ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      CORBA::ULong count =
-        this->type_->member_count (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      for (CORBA::ULong i = 0;
-           i < count;
-           i++)
-        {
-          CORBA::TypeCode_ptr tc =
-            this->type_->member_type (i,
-                                      ACE_TRY_ENV);
-          ACE_CHECK;
-
-          CORBA::TCKind try_kind = TAO_DynAny_i::unalias (tc,
-                                                          ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (try_kind == CORBA::tk_wchar)
-            {
-              this->member_ =
-                TAO_DynAny_i::create_dyn_any (tc,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->member_->insert_wchar (value,
-                                           ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr any_ptr = this->type_->member_label (i,
-                                                                 ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*any_ptr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->current_index_ = i;
-              return;
-            }
-        }
-
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-void
-TAO_DynUnion_i::insert_any (const CORBA::Any& value,
-                            CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA_TypeCode_ptr type = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (type,
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_any)
-    {
-      this->member_->insert_any (value,
-                                 ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      CORBA::ULong count =
-        this->type_->member_count (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      for (CORBA::ULong i = 0;
-           i < count;
-           i++)
-        {
-          CORBA::TypeCode_ptr tc =
-            this->type_->member_type (i,
-                                      ACE_TRY_ENV);
-          ACE_CHECK;
-
-          CORBA::TCKind try_kind = TAO_DynAny_i::unalias (tc,
-                                                          ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (try_kind == CORBA::tk_any)
-            {
-              this->member_ =
-                TAO_DynAny_i::create_dyn_any (tc,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->member_->insert_any (value,
-                                         ACE_TRY_ENV);
-              ACE_CHECK;
-
-              CORBA_Any_ptr any_ptr = this->type_->member_label (i,
-                                                                 ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->discriminator_ =
-                TAO_DynAny_i::create_dyn_any (*any_ptr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-
-              this->current_index_ = i;
-              return;
-            }
-        }
-
-      ACE_THROW (CORBA_DynAny::InvalidValue ());
-    }
-}
-
-// Get functions
-
-CORBA::Boolean
-TAO_DynUnion_i::get_boolean (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Boolean retval = 0;
-
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (this->member_.in () && (kind == CORBA::tk_boolean))
-    {
-      retval = this->member_->get_boolean (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (retval);
-
-      return retval;
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        0);
-    }
-}
-
-CORBA::Octet
-TAO_DynUnion_i::get_octet (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Octet retval = 0;
-
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (this->member_.in () && (kind == CORBA::tk_octet))
-    {
-      retval = this->member_->get_octet (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (retval);
-
-      return retval;
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        0);
-    }
-}
-
-CORBA::Char
-TAO_DynUnion_i::get_char (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Char retval = 0;
-
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (this->member_.in () && (kind == CORBA::tk_char))
-    {
-      retval = this->member_->get_char (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (retval);
-
-      return retval;
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        0);
-    }
-}
-
-CORBA::Short
-TAO_DynUnion_i::get_short (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Short retval = 0;
-
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (this->member_.in () && (kind == CORBA::tk_short))
-    {
-      retval = this->member_->get_short (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (retval);
-
-      return retval;
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        0);
-    }
-}
-
-CORBA::Long
-TAO_DynUnion_i::get_long (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Long retval = 0;
-
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (this->member_.in () && (kind == CORBA::tk_long))
-    {
-      retval = this->member_->get_long (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (retval);
-
-      return retval;
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        0);
-    }
-}
-
-CORBA::UShort
-TAO_DynUnion_i::get_ushort(CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::UShort retval = 0;
-
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (this->member_.in () && (kind == CORBA::tk_ushort))
-    {
-      retval = this->member_->get_ushort (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (retval);
-
-      return retval;
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        0);
-    }
-}
-
-CORBA::ULong
-TAO_DynUnion_i::get_ulong (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::ULong retval = 0;
-
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (this->member_.in () && (kind == CORBA::tk_ulong))
-    {
-      retval = this->member_->get_ulong (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (retval);
-
-      return retval;
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        0);
-    }
-}
-
-CORBA::Float
-TAO_DynUnion_i::get_float (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Float retval = 0;
-
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (this->member_.in () && (kind == CORBA::tk_float))
-    {
-      retval = this->member_->get_float (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (retval);
-
-      return retval;
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        0);
-    }
-}
-
-CORBA::Double
-TAO_DynUnion_i::get_double (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Double retval = 0;
-
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (this->member_.in () && (kind == CORBA::tk_double))
-    {
-      retval = this->member_->get_double (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (retval);
-
-      return retval;
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        0);
-    }
-}
-
-CORBA::String
-TAO_DynUnion_i::get_string (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::String retval = 0;
-
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (this->member_.in () && (kind == CORBA::tk_string))
-    {
-      retval = this->member_->get_string (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (retval);
-
-      return retval;
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        0);
-    }
-}
-
-CORBA::TypeCode_ptr
-TAO_DynUnion_i::get_typecode (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TypeCode_ptr retval = 0;
-
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (this->member_.in () && (kind == CORBA::tk_TypeCode))
-    {
-      retval = this->member_->get_typecode (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (retval);
-
-      return retval;
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        0);
-    }
-}
-
-CORBA::Object_ptr
-TAO_DynUnion_i::get_reference (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Object_ptr retval = 0;
-
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (this->member_.in () && (kind == CORBA::tk_objref))
-    {
-      retval = this->member_->get_reference (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (retval);
-
-      return retval;
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        0);
-    }
-}
-
-CORBA::LongLong
-TAO_DynUnion_i::get_longlong (CORBA::Environment &ACE_TRY_ENV)
-{
-#if defined (ACE_LACKS_LONGLONG_T)
-  CORBA::LongLong retval = {0, 0};
-#else  /* ! ACE_LACKS_LONGLONG_T */
-  CORBA::LongLong retval = 0;
-#endif /* ! ACE_LACKS_LONGLONG_T */
-
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (this->member_.in () && (kind == CORBA::tk_longlong))
-    {
-      retval = this->member_->get_longlong (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (retval);
-
-      return retval;
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        retval);
-    }
-}
-
-CORBA::ULongLong
-TAO_DynUnion_i::get_ulonglong (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::ULongLong retval = 0;
-
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (this->member_.in () && (kind == CORBA::tk_ulonglong))
-    {
-      retval = this->member_->get_ulonglong (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (retval);
-
-      return retval;
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        0);
-    }
-}
-
-CORBA::WChar
-TAO_DynUnion_i::get_wchar (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::WChar retval = 0;
-
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (this->member_.in () && (kind == CORBA::tk_wchar))
-    {
-      retval = this->member_->get_wchar (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (retval);
-
-      return retval;
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        0);
-    }
-}
-
-CORBA::Any_ptr
-TAO_DynUnion_i::get_any (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Any_ptr retval = 0;
-
-  CORBA_TypeCode_ptr tc = this->member_->type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  CORBA::TCKind kind = TAO_DynAny_i::unalias (tc,
-                                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (this->member_.in () && (kind == CORBA::tk_any))
-    {
-      retval = this->member_->get_any (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (retval);
-
-      return retval;
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA_DynAny::Invalid (), 
-                        0);
-    }
-}
-
-// Private functions
-
-// Some specialized instantiations of the template functor defined in
-// DynUnion_i_T.cpp.
-
-CORBA::Boolean
-TAO_DynUnion_i::Boolean_extractor::check_match (const CORBA_Any &inside_any,
-                                                const CORBA_Any &outside_any)
-{
-  CORBA::Any::to_boolean member_struct (this->member_index_);
-  CORBA::Any::to_boolean arg_struct (this->arg_index_);
-
-  inside_any >>= member_struct;
-  outside_any >>= arg_struct;
-
-  return member_struct.ref_ == arg_struct.ref_;
-}
-
-CORBA::Boolean
-TAO_DynUnion_i::Char_extractor::check_match (const CORBA_Any &inside_any,
-                                             const CORBA_Any &outside_any)
-{
-  CORBA::Any::to_char member_struct (this->member_index_);
-  CORBA::Any::to_char arg_struct (this->arg_index_);
-
-  inside_any >>= member_struct;
-  outside_any >>= arg_struct;
-
-  return member_struct.ref_ == arg_struct.ref_;
-}
-
-CORBA::Boolean
-TAO_DynUnion_i::WChar_extractor::check_match (const CORBA_Any &inside_any,
-                                              const CORBA_Any &outside_any)
-{
-  CORBA::Any::to_wchar member_struct (this->member_index_);
-  CORBA::Any::to_wchar arg_struct (this->arg_index_);
-
-  inside_any >>= member_struct;
-  outside_any >>= arg_struct;
-
-  return member_struct.ref_ == arg_struct.ref_;
-}
-
-CORBA::Boolean
-TAO_DynUnion_i::Enum_extractor::check_match (const CORBA_Any &inside_any,
-                                             const CORBA_Any &outside_any)
-{
-  // Get the CDR stream of one argument...
-  ACE_Message_Block *mb = inside_any._tao_get_cdr ();
-
-  TAO_InputCDR inside_cdr (mb);
-
-  inside_cdr.read_ulong (this->member_index_);
-
-  // And of the other...
-  mb = outside_any._tao_get_cdr ();
-
-  TAO_InputCDR outside_cdr (mb);
-
-  outside_cdr.read_ulong (this->arg_index_);
-
-  return this->member_index_ == this->arg_index_;
-}
-
-// Functor factory.
-DU_Extractor_base*
-TAO_DynUnion_i::get_extractor (CORBA::TCKind kind,
-                               CORBA::Environment& ACE_TRY_ENV)
-{
-  DU_Extractor_base* retval;
-
-  switch (kind)
-    {
-    case CORBA::tk_short:
-      ACE_NEW_THROW_EX (retval,
-                        DU_Extractor<CORBA::Short>,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (0);
-      return retval;
-    case CORBA::tk_long:
-      ACE_NEW_THROW_EX (retval,
-                        DU_Extractor<CORBA::Long>,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (0);
-      return retval;
-    case CORBA::tk_ushort:
-      ACE_NEW_THROW_EX (retval,
-                        DU_Extractor<CORBA::UShort>,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (0);
-      return retval;
-    case CORBA::tk_ulong:
-      ACE_NEW_THROW_EX (retval,
-                        DU_Extractor<CORBA::ULong>,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (0);
-      return retval;
-    case CORBA::tk_boolean:
-      ACE_NEW_THROW_EX (retval,
-                        Boolean_extractor,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (0);
-      return retval;
-    case CORBA::tk_char:
-      ACE_NEW_THROW_EX (retval,
-                        Char_extractor,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (0);
-      return retval;
-
-      // For platforms without native 64-bit ints . . .
-#if !defined (ACE_LACKS_LONGLONG_T)
-    case CORBA::tk_longlong:
-      ACE_NEW_THROW_EX (retval,
-                        DU_Extractor<CORBA::LongLong>,
-                        CORBA::NO_MEMORY ());
-
-      ACE_CHECK_RETURN (0);
-      return retval;
-#endif /* ACE_LACKS_LONGLONG_T */
-
-    case CORBA::tk_ulonglong:
-      ACE_NEW_THROW_EX (retval,
-                        DU_Extractor<CORBA::ULongLong>,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (0);
-      return retval;
-    case CORBA::tk_wchar:
-      ACE_NEW_THROW_EX (retval,
-                        WChar_extractor,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (0);
-      return retval;
-    case CORBA::tk_enum:
-      ACE_NEW_THROW_EX (retval,
-                        Enum_extractor,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (0);
-      return retval;
-    default:
-      return 0;
-    }
-}
-
-// This code is common to from_any and the constructor taking an Any
-// argument.
-void
-TAO_DynUnion_i::set_from_any (const CORBA_Any& any,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  // Get the CDR stream of the argument.
-  ACE_Message_Block* mb = any._tao_get_cdr ();
-
-  TAO_InputCDR cdr (mb);
-
-  CORBA_TypeCode_ptr disc_tc = 
-    any.type ()->discriminator_type (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA_Any disc_any (disc_tc,
-                      0,
-                      cdr.start ());
-
-  if (!CORBA::is_nil (this->discriminator_.in ()))
-    {
-      this->discriminator_->destroy (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-
-  // Set the discriminator holder.
-  this->discriminator_ = TAO_DynAny_i::create_dyn_any (disc_any,
-                                                       ACE_TRY_ENV);
-  ACE_CHECK;
-
-  cdr.skip (disc_tc);
-
-  CORBA::ULong count = any.type ()->member_count (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::ULong i;
-  CORBA::Long default_index = -1;
-
-  CORBA::TCKind discriminator_kind = disc_tc->kind (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  DU_Extractor_base* functor =
-    this->get_extractor (discriminator_kind,
-                         ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // Get the index.
-  for (i = 0; i < count; i++)
-    {
-      CORBA_Any label_any = *any.type ()->member_label (i,
-                                                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      CORBA::TCKind label_kind = label_any.type ()->kind (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      // If there is a default index, note the value but don't call
-      // check_match.
-      if (label_kind == CORBA::tk_octet)
-        {
-          default_index = i;
-          continue;
-        }
-      // Check if values match.
-      else if (functor->check_match (disc_any,
-                                     label_any))
-        {
-          this->current_index_ = i;
-          break;
-        }
-    }
-
-  delete functor;
-
-  if (i == count && default_index == -1)
-    {
-      ACE_THROW (CORBA_DynAny::Invalid ());
-    }
-  else
-    {
-      if (i == count && default_index != -1)
-        {
-          this->current_index_ = default_index;
-        }
-
-      CORBA::TypeCode_ptr member_tc =
-        any.type ()->member_type (this->current_index_,
-                                  ACE_TRY_ENV);
-      ACE_CHECK;
-
-      CORBA_Any member_any (member_tc,
-                            0,
-                            cdr.start ());
-
-      if (!CORBA::is_nil (this->member_.in ()))
-        {
-          this->member_->destroy (ACE_TRY_ENV);
-          ACE_CHECK;
-        }
-
-      this->member_ =
-        TAO_DynAny_i::create_dyn_any (member_any,
-                                      ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class DU_Extractor<CORBA::Short>;
-template class DU_Extractor<CORBA::Long>;
-template class DU_Extractor<CORBA::UShort>;
-template class DU_Extractor<CORBA::ULong>;
-
-// For platforms without native 64-bit ints . . .
-#if !defined (ACE_LACKS_LONGLONG_T)
-template class DU_Extractor<CORBA::LongLong>;
-#endif /* ACE_LACKS_LONGLONG_T */
-
-template class DU_Extractor<CORBA::ULongLong>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate DU_Extractor<CORBA::Short>
-#pragma instantiate DU_Extractor<CORBA::Long>
-#pragma instantiate DU_Extractor<CORBA::UShort>
-#pragma instantiate DU_Extractor<CORBA::ULong>
-
-// For platforms without native 64-bit ints . . .
-#if !defined (ACE_LACKS_LONGLONG_T)
-#pragma instantiate DU_Extractor<CORBA::LongLong>
-#endif /* ACE_LACKS_LONGLONG_T */
-
-#pragma instantiate DU_Extractor<CORBA::ULongLong>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/DynUnion_i.h b/TAO/tao/DynUnion_i.h
deleted file mode 100644
index 738fa7aa308..00000000000
--- a/TAO/tao/DynUnion_i.h
+++ /dev/null
@@ -1,285 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ========================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    DynUnion_i.h
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ========================================================================
-
-#ifndef TAO_DYNUNION_I_H
-#define TAO_DYNUNION_I_H
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#include "tao/DynUnion_i_T.h"
-
-class TAO_Export TAO_DynUnion_i : public POA_CORBA::DynUnion
-{
-  // = TITLE
-  //    TAO_DynUnion_i
-  //
-  // = DESCRIPTION
-  //    Implementation of Dynamic Any type for Unions.
-public:
-  TAO_DynUnion_i (const CORBA_Any& any);
-  // constructor taking an Any argument
-
-  TAO_DynUnion_i (CORBA_TypeCode_ptr tc);
-  // constructor taking a typecode argument
-
-  ~TAO_DynUnion_i (void);
-  // destructor
-
-  // = Functions specific to DynUnion
-
-  CORBA::Boolean set_as_default (CORBA::Environment &ACE_TRY_ENV =
-                                   TAO_default_environment ());
-  // Does union have a default member?
-
-  void set_as_default (CORBA::Boolean set_as_default,
-                       CORBA::Environment& ACE_TRY_ENV =
-                         TAO_default_environment ());
-  // Makes default member (if any) the active menber
-
-  CORBA_DynAny_ptr discriminator (CORBA::Environment& ACE_TRY_ENV =
-                                    TAO_default_environment ());
-  // Returns the discriminator (which is a DynAny)
-
-  CORBA::TCKind discriminator_kind (CORBA::Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ());
-  // Returns TCKind of discriminator
-
-  CORBA_DynAny_ptr member (CORBA::Environment &ACE_TRY_ENV =
-                             TAO_default_environment ());
-  // Returns active member
-
-  // = Get and set for member name
-
-  char *member_name (CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-  void member_name (const char* member_name,
-                    CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
-
-  CORBA::TCKind member_kind (CORBA::Environment &ACE_TRY_ENV =
-                               TAO_default_environment ());
-  // Returns TCKind of active member
-
-  // Functions common to all Dynamic Any types
-
-  void assign (CORBA_DynAny_ptr dyn_any,
-               CORBA::Environment &ACE_TRY_ENV =
-                 TAO_default_environment ());
-  // Sets the value of the receiver to the value of the argument
-
-  CORBA_DynAny_ptr copy (CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
-  // Creates a copy
-
-  void destroy (CORBA::Environment &ACE_TRY_ENV =
-                  TAO_default_environment ());
-  // Makes sure the contents are disposed of correctly
-
-  void from_any (const CORBA::Any& any,
-                 CORBA::Environment &ACE_TRY_ENV =
-                   TAO_default_environment ());
-  // Assigns value from an Any argument
-
-  CORBA::Any_ptr to_any (CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
-  // Outputs contents as an Any
-
-  CORBA::TypeCode_ptr type (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  // Returns the (constant) type
-
-  CORBA_DynAny_ptr current_component (CORBA::Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ());
-  // Used in iterating through the contents
-
-  CORBA::Boolean next (CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
-  // Returns next component
-
-  CORBA::Boolean seek (CORBA::Long slot,
-                       CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
-  // Jump to component at <slot>
-
-  void rewind (CORBA::Environment &ACE_TRY_ENV =
-                 TAO_default_environment ());
-  // Makes first component the current one
-
-  // Insert and get functions
-
-  void insert_boolean (CORBA::Boolean value,
-                       CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
-  void insert_octet (CORBA::Octet value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-  void insert_char (CORBA::Char value,
-                    CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
-  void insert_short (CORBA::Short value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-  void insert_ushort (CORBA::UShort value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
-  void insert_long (CORBA::Long value,
-                    CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
-  void insert_ulong (CORBA::ULong value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-  void insert_float (CORBA::Float value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-  void insert_double (CORBA::Double value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
-  void insert_string (const char * value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
-  void insert_reference (CORBA::Object_ptr value,
-                         CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
-  void insert_typecode (CORBA::TypeCode_ptr value,
-                        CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  void insert_longlong (CORBA::LongLong value,
-                        CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  void insert_ulonglong (CORBA::ULongLong value,
-                         CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
-  void insert_wchar (CORBA::WChar value,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
-  void insert_any (const CORBA::Any& value,
-                   CORBA::Environment &ACE_TRY_ENV =
-                     TAO_default_environment ());
-  CORBA::Boolean get_boolean (CORBA::Environment &ACE_TRY_ENV =
-                                TAO_default_environment ());
-  CORBA::Octet get_octet (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Char get_char (CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  CORBA::Short get_short (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::UShort get_ushort (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  CORBA::Long get_long (CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-  CORBA::ULong get_ulong (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Float get_float (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Double get_double (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  char *get_string (CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
-  CORBA::Object_ptr get_reference (CORBA::Environment &ACE_TRY_ENV =
-                                     TAO_default_environment ());
-  CORBA::TypeCode_ptr get_typecode (CORBA::Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ());
-  CORBA::LongLong get_longlong (CORBA::Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ());
-  CORBA::ULongLong get_ulonglong (CORBA::Environment &ACE_TRY_ENV =
-                                    TAO_default_environment ());
-  CORBA::WChar get_wchar (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  CORBA::Any_ptr get_any (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-
-private:
-  CORBA_DynAny_var member_;
-
-  CORBA_DynAny_var discriminator_;
-
-  CORBA::TypeCode_var type_;
-  // Holds the typecode of the Union
-
-  CORBA::ULong current_index_;
-  // Index of the active member
-
-  TAO_DynUnion_i (void);
-  // Must be instantiated with at least a typecode
-
-  // Use copy() or assign() instead of these
-  TAO_DynUnion_i (const TAO_DynUnion_i &src);
-  TAO_DynUnion_i &operator= (const TAO_DynUnion_i &src);
-
-  // Some specialized instantiations of template class (defined in
-  // DynUnion_i_T.h)
-
-  class Boolean_extractor : public DU_Extractor_base
-  {
-  public:
-    CORBA::Boolean check_match (const CORBA_Any &inside_any,
-                                const CORBA_Any &outsice_any);
-  private:
-    CORBA::Boolean arg_index_;
-    CORBA::Boolean member_index_;
-  };
-
-  class Char_extractor : public DU_Extractor_base
-  {
-  public:
-    CORBA::Boolean check_match (const CORBA_Any &inside_any,
-                                const CORBA_Any &outside_any);
-  private:
-    CORBA::Char arg_index_;
-    CORBA::Char member_index_;
-  };
-
-  class WChar_extractor : public DU_Extractor_base
-  {
-  public:
-    CORBA::Boolean check_match (const CORBA_Any &inside_any,
-                                const CORBA_Any &outside_any);
-  private:
-    CORBA::WChar arg_index_;
-    CORBA::WChar member_index_;
-  };
-
-  class Enum_extractor : public DU_Extractor_base
-  {
-  public:
-    CORBA::Boolean check_match (const CORBA_Any &inside_any,
-                                const CORBA_Any &outside_any);
-  private:
-    CORBA::ULong arg_index_;
-    CORBA::ULong member_index_;
-  };
-
-  DU_Extractor_base* get_extractor (CORBA::TCKind kind,
-                                    CORBA::Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ());
-  // Returns a pointer to the correct extractor class.
-
-  void set_from_any (const CORBA_Any& any,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-  // Code common to the constructor from an Any arg and the member
-  // function from_any().
-};
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#endif /* TAO_DYNUNION_I_H */
diff --git a/TAO/tao/DynUnion_i_T.cpp b/TAO/tao/DynUnion_i_T.cpp
deleted file mode 100644
index d333840f89f..00000000000
--- a/TAO/tao/DynUnion_i_T.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ========================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    DynUnion_i_T.cpp
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ========================================================================
-
-#ifndef TAO_DYNUNION_I_T_C
-#define TAO_DYNUNION_I_T_C
-
-#include "tao/DynUnion_i_T.h"
-#include "tao/Any.h"
-
-// Method of template class that serves as a functor for all that
-// compares Anys constructed from all legal discriminator types - some
-// are specifically defined in DynUnion_i.cpp.
-
-template <class Type>
-DU_Extractor<Type>::~DU_Extractor (void)
-{
-}
-
-template <class Type>
-CORBA::Boolean
-DU_Extractor<Type>::check_match (const CORBA_Any &inside_any,
-                                 const CORBA_Any &outside_any)
-{
-  inside_any >>= this->member_index_;
-  outside_any >>= this->arg_index_;
-  return this->member_index_ == this->arg_index_;
-}
-
-#endif /* TAO_DYNUNION_I_T_C */
diff --git a/TAO/tao/DynUnion_i_T.h b/TAO/tao/DynUnion_i_T.h
deleted file mode 100644
index 548c487ffa5..00000000000
--- a/TAO/tao/DynUnion_i_T.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// $Id$
-
-// ====================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    DynUnion_i_T.h
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ====================================================================
-
-#ifndef TAO_DYNUNION_I_T_H
-#define TAO_DYNUNION_I_T_H
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class DU_Extractor_base
-{
-  // = TITLE
-  //    DU_Extractor_base
-  //
-  // = DESCRIPTION
-  //    Base class of template class below
-  //
-public:
-  virtual CORBA::Boolean check_match (const CORBA_Any &inside_any,
-                                      const CORBA_Any &outside_any) = 0;
-};
-
-template <class Type>
-class DU_Extractor : public DU_Extractor_base
-{
-  // = TITLE
-  //    DU_Extractor
-  //
-  // = DESCRIPTION
-  //    Template class functor to compare Anys in TAO_DynUnion_i
-  //    constructor with an Any arg and member function from_any().
-  //    Some compilers won't accept these eclarations inside
-  //    TAO_DynUnion_i or even at global scope in the same file.
-  //
-public:
-  virtual ~DU_Extractor (void);
-
-  virtual CORBA::Boolean check_match (const CORBA_Any& inside_any,
-                                      const CORBA_Any& outside_any);
-private:
-  Type arg_index_;
-  Type member_index_;
-};
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/DynUnion_i_T.cpp"
-// On Win32 platforms, this code will be included as template source
-// code and will not be inlined. Therefore, we first turn off
-// ACE_INLINE, set it to be nothing, include the code, and then turn
-// ACE_INLINE back to its original setting. All this nonsense is
-// necessary, since the generic template code that needs to be
-// specialized cannot be inlined, else the compiler will ignore the
-// specialization code. Also, the specialization code *must* be
-// inlined or the compiler will ignore the specializations.
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("DynUnion_i_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* TAO_DYNUNION_I_T_H */
diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp
deleted file mode 100644
index bdd144703c3..00000000000
--- a/TAO/tao/Environment.cpp
+++ /dev/null
@@ -1,267 +0,0 @@
-// $Id$
-
-#include "tao/Environment.h"
-#include "tao/ORB_Core.h"
-#include "tao/Exception.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Environment.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(tao, Environment, "$Id$")
-
-#if 0
-CORBA_Environment::CORBA_Environment (void)
-  : exception_ (0),
-    previous_ (TAO_ORB_Core_instance ()->default_environment ())
-{
-  TAO_ORB_Core_instance ()->default_environment (this);
-}
-
-CORBA_Environment::CORBA_Environment (const CORBA_Environment& rhs)
-  : exception_ (rhs.exception_),
-    previous_ (TAO_ORB_Core_instance ()->default_environment ())
-{
-  TAO_ORB_Core_instance ()->default_environment (this);
-  exception_->_incr_refcnt ();
-}
-
-CORBA_Environment::CORBA_Environment (TAO_ORB_Core* orb_core)
-  : exception_ (0),
-    previous_ (orb_core->default_environment ())
-{
-  orb_core->default_environment (this);
-}
-
-#else
-
-CORBA_Environment::CORBA_Environment (void)
-  : exception_ (0),
-    previous_ (0),
-    refcount_ (1)
-{
-  //  TAO_ORB_Core_instance ()->default_environment (this);
-}
-
-CORBA_Environment::CORBA_Environment (const CORBA_Environment& rhs)
-  : exception_ (rhs.exception_),
-    previous_ (0),
-    refcount_ (1)
-{
-  //  TAO_ORB_Core_instance ()->default_environment (this);
-  if (this->exception_)
-    this->exception_->_incr_refcnt ();
-}
-
-CORBA_Environment::CORBA_Environment (TAO_ORB_Core* orb_core)
-  : exception_ (0),
-    previous_ (orb_core->default_environment ())
-{
-  orb_core->default_environment (this);
-}
-#endif /* 0 */
-
-CORBA::ULong
-CORBA_Environment::_incr_refcnt (void)
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0);
-  return refcount_++;
-}
-
-CORBA::ULong
-CORBA_Environment::_decr_refcnt (void)
-{
-  {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0);
-
-    this->refcount_--;
-    if (this->refcount_ != 0)
-      return this->refcount_;
-  }
-
-  delete this;
-  return 0;
-}
-
-CORBA_Environment&
-CORBA_Environment::operator= (const CORBA_Environment& rhs)
-{
-  if (this != &rhs)
-    {
-      this->clear ();
-      this->exception (rhs.exception_);
-    }
-  return *this;
-}
-
-CORBA_Environment::~CORBA_Environment (void)
-{
-  this->clear ();
-
-  // If previous is 0 then this is the first Environment, allocated
-  // with the ORB, it shouldn't try to pop because the ORB is beign
-  // destroyed also.
-  if (this->previous_ != 0)
-    TAO_ORB_Core_instance ()->default_environment (this->previous_);
-}
-
-void
-CORBA_Environment::exception (CORBA_Exception *ex)
-{
-  if (ex != this->exception_)
-    {
-      this->clear ();
-      this->exception_ = ex;
-    }
-  if (this->exception_ != 0)
-    {
-      this->exception_->_incr_refcnt ();
-#if defined (TAO_HAS_EXCEPTIONS)
-      this->exception_->_raise ();
-#endif /* TAO_HAS_EXCEPTIONS */
-    }
-}
-
-void
-CORBA_Environment::clear (void)
-{
-  if (this->exception_)
-    this->exception_->_decr_refcnt ();
-
-  this->exception_ = 0;
-}
-
-CORBA_Environment&
-CORBA_Environment::default_environment ()
-{
-#if defined (TAO_HAS_EXCEPTIONS)
-  //
-  // If we are using native C++ exceptions the user is *not* supposed
-  // to clear the environment every time she calls into TAO, in fact
-  // the user is not supposed to use the environment at all!
-  //
-  // But TAO is using the default environment internally, thus
-  // somebody has to clear it. Since TAO passes the environment around
-  // this function should only be called when going from the user code
-  // into TAO's code.
-  //
-  // This is not an issue when using the alternative C++ mapping (with
-  // the Environment argument) because then the user is supposed to
-  // clear the environment before calling into the ORB.
-  //
-  TAO_ORB_Core_instance ()->default_environment ()->clear ();
-#endif /* TAO_HAS_EXCEPTIONS */
-
-  return CORBA::default_environment ();
-}
-
-// Convenience -- say if the exception is a system exception or not.
-
-int
-CORBA::Environment::exception_type (void) const
-{
-  // @@ Carlos, is this stuff that's properly "transformed" for EBCDIC
-  //    platforms?!
-  // @@ Doug: Yes, they are used to compare against the _id() of the
-  //    exception, which should have been mappend to the native
-  //    codeset.  Notice the "should" we haven't tried that stuff yet,
-  //    and i find it hard to keep track of all the transformations
-  //    going on, specially for the TypeCodes that are generated by
-  //    the IDL compiler vs. the ones hard-coded in
-  //    $TAO_ROOT/tao/Typecode_Constants.cpp
-
-  static char sysex_prefix [] = "IDL:omg.org/CORBA/";
-  static char typecode_extra [] = "TypeCode/";
-  static char poa_prefix [] = "IDL:PortableServer/";
-
-  if (!this->exception_)
-    return CORBA::NO_EXCEPTION;
-
-  // All exceptions currently (CORBA 2.0) defined in the CORBA scope
-  // are system exceptions ... except for a couple that are related to
-  // TypeCodes.
-
-  const char *id = this->exception_->_id ();
-
-  if ((ACE_OS::strncmp (id,
-                        sysex_prefix,
-                        sizeof sysex_prefix - 1) == 0
-       && ACE_OS::strncmp (id + sizeof sysex_prefix - 1,
-                           typecode_extra,
-                           sizeof typecode_extra - 1) != 0)
-      || ACE_OS::strncmp (id,
-                          poa_prefix,
-                          sizeof poa_prefix - 1) == 0)
-    return CORBA::SYSTEM_EXCEPTION;
-  else
-    return CORBA::USER_EXCEPTION;
-}
-
-const char*
-CORBA_Environment::exception_id (void) const
-{
-  if (this->exception_ == 0)
-    return 0;
-
-  return this->exception_->_id ();
-}
-
-// Diagnostic utility routine: describe the exception onto the
-// standard I/O stream passed as a parameter.
-
-void
-CORBA::Environment::print_exception (const char *info,
-                                     FILE *) const
-{
-  if (this->exception_)
-    {
-      const char *id = this->exception_->_id ();
-
-      ACE_DEBUG ((LM_ERROR,
-                  "TAO: (%P|%t) EXCEPTION, %s\n",
-                  info));
-
-      CORBA::SystemException *x2 =
-        CORBA_SystemException::_narrow (this->exception_);
-
-      if (x2 != 0)
-        x2->_tao_print_system_exception ();
-      else
-        // @@ we can use the exception's typecode to dump all the data
-        // held within it ...
-
-        ACE_DEBUG ((LM_ERROR,
-                    "TAO: (%P|%t) user exception, ID '%s'\n",
-                    id));
-    }
-  else
-    ACE_DEBUG ((LM_ERROR,
-                "TAO: (%P|%t) no exception, %s\n", info));
-}
-
-CORBA_Environment_var &
-CORBA_Environment_var::operator= (CORBA_Environment_ptr p)
-{
-  if (this->ptr_ != p)
-  {
-    if (this->ptr_ != 0)
-    delete (this->ptr_);
-
-    this->ptr_ = p;
-  }
-  return *this;
-}
-
-CORBA_Environment_var &
-CORBA_Environment_var::operator= (const CORBA_Environment_var &r)
-{
-  if (this->ptr_ != 0)
-    {
-      delete this->ptr_;
-      this->ptr_ = 0;
-    }
-
-  ACE_NEW_RETURN (this->ptr_,
-                  CORBA::Environment (*r.ptr_), *this);
-  return *this;
-}
diff --git a/TAO/tao/Environment.h b/TAO/tao/Environment.h
deleted file mode 100644
index d3641c158f6..00000000000
--- a/TAO/tao/Environment.h
+++ /dev/null
@@ -1,197 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   Environment.h
-//
-// = DESCRIPTION
-//   Declare the CORBA_Environment class.  Note that this header file
-//   only requires a few forward declarations of CORBA classes, this
-//   is *very* important because even the ORB needs to know about it;
-//   make your changes with care.  It is also a good idea trying to
-//   minimize cross dependencies between header files.
-//
-// = AUTHOR
-//   Carlos O'Ryan <coryan@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_ENVIRONMENT_H
-#define TAO_ENVIRONMENT_H
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_ORB_Core;
-
-class TAO_Export CORBA_Environment
-{
-  // = TITLE
-  //   CORBA_Environment
-  //
-  // = DESCRIPTION
-  //   A CORBA_Environment is a way to automagically ensure that
-  //   exception data is freed -- the "var" class for Exceptions.  It
-  //   adds just a bit of convenience function support, helping
-  //   classify exceptions as well as reducing memory leakage.
-  //
-  //   The thread has a default environment to simplify porting
-  //   between platforms that support native C++ exceptions and those
-  //   that don't. This is a TSS resource (always), but with a twist:
-  //   if the user creates a new environment the old one is "pushed"
-  //   (actually the new one remembers it), eventually the new
-  //   environment destructor pops itself from the stack and we
-  //   recover the old environment.  This means that if the user
-  //   create a new environment and somebody calls a function using
-  //   the default one the exception will still be received in the
-  //   environment created by the user.  The only drawback is that
-  //   environments life time must nest properly, this shouldn't be a
-  //   problem because environments are usually created on the stack,
-  //   but, the spec allows their creation on the heap and/or as class
-  //   members; we need to investigate the tradeoffs and take a
-  //   decision.
-public:
-  // = Initialization and termination methods.
-  CORBA_Environment (void);
-  // The default constructor, the environment will hold no exceptions.
-
-  CORBA_Environment (const CORBA_Environment &ACE_TRY_ENV);
-  // Copy constructor.
-
-  CORBA_Environment &operator=(const CORBA_Environment &ACE_TRY_ENV);
-  // Assingment.
-
-  ~CORBA_Environment (void);
-  // Destructor, release the exception.
-
-  static CORBA_Environment * _duplicate (CORBA_Environment *);
-  static CORBA_Environment * _nil (void);
-  // Some static methods that need to be defined in every pseudo object
-
-  CORBA_Exception* exception (void) const;
-  // Return the exception.  Caller must call <_incr_refcnf> in order
-  // to keep the ptr.
-
-  void exception (CORBA_Exception *ex);
-  // Set the exception to <ex>, taking a reference on it.
-
-  int exception_type (void) const;
-  // Return if the exception is a user exception or a system
-  // exception.
-
-  const char *exception_id (void) const;
-  // return the repository ID for the exception.
-
-  void clear (void);
-  // Clear the exception.
-
-  void print_exception (const char *info,
-                        FILE *f=stdout) const;
-  // Print the exception to output determined by f.  This function is
-  // not CORBA compliant.
-
-  // = Obtain a default environment to use with TAO.
-  static CORBA_Environment &default_environment (void);
-
-  // = Reference counting.
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_Environment_ptr _ptr_type;
-  typedef CORBA_Environment_var _var_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
-private:
-
-  friend class TAO_ORB_Core;
-  CORBA_Environment (TAO_ORB_Core *orb_core);
-  // Initialize using a well known ORB Core; this is intended for the
-  // bootstraping of the ORB_Core, not for general consumption.
-
-  CORBA_Exception *exception_;
-  // Pointer to the exception object contained in the environment.
-
-  CORBA_Environment *previous_;
-  // The previous environment on the "default environment stack".
-
-  CORBA::ULong refcount_;
-  // Reference counting.
-
-  ACE_SYNCH_MUTEX refcount_lock_;
-  // Protect the reference count.
-};
-
-class TAO_Export CORBA_Environment_var
-{
-  // = TITLE
-  //   CORBA_Environment_var
-  //
-  // = DESCRIPTION
-  //   Provide for automatic storage deallocation on going out of
-  //   scope.
-public:
-  CORBA_Environment_var (void);
-  // default constructor
-  CORBA_Environment_var (CORBA_Environment_ptr);
-  CORBA_Environment_var (const CORBA_Environment_var &);
-  // copy constructor
-  ~CORBA_Environment_var (void);
-  // destructor
-
-  CORBA_Environment_var &operator= (CORBA_Environment_ptr);
-  CORBA_Environment_var &operator= (const CORBA_Environment_var &);
-  CORBA_Environment_ptr operator-> (void) const;
-
-  operator const CORBA_Environment_ptr &() const;
-  operator CORBA_Environment_ptr &();
-  // in, inout, out, _retn
-  CORBA_Environment_ptr in (void) const;
-  CORBA_Environment_ptr &inout (void);
-  CORBA_Environment_ptr &out (void);
-  CORBA_Environment_ptr _retn (void);
-  CORBA_Environment_ptr ptr (void) const;
-
-private:
-  CORBA_Environment_ptr ptr_;
-};
-
-class TAO_Export CORBA_Environment_out
-{
-  // = TITLE
-  //   CORBA_Environment_out
-  //
-  // = DESCRIPTION
-  //   The _out class for CORBA_Environment. This is used to help in
-  //   managing the out parameters.
-public:
-  CORBA_Environment_out (CORBA_Environment_ptr &);
-  CORBA_Environment_out (CORBA_Environment_var &);
-  CORBA_Environment_out (const CORBA_Environment_out &);
-  CORBA_Environment_out &operator= (const CORBA_Environment_out &);
-  CORBA_Environment_out &operator= (CORBA_Environment_ptr);
-  operator CORBA_Environment_ptr &();
-  CORBA_Environment_ptr &ptr (void);
-  CORBA_Environment_ptr operator-> (void);
-
-private:
-  CORBA_Environment_ptr &ptr_;
-
-  CORBA_Environment_out &operator= (const CORBA_Environment_var &);
-  // Assignment from _var not allowed.
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Environment.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_ENVIRONMENT_H */
diff --git a/TAO/tao/Environment.i b/TAO/tao/Environment.i
deleted file mode 100644
index 68b8940a38f..00000000000
--- a/TAO/tao/Environment.i
+++ /dev/null
@@ -1,165 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-ACE_INLINE CORBA::Boolean
-CORBA::is_nil (CORBA::Environment_ptr env)
-{
-  return env == 0;
-}
-
-ACE_INLINE void
-CORBA::release (CORBA::Environment_ptr env)
-{
-  if (env)
-    env->_decr_refcnt ();
-}
-
-ACE_INLINE CORBA_Exception*
-CORBA_Environment::exception (void) const
-{
-  return this->exception_;
-}
-
-ACE_INLINE CORBA_Environment *
-CORBA_Environment::_duplicate (CORBA_Environment *x)
-{
-  if (x != 0)
-    x->_incr_refcnt ();
-  return x;
-}
-
-ACE_INLINE CORBA_Environment_ptr
-CORBA_Environment::_nil (void)
-{
-  return (CORBA_Environment_ptr)0;
-}
-
-// Inline operations for class CORBA_Environment_var
-
-ACE_INLINE
-CORBA_Environment_var::CORBA_Environment_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA_Environment_var::CORBA_Environment_var (CORBA_Environment_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA_Environment_ptr
-CORBA_Environment_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Environment_var::CORBA_Environment_var (const CORBA_Environment_var &p)
-  : ptr_ (new CORBA_Environment (*p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_Environment_var::~CORBA_Environment_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Environment_var::operator const CORBA_Environment_ptr &() const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Environment_var::operator CORBA_Environment_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Environment_ptr
-CORBA_Environment_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Environment_ptr
-CORBA_Environment_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Environment_ptr &
-CORBA_Environment_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Environment_ptr &
-CORBA_Environment_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Environment_ptr
-CORBA_Environment_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_Environment_ptr val = this->ptr_;
-  this->ptr_ = 0;
-  return val;
-}
-
-// Inline operations for class CORBA_Environment_out
-
-ACE_INLINE
-CORBA_Environment_out::CORBA_Environment_out (CORBA_Environment_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_Environment_out::CORBA_Environment_out (CORBA_Environment_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_Environment_out::CORBA_Environment_out (const CORBA_Environment_out &p)
-  : ptr_ (p.ptr_)
-{}
-
-ACE_INLINE CORBA_Environment_out &
-CORBA_Environment_out::operator= (const CORBA_Environment_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_Environment_out &
-CORBA_Environment_out::operator= (CORBA_Environment_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_Environment_out::operator CORBA_Environment_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Environment_ptr &
-CORBA_Environment_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Environment_ptr
-CORBA_Environment_out::operator-> (void)
-{
-  return this->ptr_;
-}
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
deleted file mode 100644
index c5e438fa3a7..00000000000
--- a/TAO/tao/Exception.cpp
+++ /dev/null
@@ -1,953 +0,0 @@
-// $Id$
-
-// THREADING NOTE:  calling thread handles mutual exclusion policy
-// on all of these data structures.
-
-#include "tao/Exception.h"
-#include "tao/Typecode.h"
-#include "tao/Environment.h"
-#include "tao/Any.h"
-#include "tao/CDR.h"
-
-#if defined(ACE_MVS)
-#include "ace/Codeset_IBM1047.h"
-#endif /* ACE_MVS */
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Exception.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(tao, Exception, "$Id$")
-
-// Static initializers.
-
-CORBA::ExceptionList *TAO_Exceptions::system_exceptions;
-ACE_Allocator *TAO_Exceptions::global_allocator_;
-
-// TAO specific typecode
-extern CORBA::TypeCode_ptr TC_completion_status;
-
-// ****************************************************************
-
-CORBA_Exception::CORBA_Exception (CORBA::TypeCode_ptr tc)
-  : type_ (CORBA::TypeCode::_duplicate (tc)),
-    refcount_ (0)
-{
-  ACE_ASSERT (this->type_ != 0);
-}
-
-CORBA_Exception::CORBA_Exception (const CORBA_Exception &src)
-  : type_ (CORBA::TypeCode::_duplicate (src.type_)),
-    refcount_ (0)
-{
-  ACE_ASSERT (this->type_ != 0);
-}
-
-// NOTE: It's this code, not anything defined in a subclass, which is
-// responsible for releasing any storage owned by the exception.  It
-// can do this because it's got the typecode.
-
-CORBA_Exception::CORBA_Exception (void)
-  :  type_ (0),
-     refcount_ (0)
-{
-}
-
-CORBA_Exception::~CORBA_Exception (void)
-{
-  ACE_ASSERT (this->refcount_ == 0);
-  ACE_ASSERT (this->type_ != 0);
-}
-
-CORBA_Exception &
-CORBA_Exception::operator= (const CORBA_Exception &src)
-{
-  if (this->type_)
-    CORBA::release (this->type_);
-  this->type_ = CORBA::TypeCode::_duplicate (src.type_);
-  ACE_ASSERT (this->type_ != 0);
-
-  return *this;
-}
-
-const char *
-CORBA_Exception::_id (void) const
-{
-  CORBA::Environment env;
-
-  if (this->type_)
-    return this->type_->id (env);
-  else
-    return 0;
-}
-
-CORBA::TypeCode_ptr
-CORBA_Exception::_type (void) const
-{
-  return this->type_;
-}
-
-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
-{
-  ACE_DEBUG ((LM_ERROR,
-              "(%P|%t) EXCEPTION, %s\n"
-              "%s\n",
-              user_provided_info,
-              this->_info ().c_str ()));
-}
-
-ACE_CString
-CORBA_Exception::_info (void) const
-{
-  CORBA::SystemException *system_exception =
-    CORBA_SystemException::_narrow (ACE_const_cast (CORBA_Exception *,
-                                                    this));
-
-  if (system_exception != 0)
-    return system_exception->_info ();
-
-  // @@ we can use the exception's typecode to dump all the data held
-  // within it ...
-
-  ACE_CString user_exception_info = "user exception, ID '";
-  user_exception_info += this->_id ();
-  user_exception_info += "'";
-  return user_exception_info;
-}
-
-CORBA::ULong
-CORBA_Exception::_incr_refcnt (void)
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0);
-  return ++this->refcount_;
-}
-
-CORBA::ULong
-CORBA_Exception::_decr_refcnt (void)
-{
-  {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0);
-    this->refcount_--;
-    if (this->refcount_ != 0)
-      return this->refcount_;
-
-    // release the lock before destroying the object.
-  }
-
-  delete this;
-  return 0;
-}
-
-// Avoid zillions of not-quite-inlined copies of utilities.
-
-CORBA_UserException::CORBA_UserException (void)
-{
-}
-
-CORBA_UserException::CORBA_UserException (CORBA::TypeCode_ptr tc)
-  : CORBA_Exception (tc)
-{
-}
-
-CORBA_UserException::~CORBA_UserException (void)
-{
-}
-
-CORBA_UserException &
-CORBA_UserException::operator= (const CORBA_UserException &src)
-{
-  this->CORBA_Exception::operator= (src);
-  return *this;
-}
-
-void
-CORBA_UserException::_raise (void)
-{
-  TAO_RAISE (*this);
-}
-
-int
-CORBA_UserException::_is_a (const char* interface_id) const
-{
-  return ACE_OS::strcmp (interface_id,
-                         "IDL:omg.org/CORBA/UserException:1.0") == 0
-    || CORBA_Exception::_is_a (interface_id);
-}
-
-CORBA_UserException*
-CORBA_UserException::_narrow (CORBA_Exception* exception)
-{
-  if (exception->_is_a ("IDL:omg.org/CORBA/UserException:1.0"))
-    return ACE_dynamic_cast (CORBA_UserException *,
-                             exception);
-  return 0;
-}
-
-CORBA_SystemException::CORBA_SystemException (void)
-{
-}
-
-CORBA_SystemException::CORBA_SystemException (CORBA::TypeCode_ptr tc,
-                                              CORBA::ULong code,
-                                              CORBA::CompletionStatus completed)
-  : CORBA_Exception (tc),
-    minor_ (code),
-    completed_ (completed)
-{
-}
-
-CORBA_SystemException::CORBA_SystemException (const CORBA_SystemException &src)
-  : CORBA_Exception (src),
-    minor_ (src.minor_),
-    completed_ (src.completed_)
-{
-}
-
-CORBA_SystemException::~CORBA_SystemException (void)
-{
-}
-
-CORBA_SystemException &
-CORBA_SystemException::operator= (const CORBA_SystemException &src)
-{
-  this->CORBA_Exception::operator= (src);
-
-  this->minor_ = src.minor_;
-  this->completed_ = src.completed_;
-
-  return *this;
-}
-
-int
-CORBA_SystemException::_is_a (const char* interface_id) const
-{
-  return ACE_OS::strcmp (interface_id,
-                         "IDL:omg.org/CORBA/SystemException:1.0") == 0
-    || CORBA_Exception::_is_a (interface_id);
-}
-
-CORBA_SystemException*
-CORBA_SystemException::_narrow (CORBA_Exception* exception)
-{
-  if (exception->_is_a ("IDL:omg.org/CORBA/SystemException:1.0"))
-    return ACE_dynamic_cast (CORBA_SystemException *,
-                             exception);
-  return 0;
-}
-
-void
-CORBA_SystemException::_raise (void)
-{
-  TAO_RAISE (*this);
-}
-
-CORBA::ULong
-CORBA_SystemException::_tao_errno (int errno_value)
-{
-  switch (errno_value)
-    {
-    case 0:
-      return TAO_UNSPECIFIED_MINOR_CODE;
-    case ETIMEDOUT:
-      return TAO_ETIMEDOUT_MINOR_CODE;
-    case ENFILE:
-      return TAO_ENFILE_MINOR_CODE;
-    case EMFILE:
-      return TAO_EMFILE_MINOR_CODE;
-    case EPIPE:
-      return TAO_EPIPE_MINOR_CODE;
-    case ECONNREFUSED:
-      return TAO_ECONNREFUSED_MINOR_CODE;
-    case ENOENT:
-      return TAO_ENOENT_MINOR_CODE;
-    case EBADF:
-      return TAO_EBADF_MINOR_CODE;
-#if (ENOSYS != EFAULT)
-    case ENOSYS:
-      return TAO_ENOSYS_MINOR_CODE;
-#endif /* ENOSYS != EFAULT */
-    case EPERM:
-      return TAO_EPERM_MINOR_CODE;
-    case EAFNOSUPPORT:
-      return TAO_EAFNOSUPPORT_MINOR_CODE;
-    case EAGAIN:
-      return TAO_EAGAIN_MINOR_CODE;
-    case ENOMEM:
-      return TAO_ENOMEM_MINOR_CODE;
-    case EACCES:
-      return TAO_EACCES_MINOR_CODE;
-    case EFAULT:
-      return TAO_EFAULT_MINOR_CODE;
-    case EBUSY:
-      return TAO_EBUSY_MINOR_CODE;
-    case EEXIST:
-      return TAO_EEXIST_MINOR_CODE;
-    default:
-      // Mask off bottom 7 bits and return them.
-      return errno_value & 0x7F;
-    }
-}
-
-CORBA::ULong
-CORBA_SystemException::_tao_minor_code (u_int location,
-                                        int errno_value)
-{
-  return
-    TAO_DEFAULT_MINOR_CODE
-    | location
-    | _tao_errno (errno_value);
-}
-
-void
-CORBA_SystemException::_tao_print_system_exception (FILE *) const
-{
-  ACE_DEBUG ((LM_ERROR,
-              "(%P|%t) system exception, ID '%s'\n",
-              this->_info ().c_str ()));
-}
-
-ACE_CString
-CORBA_SystemException::_info (void) const
-{
-  // @@ there are a other few "user exceptions" in the CORBA scope,
-  // they're not all standard/system exceptions ... really need to
-  // either compare exhaustively against all those IDs (yeech) or
-  // (preferably) to represent the exception type directly in the
-  // exception value so it can be queried.
-
-  ACE_CString info = "system exception, ID '";
-  info += this->_id ();
-  info += "'\n";
-
-  CORBA::ULong VMCID =
-    this->minor () & 0xFFFFF000u;
-
-  if (VMCID == TAO_DEFAULT_MINOR_CODE)
-    {
-      const char *location;
-      switch (this->minor () & 0x00000F80u)
-        {
-        case TAO_INVOCATION_CONNECT_MINOR_CODE:
-          location = "invocation connect failed";
-          break;
-        case TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE:
-          location = "location forward failed";
-          break;
-        case TAO_INVOCATION_SEND_REQUEST_MINOR_CODE:
-          location = "send request failed";
-          break;
-        case TAO_POA_DISCARDING:
-          location = "poa in discarding state";
-          break;
-        case TAO_POA_HOLDING:
-          location = "poa in holding state";
-          break;
-        case TAO_UNHANDLED_SERVER_CXX_EXCEPTION:
-          location = "unhandled c++ exception in server side";
-          break;
-        case TAO_INVOCATION_RECV_REQUEST_MINOR_CODE:
-          location = "failed to recv request response";
-          break;
-        case TAO_CONNECTOR_REGISTRY_NO_USABLE_PROTOCOL:
-          location = "all protocols failed to parse the IOR";
-          break;
-        case TAO_NULL_POINTER_MINOR_CODE:
-          location = "attempt to use null pointer";
-          break;
-        case TAO_MPROFILE_CREATION_ERROR:
-          location = "error during MProfile creation";
-          break;
-        case TAO_TIMEOUT_CONNECT_MINOR_CODE:
-          location = "timeout during connect";
-          break;
-        case TAO_TIMEOUT_SEND_MINOR_CODE:
-          location = "timeout during send";
-          break;
-        case TAO_TIMEOUT_RECV_MINOR_CODE:
-          location = "timeout during recv";
-          break;
-        default:
-          location = "unknown location";
-        }
-
-      const char *errno_indication;
-      char unknown_errno [32];
-      switch (this->minor () & 0x7FU)
-        {
-        case TAO_UNSPECIFIED_MINOR_CODE:
-          errno_indication = "unspecified errno";
-          break;
-        case TAO_ETIMEDOUT_MINOR_CODE:
-          errno_indication = "ETIMEOUT";
-          break;
-        case TAO_ENFILE_MINOR_CODE:
-          errno_indication = "ENFILE";
-          break;
-        case TAO_EMFILE_MINOR_CODE:
-          errno_indication = "EMFILE";
-          break;
-        case TAO_EPIPE_MINOR_CODE:
-          errno_indication = "EPIPE";
-          break;
-        case TAO_ECONNREFUSED_MINOR_CODE:
-          errno_indication = "ECONNREFUSED";
-          break;
-        case TAO_ENOENT_MINOR_CODE:
-          errno_indication = "ENOENT";
-          break;
-        case TAO_EBADF_MINOR_CODE:
-          errno_indication = "EBADF";
-          break;
-        case TAO_ENOSYS_MINOR_CODE:
-          errno_indication = "ENOSYS";
-          break;
-        case TAO_EPERM_MINOR_CODE:
-          errno_indication = "EPERM";
-          break;
-        case TAO_EAFNOSUPPORT_MINOR_CODE:
-          errno_indication = "EAFNOSUPPORT";
-          break;
-        case TAO_EAGAIN_MINOR_CODE:
-          errno_indication = "EAGAIN";
-          break;
-        case TAO_ENOMEM_MINOR_CODE:
-          errno_indication = "ENOMEM";
-          break;
-        case TAO_EACCES_MINOR_CODE:
-          errno_indication = "EACCES";
-          break;
-        case TAO_EFAULT_MINOR_CODE:
-          errno_indication = "EFAULT";
-          break;
-        case TAO_EBUSY_MINOR_CODE:
-          errno_indication = "EBUSY";
-          break;
-        case TAO_EEXIST_MINOR_CODE:
-          errno_indication = "EEXIST";
-          break;
-        default:
-          {
-            // 7 bits of some other errno.
-            ACE_OS::sprintf (unknown_errno,
-                             "low 7 bits of errno: %3u",
-                             this->minor () & 0x7FU);
-
-            errno_indication = unknown_errno;
-          }
-        }
-
-      char buffer[BUFSIZ];
-      ACE_OS::sprintf (buffer,
-                       "TAO exception, "
-                       "minor code = %x (%s; %s), "
-                       "completed = %s\n",
-                       this->minor (),
-                       location,
-                       errno_indication,
-                       (completed () == CORBA::COMPLETED_YES) ? "YES" :
-                       (completed () == CORBA::COMPLETED_NO) ? "NO" :
-                       (completed () == CORBA::COMPLETED_MAYBE) ? "MAYBE" :
-                       "garbage");
-
-      info += buffer;
-    }
-  else
-    {
-      char buffer[BUFSIZ];
-      ACE_OS::sprintf (buffer,
-                       "non-TAO exception, "
-                       "minor code = %x, completed = %s\n",
-                       this->minor (),
-                       (completed () == CORBA::COMPLETED_YES) ? "YES" :
-                       (completed () == CORBA::COMPLETED_NO) ? "NO" :
-                       (completed () == CORBA::COMPLETED_MAYBE) ? "MAYBE" :
-                       "garbage");
-
-      info += buffer;
-    }
-
-  return info;
-}
-
-CORBA_UnknownUserException::CORBA_UnknownUserException (void)
-  : CORBA_UserException (CORBA::_tc_UnknownUserException),
-    exception_ (0)
-{
-}
-
-CORBA_UnknownUserException::CORBA_UnknownUserException (CORBA_Any &ex)
-{
-  this->exception_ = new CORBA_Any (ex);
-  if (this->exception_ == 0)
-    ACE_ERROR ((LM_ERROR,
-                "(%P|%t) Unable to copy CORBA::UnknownUerException due to memory exhaustion\n"));
-}
-
-CORBA_UnknownUserException::~CORBA_UnknownUserException (void)
-{
-  if (this->exception_ != 0)
-    delete this->exception_;
-}
-
-CORBA_Any &
-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)
-          || CORBA_UserException::_is_a (interface_id));
-}
-
-CORBA_UnknownUserException*
-CORBA_UnknownUserException::_narrow (CORBA_Exception *ex)
-{
-  if (ex->_is_a ("IDL:omg.org/CORBA/UnknownUserException:1.0"))
-    return ACE_dynamic_cast (CORBA_UnknownUserException *,
-                             ex);
-  return 0;
-}
-
-void
-CORBA_UnknownUserException::_raise (void)
-{
-  TAO_RAISE (*this);
-}
-
-// Note that "buffer" holds the (unscoped) name originally, and is
-// then overwritten.
-
-void
-TAO_Exceptions::make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp,
-                                            CORBA::Environment &ACE_TRY_ENV)
-{
-  // Create the TypeCode for the CORBA_UnknownUserException.
-
-#if defined(ACE_MVS)
-  // @@ We need to use a translator to make sure that all TypeCodes
-  // are stored in ISO8859 form, the problem is that this hack does
-  // not scale as more native sets have to be supported
-
-  ACE_IBM1047_ISO8859 translator;
-  TAO_OutputCDR stream (0,
-                        ACE_CDR_BYTE_ORDER,
-                        TAO_Exceptions::global_allocator_,
-                        TAO_Exceptions::global_allocator_,
-                        ACE_DEFAULT_CDR_MEMCPY_TRADEOFF,
-                        &translator);
-#else
-  TAO_OutputCDR stream (0,
-                        ACE_CDR_BYTE_ORDER,
-                        TAO_Exceptions::global_allocator_,
-                        TAO_Exceptions::global_allocator_,
-                        ACE_DEFAULT_CDR_MEMCPY_TRADEOFF);
-#endif /* ACE_MVS */
-
-  const char *interface_id =
-    "IDL:omg.org/CORBA/UnknownUserException:1.0";
-  const char *name = "UnknownUserException";
-  const char *field_name = "exception";
-
-  CORBA::Boolean result = stream.write_octet (TAO_ENCAP_BYTE_ORDER) == 0
-    || stream.write_string (interface_id) == 0
-    || stream.write_string (name) == 0
-    || stream.write_ulong (1L) == 0
-    || stream.write_string (field_name) == 0
-    || stream.encode (CORBA::_tc_TypeCode,
-                      &CORBA::_tc_any, 0,
-                      ACE_TRY_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE;
-  ACE_CHECK;
-
-  if (result)
-    ACE_THROW (CORBA_INITIALIZE ());
-
-  ACE_NEW_THROW_EX (tcp,
-                    CORBA::TypeCode (CORBA::tk_except,
-                                     stream.length (),
-                                     stream.buffer (),
-                                     1,
-                                     sizeof (CORBA_UserException)),
-                    CORBA_NO_MEMORY ());
-}
-
-void
-TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp,
-                                        const char *name,
-                                        char *buffer,
-                                        size_t buflen,
-                                        CORBA::Environment &ACE_TRY_ENV)
-{
-  // This function must only be called ONCE, and with a global lock
-  // held!  The <CORBA::ORB_init> method is responsible for ensuring
-  // this.
-  static const char *minor = "minor";
-  static const char *completed = "completed";
-
-  // Create a CDR stream ... juggle the alignment here a bit, we know
-  // it's good enough for the typecode.
-
-#if defined(ACE_MVS)
-  // @@ We need to use a translator to make sure that all TypeCodes
-  // are stored in ISO8859 form, the problem is that this hack does
-  // not scale as more native sets have to be supported
-
-  ACE_IBM1047_ISO8859 translator;
-  TAO_OutputCDR stream (buffer, buflen,
-                        ACE_CDR_BYTE_ORDER,
-                        TAO_Exceptions::global_allocator_,
-                        TAO_Exceptions::global_allocator_,
-                        ACE_DEFAULT_CDR_MEMCPY_TRADEOFF,
-                        &translator);
-#else
-  TAO_OutputCDR stream (buffer, buflen,
-                        ACE_CDR_BYTE_ORDER,
-                        TAO_Exceptions::global_allocator_,
-                        TAO_Exceptions::global_allocator_,
-                        ACE_DEFAULT_CDR_MEMCPY_TRADEOFF);
-#endif /* ACE_MVS */
-
-  // into CDR stream, stuff (in order):
-  //    - byte order flag [4 bytes]
-  //    - exception ID [27 + N bytes]
-  //    - exception name [4 + N bytes ]
-  //    - number of members (2) [4 bytes ]
-  //    - foreach member, { name string, typecode } [~40 bytes]
-
-  const char prefix[] = "IDL:omg.org/CORBA/";
-  const char suffix[] = ":1.0";
-  char *full_id =
-    CORBA::string_alloc (sizeof prefix
-                         + ACE_OS::strlen (name)
-                         + sizeof suffix);
-
-  ACE_OS::strcpy (full_id, prefix);
-  ACE_OS::strcat (full_id, name);
-  ACE_OS::strcat (full_id, suffix);
-
-  CORBA::Boolean result = stream.write_octet (TAO_ENCAP_BYTE_ORDER) == 0
-    || stream.write_string (full_id) == 0
-    || stream.write_string (name) == 0
-    || stream.write_ulong (2L) != 1
-    || stream.write_string (minor) == 0
-    || stream.encode (CORBA::_tc_TypeCode,
-                      &CORBA::_tc_ulong, 0,
-                      ACE_TRY_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE;
-  ACE_CHECK; // @@ Maybe we should transform this exception
-
-  result = result || stream.write_string (completed) == 0
-    || stream.encode (CORBA::_tc_TypeCode,
-                      &TC_completion_status, 0,
-                      ACE_TRY_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE;
-  ACE_CHECK; // @@ Maybe we should transform this exception
-
-  if (result)
-    ACE_THROW (CORBA::INITIALIZE ());
-
-  // @@ It is possible to throw an exception at this point?
-  //    What if the exception typecode has not been initialized yet?
-
-  CORBA::string_free (full_id);
-
-  // OK, we stuffed the buffer we were given (or grew a bigger one;
-  // hope to avoid that during initialization).  Now build and return
-  // a TypeCode, saving it away in the list of ones that the ORB will
-  // always accept as part of any operation response!
-
-  ACE_NEW_THROW_EX (tcp,
-                    CORBA::TypeCode (CORBA::tk_except,
-                                     stream.length (),
-                                     stream.buffer (),
-                                     1,
-                                     sizeof (CORBA_SystemException)),
-                    CORBA_NO_MEMORY ());
-
-  TAO_Exceptions::system_exceptions->add (tcp);
-
-  ACE_ASSERT (tcp->length_ <= buflen);
-  return;
-}
-
-// List of standard/system exceptions ... used to create static
-// storage for their typecodes, then later to initialize that storage
-// using the routine above. (It's just too painful to init these
-// typecodes statically in all cases!)
-
-#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)
-
-// Declare static storage for these ... the buffer is "naturally"
-// aligned and overwritten.
-//
-// @@ this actually doesn't guarantee "natural" alignment, but
-// it works that way in most systems.
-
-#define TAO_TC_BUF_LEN 256
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-    static CORBA::Long tc_buf_##name[TAO_TC_BUF_LEN/sizeof(CORBA::Long)]; \
-    TAO_NAMESPACE_TYPE(CORBA::TypeCode_ptr) \
-    TAO_NAMESPACE_BEGIN (CORBA) \
-    TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_##name, 0) \
-    TAO_NAMESPACE_END
-  STANDARD_EXCEPTION_LIST
-#undef  TAO_SYSTEM_EXCEPTION
-#undef TAO_TC_BUF_LEN
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UnknownUserException, 0)
-TAO_NAMESPACE_END
-
-void
-TAO_Exceptions::init (CORBA::Environment &ACE_TRY_ENV)
-{
-  // This routine should only be called once.
-  // Initialize the start up allocator.
-  ACE_NEW (TAO_Exceptions::global_allocator_,
-           ACE_New_Allocator);
-
-  // Initialize the list of system exceptions, used when unmarshaling.
-  ACE_NEW (TAO_Exceptions::system_exceptions,
-           CORBA::ExceptionList);
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-  TAO_Exceptions::make_standard_typecode (CORBA::_tc_ ## name, \
-                                          #name, \
-                                          (char*)tc_buf_##name, \
-                                          sizeof(tc_buf_##name), \
-                                          ACE_TRY_ENV); \
-  ACE_CHECK;
-  STANDARD_EXCEPTION_LIST
-#undef  TAO_SYSTEM_EXCEPTION
-
-  TAO_Exceptions::make_unknown_user_typecode (CORBA::_tc_UnknownUserException,
-                                              ACE_TRY_ENV);
-}
-
-CORBA_SystemException *
-TAO_Exceptions::create_system_exception (const char *id,
-                                         CORBA::Environment &ACE_TRY_ENV)
-{
-#define TAO_SYSTEM_EXCEPTION(name) \
-  { \
-    const char* xid = CORBA::_tc_ ## name ->id (ACE_TRY_ENV); \
-    ACE_CHECK_RETURN (0); \
-    if (ACE_OS::strcmp (id, xid) == 0) \
-      return new CORBA:: name; \
-  }
-  STANDARD_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
-
-  return 0;
-}
-
-void
-TAO_Exceptions::fini (void)
-{
-  delete TAO_Exceptions::system_exceptions;
-#define TAO_SYSTEM_EXCEPTION(name) \
-  CORBA::release (CORBA::_tc_ ## name); \
-  CORBA::_tc_ ## name = 0;
-  STANDARD_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
-
-  delete CORBA::_tc_UnknownUserException;
-  delete TAO_Exceptions::global_allocator_;
-}
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-int \
-CORBA_##name ::_is_a (const char* interface_id) const \
-{ \
-  return ((ACE_OS::strcmp (interface_id, "IDL:omg.org/CORBA/" #name ":1.0")==0) \
-          || CORBA_SystemException::_is_a (interface_id)); \
-}
-STANDARD_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-CORBA_##name * \
-CORBA_##name ::_narrow (CORBA_Exception* exception) \
-{ \
-  if (exception->_is_a ("IDL:omg.org/CORBA/" #name ":1.0")) \
-    return ACE_dynamic_cast (CORBA_##name *, exception); \
-  return 0; \
-}
-STANDARD_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-void \
-CORBA_##name ::_raise (void) \
-{ \
-  TAO_RAISE (*this); \
-}
-STANDARD_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-CORBA_##name :: CORBA_##name (void) \
-  :  CORBA_SystemException (CORBA::_tc_ ## name, \
-                            TAO_DEFAULT_MINOR_CODE, \
-                            CORBA::COMPLETED_NO) \
-{ \
-}
-STANDARD_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
-
-#undef STANDARD_EXCEPTION_LIST
-
-CORBA_ExceptionList::CORBA_ExceptionList (CORBA::ULong len,
-                                          CORBA::TypeCode_ptr *tc_list)
-  : ref_count_ (1)
-{
-  for (CORBA::ULong i = 0;
-       i < len;
-       i++)
-    this->add (tc_list [i]);
-}
-
-CORBA_ExceptionList::~CORBA_ExceptionList (void)
-{
-  for (CORBA::ULong i = 0;
-       i < this->count ();
-       ++i)
-    {
-      CORBA::TypeCode_ptr *tc;
-
-      if (this->tc_list_.get (tc, i) == -1)
-        return;
-
-      CORBA::release (*tc);
-    }
-}
-
-void
-CORBA_ExceptionList::add (CORBA::TypeCode_ptr tc)
-{
-  this->tc_list_.enqueue_tail (CORBA::TypeCode::_duplicate (tc));
-}
-
-void
-CORBA_ExceptionList::add_consume (CORBA::TypeCode_ptr tc)
-{
-  this->tc_list_.enqueue_tail (tc);
-}
-
-CORBA::TypeCode_ptr
-CORBA_ExceptionList::item (CORBA::ULong slot,
-                           CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TypeCode_ptr *tc;
-
-  if (this->tc_list_.get (tc,
-                          slot) == -1)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-  else
-    return CORBA::TypeCode::_duplicate (*tc);
-}
-
-void
-CORBA_ExceptionList::remove (CORBA::ULong, CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
-}
-
-CORBA_ExceptionList_ptr
-CORBA_ExceptionList::_duplicate (void)
-{
-  ++this->ref_count_;
-  return this;
-}
-
-void
-CORBA_ExceptionList::_destroy (void)
-{
-  CORBA::ULong current = --this->ref_count_;
-
-  if (current == 0)
-    delete this;
-}
-
-void
-CORBA_ExceptionList::_incr_refcnt (void)
-{
-  this->ref_count_++;
-}
-
-void
-CORBA_ExceptionList::_decr_refcnt (void)
-{
-  this->ref_count_--;
-  if (this->ref_count_ == 0)
-    delete this;
-
-}
-
-
-#if defined (TAO_DONT_CATCH_DOT_DOT_DOT)
-TAO_DONT_CATCH::TAO_DONT_CATCH (void)
-{}
-#endif /* TAO_DONT_CATCH_DOT_DOT_DOT */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Node<CORBA::TypeCode_ptr>;
-template class ACE_Unbounded_Queue<CORBA::TypeCode_ptr>;
-template class ACE_Unbounded_Queue_Iterator<CORBA::TypeCode_ptr>;
-template class ACE_Atomic_Op<ACE_SYNCH_MUTEX, CORBA::ULong>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Node<CORBA::TypeCode_ptr>
-#pragma instantiate ACE_Unbounded_Queue<CORBA::TypeCode_ptr>
-#pragma instantiate ACE_Unbounded_Queue_Iterator<CORBA::TypeCode_ptr>
-#pragma instantiate ACE_Atomic_Op<ACE_SYNCH_MUTEX, CORBA::ULong>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h
deleted file mode 100644
index 92eff500cf8..00000000000
--- a/TAO/tao/Exception.h
+++ /dev/null
@@ -1,491 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    except.h
-//
-// = DESCRIPTION
-//     This file defines way in which CORBA exceptions are reported.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//
-// ============================================================================
-
-#ifndef TAO_EXCEPTION_H
-#define TAO_EXCEPTION_H
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// This is used in the implementation of the _raise methods
-#if defined (TAO_HAS_EXCEPTIONS)
-#define TAO_RAISE(EXCEPTION) throw EXCEPTION
-#else
-#define TAO_RAISE(EXCEPTION)
-#endif /* TAO_HAS_EXCEPTIONS */
-
-class CORBA_Any;
-
-class TAO_Export CORBA_Exception
-{
-  // = TITLE
-  //   CORBA_Exception
-  //
-  // = DESCRIPTION
-  //   CORBA2-specified exception hierarchy.  All exceptions have a
-  //   type (represented by a TypeCode) and a widely scoped type ID
-  //   (in the TypeCode) that generated by any OMG-IDL compiler and
-  //   available through the Interface Repositories.  Think of it as a
-  //   "globally scoped" name distinguishing each exception.
-public:
-  // = Initialization and termination methods.
-  CORBA_Exception (const CORBA_Exception &src);
-  // Copy constructor.
-
-  CORBA_Exception &operator = (const CORBA_Exception &src);
-  // Assignment operator.
-
-  virtual ~CORBA_Exception (void);
-  // Destructor.
-
-  // = To throw the exception (when using the standard mapping).
-  virtual void _raise (void) = 0;
-
-  // = The static narrow operation.
-  static CORBA_Exception *_narrow (CORBA_Exception *x);
-
-  // = These are TAO-specific extensions.
-
-  const char *_id (void) const;
-  // Return the repository ID of the Exception.
-
-  CORBA::TypeCode_ptr _type (void) const;
-  // Return the TypeCode corresponding to the currently stored.
-
-  // = To implement the narrow method.
-  virtual int _is_a (const char* repository_id) const;
-
-  CORBA_Exception (CORBA::TypeCode_ptr type);
-  // Constructor from a TypeCode.
-
-  void _tao_print_exception (const char *info,
-                             FILE *f = stdout) const;
-  // Print the exception <ex> to output determined by <f>.  This
-  // function is not CORBA compliant.
-
-  ACE_CString _info (void) const;
-  // Returns a string containing information about the exception. This
-  // function is not CORBA compliant.
-
-  // = Methods required for memory management support.
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
-
-protected:
-  CORBA_Exception (void);
-  // Default constructor is protected.
-
-  CORBA::TypeCode_ptr type_;
-  // Type of the Exception.
-
-private:
-  CORBA::ULong refcount_;
-  // Reference count to avoid copying overhead.
-
-  ACE_SYNCH_MUTEX refcount_lock_;
-  // Mutex to protect the reference count; though in most cases this
-  // class is used only in one thread adding a mutex here is *not*
-  // expensive, because uses of this class should never be on the
-  // critical path.
-};
-
-class TAO_Export CORBA_UserException : public CORBA_Exception
-{
-  // = TITLE
-  //   User exceptions are those defined by application developers
-  //   using OMG-IDL.
-public:
-  // = Initialization and termination methods.
-
-  CORBA_UserException (const CORBA_UserException &src);
-  // Copy ctor.
-
-  ~CORBA_UserException (void);
-  // Destructor.
-
-  CORBA_UserException &operator= (const CORBA_UserException &src);
-  // Assignment operator.
-
-  virtual void _raise (void);
-  // To throw an exception of this type.
-
-  static CORBA_UserException *_narrow (CORBA_Exception *exception);
-  // The narrow operation.
-
-  // = TAO specific extension.
-
-  CORBA_UserException (CORBA::TypeCode_ptr tc);
-  // Constructor from a TypeCode.
-
-  virtual int _is_a (const char *interface_id) const;
-  // Used for narrowing
-
-  //protected:
-  CORBA_UserException (void);
-  // Default constructor.
-};
-
-class TAO_Export CORBA_SystemException : public CORBA_Exception
-{
-  // = TITLE
-  //   CORBA_SystemException
-  //
-  // = DESCRIPTION
-  //   System exceptions are those defined in the CORBA spec; OMG-IDL
-  //   defines these.
-public:
-  // = Initialization and termination methods.
-
-  CORBA_SystemException (void);
-  // Default Ctor
-
-  CORBA_SystemException (const CORBA_SystemException &src);
-  // Copy ctor.
-
-  ~CORBA_SystemException (void);
-  // Destructor.
-
-  CORBA_SystemException &operator= (const CORBA_SystemException &src);
-  // Assignment operator.
-
-  CORBA::ULong minor (void) const;
-  // Get the minor status.
-
-  void minor (CORBA::ULong m);
-  // Set the minor status.
-
-  virtual void _raise (void);
-  // To throw an exception of this type.
-
-  CORBA::CompletionStatus completed (void) const;
-  // Get the completion status.
-
-  void completed (CORBA::CompletionStatus c);
-  // Set the operation completion status.
-
-  static CORBA_SystemException *_narrow (CORBA_Exception *exception);
-  // Narrow to a SystemException.
-
-  // = TAO-specific extension.
-
-  virtual int _is_a (const char *type_id) const;
-  // Helper for the _narrow operation.
-
-  void _tao_print_system_exception (FILE *f = stdout) const;
-  // Print the system exception <ex> to output determined by f.  This
-  // function is not CORBA compliant.
-
-  ACE_CString _info (void) const;
-  // Returns a string containing information about the exception. This
-  // function is not CORBA compliant.
-
-  static CORBA::ULong _tao_minor_code (u_int location,
-                                       int errno_value);
-  // Helper to create a minor status value.
-
-  static CORBA::ULong _tao_errno (int errno_value);
-  // Helper to translate a platform-specific errno to a TAO errno
-  // value.
-
-protected:
-  CORBA_SystemException (CORBA::TypeCode_ptr tc,
-                         CORBA::ULong code,
-                         CORBA::CompletionStatus completed);
-  // Ctor using a TypeCode.
-
-private:
-  CORBA::ULong minor_;
-  // Minor code.
-
-  CORBA::CompletionStatus completed_;
-  // Completion status.
-};
-
-// Declarations for all of the CORBA standard exceptions.
-//
-// @@ - shouldn't have a default minor code, at least for code that's
-// inside the ORB.  All minor codes should be symbolically catalogued.
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-class TAO_Export CORBA_ ## name : public CORBA_SystemException { \
-public: \
-  CORBA_ ## name (void); \
-  CORBA_ ## name (CORBA::ULong code, \
-                  CORBA::CompletionStatus completed) \
-    : CORBA_SystemException (CORBA::_tc_ ## name, code, completed) \
-    { } \
-  static CORBA_##name * _narrow (CORBA_Exception* exception); \
-  virtual int _is_a (const char* type_id) const; \
-  virtual void _raise (void); \
-}
-
-
-TAO_SYSTEM_EXCEPTION(UNKNOWN);          // the unknown exception
-TAO_SYSTEM_EXCEPTION(BAD_PARAM);        // an invalid parameter was passed
-TAO_SYSTEM_EXCEPTION(NO_MEMORY);        // memory allocation failure
-TAO_SYSTEM_EXCEPTION(IMP_LIMIT);        // violated implementation limit
-TAO_SYSTEM_EXCEPTION(COMM_FAILURE);     // communication failure
-TAO_SYSTEM_EXCEPTION(INV_OBJREF);       // invalid object reference
-TAO_SYSTEM_EXCEPTION(OBJECT_NOT_EXIST); // no such object
-TAO_SYSTEM_EXCEPTION(NO_PERMISSION);    // no permission for operation
-TAO_SYSTEM_EXCEPTION(INTERNAL);         // ORB internal error
-TAO_SYSTEM_EXCEPTION(MARSHAL);          // error marshaling param/result
-TAO_SYSTEM_EXCEPTION(INITIALIZE);       // ORB initialization failure
-TAO_SYSTEM_EXCEPTION(NO_IMPLEMENT);     // implementation unavailable
-TAO_SYSTEM_EXCEPTION(BAD_TYPECODE);     // bad typecode
-TAO_SYSTEM_EXCEPTION(BAD_OPERATION);    // invalid operation
-TAO_SYSTEM_EXCEPTION(NO_RESOURCES);     // out of resources for request
-TAO_SYSTEM_EXCEPTION(NO_RESPONSE);      // response not yet available
-TAO_SYSTEM_EXCEPTION(PERSIST_STORE);    // persistent storage failure
-TAO_SYSTEM_EXCEPTION(BAD_INV_ORDER);    // routine invocations out of order
-TAO_SYSTEM_EXCEPTION(TRANSIENT);        // transient error, try again later
-TAO_SYSTEM_EXCEPTION(FREE_MEM);         // cannot free memory
-TAO_SYSTEM_EXCEPTION(INV_IDENT);        // invalid identifier syntax
-TAO_SYSTEM_EXCEPTION(INV_FLAG);         // invalid flag was specified
-TAO_SYSTEM_EXCEPTION(INTF_REPOS);       // interface repository unavailable
-TAO_SYSTEM_EXCEPTION(BAD_CONTEXT);      // error processing context object
-TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER);      // object adapter failure
-TAO_SYSTEM_EXCEPTION(DATA_CONVERSION);  // data conversion error
-TAO_SYSTEM_EXCEPTION(INV_POLICY);       // invalid policy override
-TAO_SYSTEM_EXCEPTION(REBIND);
-TAO_SYSTEM_EXCEPTION(TIMEOUT);
-TAO_SYSTEM_EXCEPTION(TRANSACTION_UNAVAILABLE);
-TAO_SYSTEM_EXCEPTION(TRANSACTION_MODE);
-TAO_SYSTEM_EXCEPTION(TRANSACTION_REQUIRED);   // operation needs transaction
-TAO_SYSTEM_EXCEPTION(TRANSACTION_ROLLEDBACK); // operation was a no-op
-TAO_SYSTEM_EXCEPTION(INVALID_TRANSACTION);    // invalid TP context passed
-
-#undef TAO_SYSTEM_EXCEPTION
-
-class TAO_Export CORBA_UnknownUserException : public CORBA_UserException
-{
-  // = TITLE
-  //   CORBA_UnknownUserException
-  //
-  // = DESCRIPTION
-  //   When user exceptions are received by a DII invocation the ORB
-  //   is unable to create the exception with the right dynamic type;
-  //   to workaround this problem it throws a
-  //   <CORBA::UnknownUserException> that contains the exception inside
-  //   an Any.
-public:
-  // = Initialization and termination methods.
-  CORBA_UnknownUserException (void);
-  // Constructor.
-
-  CORBA_UnknownUserException (CORBA_Any& exception);
-  // Destructor.
-
-  virtual ~CORBA_UnknownUserException (void);
-  // Constructor.
-
-  CORBA_Any& exception (void);
-  // Return the any containing the user exception.
-
-  virtual void _raise (void);
-  // To throw an UnknownUserException of this type.
-
-  static CORBA_UnknownUserException *_narrow (CORBA_Exception *ex);
-  // Narrow to an UnknowUserException
-
-  // = TAO specific extension.
-
-  virtual int _is_a (const char *type_id) const;
-  // Helper method to implement _narrow.
-
-private:
-  CORBA_Any *exception_;
-  // Holder for the actual exception.
-};
-
-class TAO_Export TAO_Exceptions
-{
-  // = TITLE
-  //   This class is a namespace for exception-related static data and
-  //   methods.
-public:
-  static void make_standard_typecode (CORBA::TypeCode_ptr &tcp,
-                                      const char *name,
-                                      char *buf,
-                                      size_t buflen,
-                                      CORBA_Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ());
-  // Make the TypeCode for a standard exception.  When used correctly,
-  // initializing system exceptions is only an exercise in CPU time;
-  // it allocates no new memory.
-
-  static void make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp,
-                                          CORBA_Environment &ACE_TRY_ENV =
-                                          TAO_default_environment ());
-  // Make the TypeCode for the CORBA::UnknownUserException standard
-  // exception.
-
-  static void init (CORBA_Environment &ACE_TRY_ENV =
-                    TAO_default_environment ());
-  // Runtime initialization of all standard exception typecodes.
-  // Called from <CORBA::ORB_init>.
-
-  static void fini (void);
-  // Runtime finalization of all standard exception typecodes.
-
-  static CORBA_SystemException *
-       create_system_exception (const char *id,
-                                CORBA_Environment &ACE_TRY_ENV =
-                                    TAO_default_environment ());
-  // Create a CORBA::SystemException given the interface repository
-  // ID.
-
-  static CORBA::ExceptionList *system_exceptions;
-  // List of system exceptions.
-
-private:
-  static ACE_Allocator *global_allocator_;
-  // This global allocator is used to initialize system exception
-  // typecodes.  Since at the time, the ORB is mostly still not
-  // available.  Using a separate allocator prevent CDR routine from
-  // accessing the optimized allocators from the ORB.
-};
-
-class CORBA_ExceptionList;
-typedef CORBA_ExceptionList *CORBA_ExceptionList_ptr;
-
-class CORBA_ExceptionList
-{
-  // = TITLE
-  //   ExceptionList definition taken from CORBA v2.2 Feb 1998
-  //
-  // = DESCRIPTION
-  //   Maintains a list of TypeCodes for Exceptions.
-public:
-  // = Intialization and termination methods.
-
-  CORBA_ExceptionList (void);
-  // constructor
-
-  CORBA_ExceptionList (CORBA::ULong len,
-                       CORBA::TypeCode_ptr *tc_list);
-  // Constructor - initialize given a length and an array of
-  // TypeCodes.
-
-  ~CORBA_ExceptionList (void);
-  // Destructor.
-
-  CORBA::ULong count ();
-  // Return the number of elements.
-
-  CORBA_ExceptionList_ptr _duplicate (void);
-  // Increase the reference count.
-
-  static CORBA_ExceptionList_ptr _duplicate (CORBA_ExceptionList *);
-  // Increase the reference count in the spec defined manner.
-
-  void _destroy (void);
-
-  static CORBA_ExceptionList_ptr _nil (void);
-
-  void add (CORBA::TypeCode_ptr tc);
-  // Add a TypeCode to the list
-
-  void add_consume (CORBA::TypeCode_ptr tc);
-  // Add and consume a TypeCode to the list
-
-  CORBA::TypeCode_ptr item (CORBA::ULong slot,
-                            CORBA_Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  // Return the typecode at slot i. Raises the "Bounds" exception.
-
-  void remove (CORBA::ULong slot,
-               CORBA_Environment &ACE_TRY_ENV =
-               TAO_default_environment ());
-  // Remove the typecode at slot i. Raises the "Bounds" exception.
-
-  void  _incr_refcnt (void);
-  void  _decr_refcnt (void);
-  // Increment and decrement ref counts
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA::ExceptionList_ptr _ptr_type;
-  typedef CORBA::ExceptionList_var _var_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
-private:
-  // = Not allowed.
-  CORBA_ExceptionList (const CORBA_ExceptionList &);
-  CORBA_ExceptionList &operator= (const CORBA_ExceptionList &);
-
-  ACE_Atomic_Op<ACE_SYNCH_MUTEX, CORBA::ULong> ref_count_;
-  // Reference counter.
-
-  ACE_Unbounded_Queue<CORBA::TypeCode_ptr> tc_list_;
-  // internal list of typecodes
-};
-
-class TAO_Export CORBA_ExceptionList_var
-{
-  // = TITLE
-  //   CORBA_ExceptionList_var
-  //
-  // = DESCRIPTION
-  //   Lifecycle management helper class for ExceptionList objects.
-public:
-  CORBA_ExceptionList_var (void);
-  // default constructor
-  CORBA_ExceptionList_var (CORBA_ExceptionList_ptr);
-  CORBA_ExceptionList_var (const CORBA_ExceptionList_var &);
-  // copy constructor
-  ~CORBA_ExceptionList_var (void);
-  // destructor
-
-  CORBA_ExceptionList_var &operator= (CORBA_ExceptionList_ptr);
-  CORBA_ExceptionList_var &operator= (const CORBA_ExceptionList_var &);
-  CORBA_ExceptionList_ptr operator-> (void) const;
-
-  operator const CORBA_ExceptionList_ptr &() const;
-  operator CORBA_ExceptionList_ptr &();
-  // in, inout, out, _retn
-  CORBA_ExceptionList_ptr in (void) const;
-  CORBA_ExceptionList_ptr &inout (void);
-  CORBA_ExceptionList_ptr &out (void);
-  CORBA_ExceptionList_ptr _retn (void);
-  CORBA_ExceptionList_ptr ptr (void) const;
-
-private:
-  CORBA_ExceptionList_ptr ptr_;
-};
-
-#if defined (TAO_DONT_CATCH_DOT_DOT_DOT)
-class TAO_Export TAO_DONT_CATCH
-{
-  // = TITLE
-  //   This class is only used internally in TAO as an exception
-  //   that never gets thrown.  Never use this class anywhere.
-public:
-  TAO_DONT_CATCH (void);
-};
-#endif /* TAO_DONT_CATCH_DOT_DOT_DOT */
-
-#if defined (__ACE_INLINE__)
-# include "tao/Exception.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_EXCEPTION_H */
diff --git a/TAO/tao/Exception.i b/TAO/tao/Exception.i
deleted file mode 100644
index 21b94e09746..00000000000
--- a/TAO/tao/Exception.i
+++ /dev/null
@@ -1,156 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-ACE_INLINE CORBA_Exception*
-CORBA_Exception::_narrow (CORBA_Exception* x)
-{
-  return x;
-}
-
-ACE_INLINE
-CORBA_UserException::CORBA_UserException (const CORBA_UserException &src)
-  : CORBA_Exception (src)
-{
-}
-
-ACE_INLINE CORBA::ULong
-CORBA_SystemException::minor (void) const
-{
-  return this->minor_;
-}
-
-ACE_INLINE void
-CORBA_SystemException::minor (CORBA::ULong m)
-{
-  this->minor_ = m;
-}
-
-ACE_INLINE CORBA::CompletionStatus
-CORBA_SystemException::completed (void) const
-{
-  return this->completed_;
-}
-
-ACE_INLINE void
-CORBA_SystemException::completed (CORBA::CompletionStatus c)
-{
-  this->completed_ = c;
-}
-
-ACE_INLINE
-CORBA_ExceptionList::CORBA_ExceptionList (void)
-{
-}
-
-ACE_INLINE CORBA::ULong
-CORBA_ExceptionList::count (void)
-{
-  return (CORBA::ULong) this->tc_list_.size ();
-}
-
-ACE_INLINE CORBA_ExceptionList_ptr
-CORBA_ExceptionList::_nil (void)
-{
-  return (CORBA_ExceptionList_ptr)0;
-}
-
-ACE_INLINE CORBA_ExceptionList *
-CORBA_ExceptionList::_duplicate (CORBA_ExceptionList* x)
-{
-  if (x != 0)
-    x->_incr_refcnt ();
-  return x;
-}
-
-ACE_INLINE
-CORBA_ExceptionList_var::CORBA_ExceptionList_var (void) // default constructor
-  : ptr_ (CORBA_ExceptionList::_nil ())
-{}
-
-ACE_INLINE
-CORBA_ExceptionList_var::CORBA_ExceptionList_var (CORBA_ExceptionList_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA_ExceptionList_ptr
-CORBA_ExceptionList_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_ExceptionList_var::CORBA_ExceptionList_var (const CORBA_ExceptionList_var &p) // copy constructor
-  : ptr_ (p.ptr_->_duplicate ())
-{}
-
-ACE_INLINE
-CORBA_ExceptionList_var::~CORBA_ExceptionList_var (void) // destructor
-{
-  this->ptr_->_destroy ();
-}
-
-ACE_INLINE CORBA_ExceptionList_var &
-CORBA_ExceptionList_var::operator= (CORBA_ExceptionList_ptr p)
-{
-  this->ptr_->_destroy ();
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_ExceptionList_var &
-CORBA_ExceptionList_var::operator= (const CORBA_ExceptionList_var &p)
-{
-  if (this != &p)
-    {
-      this->ptr_->_destroy ();
-      this->ptr_ = p.ptr_->_duplicate ();
-    }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_ExceptionList_var::operator const CORBA_ExceptionList_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_ExceptionList_var::operator CORBA_ExceptionList_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ExceptionList_ptr
-CORBA_ExceptionList_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ExceptionList_ptr
-CORBA_ExceptionList_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ExceptionList_ptr &
-CORBA_ExceptionList_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ExceptionList_ptr &
-CORBA_ExceptionList_var::out (void)
-{
-  this->ptr_->_destroy ();
-  this->ptr_ = CORBA_ExceptionList::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ExceptionList_ptr
-CORBA_ExceptionList_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_ExceptionList_ptr val = this->ptr_;
-  this->ptr_ = CORBA_ExceptionList::_nil ();
-  return val;
-}
diff --git a/TAO/tao/Forwarding_Servant.cpp b/TAO/tao/Forwarding_Servant.cpp
deleted file mode 100644
index bd2ae762d23..00000000000
--- a/TAO/tao/Forwarding_Servant.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-// $Id$
-
-#include "tao/Forwarding_Servant.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#include "tao/Object.h"
-#include "tao/POAC.h"
-#include "tao/Any.h"
-#include "tao/Server_Request.h"
-
-ACE_RCSID(tao, Forwarding_Servant, "$Id$")
-
-TAO_Forwarding_Servant::TAO_Forwarding_Servant (CORBA::Object_ptr forward_to,
-                                                const char *interface_repository_id)
-  : forward_to_ (CORBA::Object::_duplicate (forward_to)),
-    interface_repository_id_ (CORBA::string_dup (interface_repository_id))
-{
-}
-
-void
-TAO_Forwarding_Servant::invoke (CORBA::ServerRequest_ptr request,
-                                CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (request);
-
-  CORBA::Exception *exception = 0;
-  ACE_NEW_THROW_EX (exception,
-                    PortableServer::ForwardRequest (this->forward_to_.in ()),
-                    CORBA::NO_MEMORY ());
-
-  CORBA::Any any (exception->_type (),
-                  exception,
-                  1);
-
-  request->set_exception (any,
-                          ACE_TRY_ENV);
-}
-
-CORBA::RepositoryId
-TAO_Forwarding_Servant::_primary_interface (const PortableServer::ObjectId & /* oid */,
-                                            PortableServer::POA_ptr /* poa */,
-                                            CORBA::Environment & /* ACE_TRY_ENV */)
-{
-  return CORBA::string_dup (this->interface_repository_id_.in ());
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/Forwarding_Servant.h b/TAO/tao/Forwarding_Servant.h
deleted file mode 100644
index 20b2eb7022c..00000000000
--- a/TAO/tao/Forwarding_Servant.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Forwarding_Servant.h
-//
-// = DESCRIPTION
-//    A DSI implementation of a forwarding servant.
-//
-// = AUTHOR
-//    Irfan Pyarali <irfan@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_FORWARDING_SERVANT_H
-#define TAO_FORWARDING_SERVANT_H
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#include "tao/Servant_Base.h"
-#include "tao/ORB.h"
-
-class TAO_Forwarding_Servant : public TAO_DynamicImplementation
-{
-public:
-
-  TAO_Forwarding_Servant (CORBA::Object_ptr forward_to,
-                          const char *interface_repository_id_);
-  // Constructor
-
-  virtual void invoke (CORBA::ServerRequest_ptr request,
-                       CORBA_Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
-  // The <invoke> method receives requests issued to any CORBA object
-  // incarnated by the DSI servant and performs the processing
-  // necessary to execute the request.
-
-  virtual CORBA::RepositoryId _primary_interface (const PortableServer::ObjectId &oid,
-                                                  PortableServer::POA_ptr poa,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // The <_primary_interface> method receives an ObjectId value and a
-  // POA_ptr as input parameters and returns a valid RepositoryId
-  // representing the most-derived interface for that oid.
-
-protected:
-  CORBA::Object_var forward_to_;
-  // Forward all requests to this object
-
-  CORBA::String_var interface_repository_id_;
-  // Here is the interface we support
-};
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#endif /* TAO_FORWARDING_SERVANT_H */
diff --git a/TAO/tao/GIOP.cpp b/TAO/tao/GIOP.cpp
deleted file mode 100644
index 490cafc4964..00000000000
--- a/TAO/tao/GIOP.cpp
+++ /dev/null
@@ -1,1642 +0,0 @@
-// $Id$
-
-// @(#)giop.cpp 1.10 95/09/21
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// GIOP:        Utility routines for sending, receiving GIOP messages
-//
-// Note that the Internet IOP is just the TCP-specific mapping of the
-// General IOP.  Areas where other protocols may map differently
-// include use of record streams (TCP has none), orderly disconnect
-// (TCP has it), endpoint addressing (TCP uses host + port), security
-// (Internet security should be leveraged by IIOP) and more.
-//
-// NOTE: There are a few places where this code knows that it's really
-// talking IIOP instead of GIOP.  No rush to fix this so long as we
-// are really not running atop multiple connection protocols.
-//
-// THREADING NOTE: currently, the connection manager eliminates tricky
-// threading issues by providing this code with the same programming
-// model both in threaded and unthreaded environments.  Since the GIOP
-// APIs were all designed to be reentrant, this makes threading rather
-// simple!
-//
-// That threading model is that the thread making (or handling) a call
-// is given exclusive access to a connection for the duration of a
-// call, so that no multiplexing or demultiplexing is needed.  That
-// is, locking is at the "connection level" rather than "message
-// level".
-//
-// The down side of this simple threading model is that utilization of
-// system resources (mostly connections, but to some extent network
-// I/O) in some kinds of environments can be inefficient.  However,
-// simpler threading models are much easier to get properly debugged,
-// and often perform better.  Also, such environments haven't been
-// seen to be any kind of problem; the model can be changed later if
-// needed, it's just an internal implementation detail.  Any portable
-// ORB client is not allowed to rely on semantic implications of such
-// a model.
-//
-// @@ there is lots of unverified I/O here.  In all cases, if an
-// error is detected when marshaling or unmarshaling, it should be
-// reported.
-// @@ Some dependance on the specific underlying transport protocol used.
-//    This must be removed in order to support pluggable protocols.
-//    TAO_Connector and TAO_Transport objects will be introduced
-//    to abstract away the specific transport protocol used.  We will
-//    just expose behavior (methods) to all transport protocols that
-//    can be used with GIOP!  fredk
-
-#include "tao/GIOP.h"
-#include "tao/Timeprobe.h"
-#include "tao/GIOP_Server_Request.h"
-#include "tao/CDR.h"
-#include "tao/Pluggable.h"
-#include "tao/debug.h"
-#include "tao/ORB_Core.h"
-#include "tao/POA.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/GIOP.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, GIOP, "$Id$")
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-
-static const char *TAO_GIOP_Timeprobe_Description[] =
-{
-  "GIOP::send_message - start",
-  "GIOP::send_message - end",
-
-  "GIOP::recv_message - start",
-  "GIOP::recv_message - end",
-
-  "GIOP::read_buffer - start",
-  "GIOP::read_buffer - end",
-
-  "GIOP::LocateRequestHeader_init - start",
-  "GIOP::LocateRequestHeader_init - end"
-};
-
-enum
-{
-  // Timeprobe description table start key
-  TAO_GIOP_SEND_MESSAGE_START = 100,
-  TAO_GIOP_SEND_MESSAGE_END,
-
-  TAO_GIOP_RECV_MESSAGE_START,
-  TAO_GIOP_RECV_MESSAGE_END,
-
-  TAO_GIOP_READ_BUFFER_START,
-  TAO_GIOP_READ_BUFFER_END,
-
-  TAO_GIOP_LOCATE_REQUEST_HEADER_INIT_START,
-  TAO_GIOP_LOCATE_REQUEST_HEADER_INIT_END
-};
-
-// Setup Timeprobes
-ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_GIOP_Timeprobe_Description,
-                                  TAO_GIOP_SEND_MESSAGE_START);
-
-#endif /* ACE_ENABLE_TIMEPROBES */
-
-TAO_GIOP_Message_State::TAO_GIOP_Message_State (TAO_ORB_Core* orb_core)
-  : byte_order (TAO_ENCAP_BYTE_ORDER),
-    more_fragments (0),
-    message_type (TAO_GIOP::MessageError),
-    message_size (0),
-    current_offset (0),
-    cdr (orb_core->create_input_cdr_data_block (ACE_CDR::DEFAULT_BUFSIZE),
-         TAO_ENCAP_BYTE_ORDER,
-         orb_core),
-    fragments_begin (0),
-    fragments_end (0)
-{
-  // Note that we need to use the ASCII values so the code will be
-  // portable to platforms that use different character sets, such as
-  // MVS (which uses EBCDIC).
-  this->magic[0] = 0x47;   // 'G'
-  this->magic[1] = 0x49;   // 'I'
-  this->magic[2] = 0x4f;   // 'O'
-  this->magic[3] = 0x50;   // 'P'
-
-  giop_version.major = TAO_DEF_GIOP_MAJOR;
-  giop_version.minor = TAO_DEF_GIOP_MINOR;
-}
-
-int
-TAO_GIOP_Message_State::is_complete ()
-{
-  if (this->message_size != this->current_offset)
-    return 0;
-
-  if (this->more_fragments)
-    {
-      // This is only one fragment of the complete Request....
-      ACE_Message_Block* current =
-        this->cdr.steal_contents ();
-      if (this->fragments_begin == 0)
-        {
-          this->first_fragment_byte_order = this->byte_order;
-          this->first_fragment_giop_version = this->giop_version;
-          this->first_fragment_message_type = this->message_type;
-          this->fragments_end = this->fragments_begin = current;
-          this->reset ();
-          return 0;
-        }
-
-      return this->append_fragment (current);
-    }
-
-  if (this->fragments_begin != 0)
-    {
-      // This is the last message, but we must defragment before
-      // sending
-
-      ACE_Message_Block* current =
-        this->cdr.steal_contents ();
-      if (this->append_fragment (current) == -1)
-        return -1;
-
-      // Copy the entire chain into the input CDR.....
-      this->cdr.reset (this->fragments_begin,
-                       this->first_fragment_byte_order);
-      ACE_Message_Block::release (this->fragments_begin);
-      this->fragments_begin = 0;
-      this->fragments_end = 0;
-
-      this->byte_order = this->first_fragment_byte_order;
-      this->giop_version = this->first_fragment_giop_version;
-      this->message_type = this->first_fragment_message_type;
-
-      /*FALLTHROUGH*/
-    }
-  // else
-  // {
-  // This message has no more fragments, and there where no fragments
-  // before it, just return... notice that this->cdr has the right
-  // contents.
-  // }
-
-  return 1;
-}
-
-int
-TAO_GIOP_Message_State::append_fragment (ACE_Message_Block* current)
-{
-  this->fragments_end->cont (current);
-  this->fragments_end = this->fragments_end->cont ();
-
-  if (this->first_fragment_byte_order != this->byte_order
-      || this->first_fragment_giop_version.major != this->giop_version.major
-      || this->first_fragment_giop_version.minor != this->giop_version.minor)
-    {
-      // Yes, print it out in all debug levels!
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) incompatible fragments:\n"
-                  "   Different GIOP versions or byte order\n"));
-      this->reset ();
-      return -1;
-    }
-  this->reset ();
-  return 0;
-}
-
-
-// ****************************************************************
-
-static const char digits [] = "0123456789ABCD";
-static const char *names [] =
-{
-  "Request",
-  "Reply",
-  "CancelRequest",
-  "LocateRequest",
-  "LocateReply",
-  "CloseConnection",
-  "MessageError"
-  "Fragment"
-};
-
-void
-TAO_GIOP::dump_msg (const char *label,
-                    const u_char *ptr,
-                    size_t len)
-{
-  if (TAO_debug_level >= 5)
-    {
-      const char *message_name = "UNKNOWN MESSAGE";
-      u_long slot = ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET];
-      if (slot < sizeof (names)/sizeof(names[0]))
-        message_name = names [slot];
-      int byte_order = ptr[TAO_GIOP_MESSAGE_FLAGS_OFFSET] & 0x01;
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P | %t):%s GIOP v%c.%c msg, %d data bytes, %s endian, %s",
-                  label,
-                  digits[ptr[TAO_GIOP_VERSION_MAJOR_OFFSET]],
-                  digits[ptr[TAO_GIOP_VERSION_MINOR_OFFSET]],
-                  len - TAO_GIOP_HEADER_LEN,
-                  (byte_order == TAO_ENCAP_BYTE_ORDER) ? "my" : "other",
-                  message_name));
-
-      if (ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == TAO_GIOP::Request)
-        {
-          // @@ Only works if ServiceContextList is empty....
-          const CORBA::ULong *request_id =
-            ACE_reinterpret_cast (const CORBA::ULong *,
-                                  ptr + TAO_GIOP_HEADER_LEN + 4);
-          ACE_DEBUG ((LM_DEBUG,
-                      " = %d\n",
-                      *request_id));
-        }
-      else if (ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == TAO_GIOP::Reply)
-        {
-          const CORBA::ULong *request_id =
-            ACE_reinterpret_cast (const CORBA::ULong *,
-                                  ptr + TAO_GIOP_HEADER_LEN + 4);
-          ACE_DEBUG ((LM_DEBUG,
-                      " = %d\n",
-                      *request_id));
-        }
-      else
-        ACE_DEBUG ((LM_DEBUG,
-                    "\n"));
-
-      if (TAO_debug_level >= 10)
-        ACE_HEX_DUMP ((LM_DEBUG,
-                       (const char *) ptr,
-                       len,
-                       "GIOP message"));
-    }
-}
-
-CORBA::Boolean
-operator<< (TAO_OutputCDR &cdr,
-            const TAO_GIOP_ServiceContext &x)
-{
-  if (cdr << x.context_id
-      && cdr << x.context_data)
-    return 1;
-  else
-    return 0;
-}
-
-CORBA::Boolean
-operator>> (TAO_InputCDR &cdr,
-            TAO_GIOP_ServiceContext &x)
-{
-  if (cdr >> x.context_id
-      && cdr >> x.context_data)
-    return 1;
-  else
-    return 0;
-}
-
-CORBA::Boolean
-operator<< (TAO_OutputCDR &cdr,
-            const TAO_GIOP_ServiceContextList &x)
-{
-  CORBA::ULong length = x.length ();
-
-  cdr.write_ulong (length);
-
-  for (CORBA::ULong i = 0;
-       i < length && cdr.good_bit ();
-       ++i)
-    cdr << x[i];
-
-  return cdr.good_bit ();
-}
-
-CORBA::Boolean
-operator>> (TAO_InputCDR &cdr,
-            TAO_GIOP_ServiceContextList &x)
-{
-  CORBA::ULong length;
-
-  cdr.read_ulong (length);
-
-  if (cdr.good_bit ())
-    {
-      x.length (length);
-
-      for (CORBA::ULong i = 0;
-           i < length && cdr.good_bit ();
-           ++i)
-        cdr >> x[i];
-    }
-  return cdr.good_bit ();
-}
-
-CORBA::Boolean
-TAO_GIOP::start_message (const TAO_GIOP_Version &version,
-                         TAO_GIOP::Message_Type type,
-                         TAO_OutputCDR &msg,
-                         TAO_ORB_Core* orb_core)
-{
-  if (orb_core->orb_params ()->use_lite_protocol ())
-    return TAO_GIOP::start_message_lite (version, type, msg);
-  else
-    return TAO_GIOP::start_message_std (version, type, msg);
-}
-
-CORBA::Boolean
-TAO_GIOP::write_request_header (CORBA::ULong request_id,
-                                CORBA::Boolean is_roundtrip,
-                                const TAO_opaque& key,
-                                const char *opname,
-                                CORBA::Principal_ptr principal,
-                                TAO_OutputCDR &msg,
-                                TAO_ORB_Core *orb_core)
-{
-  if (orb_core->orb_params ()->use_lite_protocol ())
-    return TAO_GIOP::write_request_header_lite (orb_core->service_context (),
-                                                request_id,
-                                                is_roundtrip,
-                                                key,
-                                                opname,
-                                                principal,
-                                                msg);
-  else
-    return TAO_GIOP::write_request_header_std (orb_core->service_context (),
-                                               request_id,
-                                               is_roundtrip,
-                                               key,
-                                               opname,
-                                               principal,
-                                               msg);
-}
-
-// Write the GIOP locate request header.
-
-CORBA::Boolean
-TAO_GIOP::write_locate_request_header (CORBA::ULong request_id,
-                                       const TAO_opaque &key,
-                                       TAO_OutputCDR &msg)
-{
-  msg << request_id;
-  msg << key;
-
-  return 1;
-}
-
-int
-TAO_GIOP::send_message (TAO_Transport *transport,
-                        TAO_OutputCDR &stream,
-                        TAO_ORB_Core *orb_core,
-                        ACE_Time_Value *max_wait_time)
-{
-
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_GIOP_SEND_MESSAGE_START);
-
-  // Ptr to first buffer.
-  char *buf = (char *) stream.buffer ();
-
-  // Length of all buffers.
-  size_t total_len =
-    stream.total_length ();
-
-  // assert (buflen == (stream.length - stream.remaining));
-
-  // Patch the message length in the GIOP header; it's always at the
-  // same eight byte offset into the message.
-  //
-  // NOTE: Here would also be a fine place to calculate a digital
-  // signature for the message and place it into a preallocated slot
-  // in the "ServiceContext".  Similarly, this is a good spot to
-  // encrypt messages (or just the message bodies) if that's needed in
-  // this particular environment and that isn't handled by the
-  // networking infrastructure (e.g., IPSEC).
-
-  size_t header_len = TAO_GIOP_HEADER_LEN;
-  // Fred: this is actually a good start to think about pluggable
-  // "messaging protocols" (maybe this is a bad name, but I want to
-  // stress the difference with the pluggable "transport protocols"
-  // that you recently completed).  For example: it seems that the
-  // transport layer needs to know the size of the header and somehow
-  // needs to determine the size of the message from that header, this
-  // could be virtual methods in the MessagingProtocol class.  Just a
-  // wild thought..... Carlos
-
-  size_t offset = TAO_GIOP_MESSAGE_SIZE_OFFSET;
-  if (orb_core->orb_params ()->use_lite_protocol ())
-    {
-      header_len = TAO_GIOP_LITE_HEADER_LEN;
-      offset = TAO_GIOP_LITE_MESSAGE_SIZE_OFFSET;
-    }
-
-  CORBA::ULong bodylen = total_len - header_len;
-
-#if !defined (ACE_ENABLE_SWAP_ON_WRITE)
-  *ACE_reinterpret_cast (CORBA::ULong *, buf + offset) = bodylen;
-#else
-  if (!stream->do_byte_swap ())
-    *ACE_reinterpret_cast (CORBA::ULong *,
-                           buf + offset) = bodylen;
-  else
-    ACE_CDR::swap_4 (ACE_reinterpret_cast (char *,
-                                           &bodylen),
-                     buf + offset);
-#endif /* ACE_ENABLE_SWAP_ON_WRITE */
-
-  // Strictly speaking, should not need to loop here because the
-  // socket never gets set to a nonblocking mode ... some Linux
-  // versions seem to need it though.  Leaving it costs little.
-
-  TAO_GIOP::dump_msg ("send",
-                      ACE_reinterpret_cast (u_char *,
-                                            buf),
-                      stream.length ());
-
-  // This guarantees to send all data (bytes) or return an error.
-  ssize_t n = transport->send (stream.begin (), max_wait_time);
-
-  if (n == -1)
-    {
-      if (TAO_orbdebug)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO: (%P|%t) closing conn %d after fault %p\n",
-                    transport->handle (),
-                    "GIOP::send_message ()"));
-
-    return -1;
-  }
-
-  // EOF.
-  if (n == 0)
-    {
-      if (TAO_orbdebug)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO: (%P|%t) GIOP::send_message () "
-                    "EOF, closing conn %d\n",
-                    transport->handle()));
-      return -1;
-    }
-
-  return 1;
-}
-
-// Server sends an "I'm shutting down now, any requests you've sent me
-// can be retried" message to the server.  The message is prefab, for
-// simplicity.
-//
-// NOTE: this is IIOP-specific though it doesn't look like it is.  It
-// relies on a TCP-ism: orderly disconnect, which doesn't exist in all
-// transport protocols.  Versions of GIOP atop some transport that's
-// lacking orderly disconnect must define some transport-specific
-// handshaking (e.g. the XNS/SPP handshake convention) in order to
-// know that the same transport semantics are provided when shutdown
-// is begun with messages "in flight". (IIOP doesn't report false
-// errors in the case of "clean shutdown", because it relies on
-// orderly disconnect as provided by TCP.  This quality of service is
-// required to write robust distributed systems.)
-
-void
-TAO_GIOP::send_close_connection (const TAO_GIOP_Version& version,
-                                 TAO_Transport *transport,
-                                 void *)
-{
-  // static CORBA::Octet
-  const char close_message [TAO_GIOP_HEADER_LEN] =
-  {
-    // The following works on non-ASCII platforms, such as MVS (which
-    // uses EBCDIC).
-    0x47, // 'G'
-    0x49, // 'I'
-    0x4f, // 'O'
-    0x50, // 'P'
-    version.major,
-    version.minor,
-    TAO_ENCAP_BYTE_ORDER,
-    TAO_GIOP::CloseConnection,
-    0, 0, 0, 0
-  };
-
-  // It's important that we use a reliable shutdown after we send this
-  // message, so we know it's received.
-  //
-  // @@ should recv and discard queued data for portability; note
-  // that this won't block (long) since we never set SO_LINGER
-
-  TAO_GIOP::dump_msg ("send_close_connection",
-                      (const u_char *) close_message,
-                      TAO_GIOP_HEADER_LEN);
-
-  ACE_HANDLE which = transport->handle ();
-  if (which == ACE_INVALID_HANDLE)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) TAO_GIOP::send_close_connection -"
-                    " connection already closed\n"));
-      return;
-    }
-
-  if (transport->send ((const u_char *) close_message,
-                       TAO_GIOP_HEADER_LEN) == -1)
-    {
-      if (TAO_orbdebug)
-        ACE_ERROR ((LM_ERROR,
-                    "(%P|%t) error closing connection %d\n",
-                    which));
-    }
-
-  transport->close_connection ();
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) shut down transport, handle %d\n",
-              which));
-}
-
-// Send an "I can't understand you" message -- again, the message is
-// prefabricated for simplicity.  This implies abortive disconnect (at
-// the application level, if not at the level of TCP).
-//
-// NOTE that IIOP will still benefit from TCP's orderly disconnect.
-
-int
-TAO_GIOP::send_error (const TAO_GIOP_Version &version,
-                      TAO_Transport *transport)
-{
-  const char
-    error_message [TAO_GIOP_HEADER_LEN] =
-  {
-    // The following works on non-ASCII platforms, such as MVS (which
-    // uses EBCDIC).
-    0x47, // 'G'
-    0x49, // 'I'
-    0x4f, // 'O'
-    0x50, // 'P'
-    version.major,
-    version.minor,
-    TAO_ENCAP_BYTE_ORDER,
-    TAO_GIOP::MessageError,
-    0, 0, 0, 0
-  };
-
-  // @@ Q: How does this works with GIOP lite?
-  //    A: It doesn't
-
-  TAO_GIOP::dump_msg ("send_error",
-                      (const u_char *) error_message,
-                      TAO_GIOP_HEADER_LEN);
-
-  ACE_HANDLE which = transport->handle ();
-
-  int result = transport->send ((const u_char *)error_message,
-                                TAO_GIOP_HEADER_LEN);
-  if (result == -1)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) error sending error to %d\n",
-                    which));
-    }
-
-  return result;
-}
-
-ssize_t
-TAO_GIOP::read_buffer (TAO_Transport *transport,
-                       char *buf,
-                       size_t len,
-                       ACE_Time_Value *max_wait_time)
-{
-  ACE_FUNCTION_TIMEPROBE (TAO_GIOP_READ_BUFFER_START);
-
-  ssize_t bytes_read = transport->recv (buf, len, max_wait_time);
-
-  if (bytes_read <= 0 && TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO (%P|%t) - %p,\n"
-                "              transport = %d, "
-                "bytes = %d, len = %d\n",
-                "TAO_GIOP::read_buffer",
-                transport->handle (),
-                bytes_read,
-                len));
-
-  if (bytes_read == -1 && errno == ECONNRESET)
-    {
-      // @@ Is this OK??
-
-      // We got a connection reset (TCP RSET) from the other side,
-      // i.e., they didn't initiate a proper shutdown.
-      //
-      // Make it look like things are OK to the upper layer.
-      bytes_read = 0;
-      errno = 0;
-    }
-
-  return bytes_read;
-}
-
-void
-TAO_GIOP_LocateRequestHeader::init (TAO_InputCDR &msg,
-                                    CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_FUNCTION_TIMEPROBE (TAO_GIOP_LOCATE_REQUEST_HEADER_INIT_START);
-
-  if (msg.read_ulong (this->request_id) == 0
-      || (msg >> this->object_key) == 0)
-    ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                               CORBA::COMPLETED_NO));
-}
-
-TAO_GIOP_ReplyStatusType
-TAO_GIOP::convert_CORBA_to_GIOP_exception (CORBA::exception_type corba_type)
-{
-  switch (corba_type)
-    {
-    case CORBA::NO_EXCEPTION:
-      return TAO_GIOP_NO_EXCEPTION;
-
-    case CORBA::SYSTEM_EXCEPTION:
-      return TAO_GIOP_SYSTEM_EXCEPTION;
-
-    case CORBA::USER_EXCEPTION:
-      return TAO_GIOP_USER_EXCEPTION;
-
-    default:
-      // Don't know what to do here??
-      return TAO_GIOP_SYSTEM_EXCEPTION;
-    }
-}
-
-int
-TAO_GIOP::read_header (TAO_Transport *transport,
-                       TAO_ORB_Core *orb_core,
-                       TAO_GIOP_Message_State &state,
-                       CORBA::ULong &header_size,
-                       TAO_InputCDR &input,
-                       ACE_Time_Value *max_wait_time)
-{
-  // Default header length.
-  header_size = TAO_GIOP_HEADER_LEN;
-  if (orb_core->orb_params ()->use_lite_protocol ())
-    header_size = TAO_GIOP_LITE_HEADER_LEN;
-
-  if (input.grow (header_size) == -1)
-    return -1;
-
-  // Read until all the header is received.  There should be no
-  // problems with locking, the header is only a few bytes so they
-  // should all be available on the socket, otherwise there is a
-  // problem with the underlying transport, in which case we have more
-  // problems than just this small loop.
-
-  char *buf = input.rd_ptr ();
-  ssize_t n;
-
-  for (int t = header_size;
-       t != 0;
-       t -= n)
-    {
-      n = transport->recv (buf, t, max_wait_time);
-      if (n == -1)
-        return -1;
-      else if (n == 0 && errno != EWOULDBLOCK)
-        return -1;
-      buf += n;
-    }
-
-  if (TAO_GIOP::parse_header (orb_core,
-                              input,
-                              state) == -1)
-    {
-      TAO_GIOP::send_error (state.giop_version, transport);
-      return -1;
-    }
-  return header_size;
-}
-
-int
-TAO_GIOP::handle_input (TAO_Transport *transport,
-                        TAO_ORB_Core *orb_core,
-                        TAO_GIOP_Message_State &state,
-                        ACE_Time_Value *max_wait_time)
-{
-  if (state.header_received () == 0)
-    {
-      CORBA::ULong header_size;
-      if (TAO_GIOP::read_header (transport,
-                                 orb_core,
-                                 state,
-                                 header_size,
-                                 state.cdr,
-                                 max_wait_time) == -1)
-        {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "TAO (%P|%t) - %p\n",
-                        "TAO_GIOP::handle_input, read_header"));
-          return -1;
-        }
-
-      if (state.cdr.grow (header_size +
-                          state.message_size) == -1)
-        {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "TAO (%P|%t) - %p\n",
-                        "TAO_GIOP::handle_input, ACE_CDR::grow"));
-          return -1;
-        }
-
-      // Growing the buffer may have reset the rd_ptr(), but we want
-      // to leave it just after the GIOP header (that was parsed
-      // already);
-      state.cdr.skip_bytes (header_size);
-    }
-
-  size_t missing_data =
-    state.message_size - state.current_offset;
-  ssize_t n =
-    TAO_GIOP::read_buffer (transport,
-                           state.cdr.rd_ptr () + state.current_offset,
-                           missing_data,
-                           max_wait_time);
-  if (n == -1)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - %p\n",
-                    "TAO_GIOP::handle_input, read_buffer[1]"));
-      return -1;
-    }
-  else if (n == 0)
-    {
-      if (errno == EWOULDBLOCK)
-        return 0;
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - %p\n",
-                    "TAO_GIOP::handle_input, read_buffer[2]"));
-      return -1;
-    }
-
-  state.current_offset += n;
-
-  if (state.current_offset == state.message_size)
-    {
-      if (TAO_debug_level >= 5)
-        {
-          size_t header_len = TAO_GIOP_HEADER_LEN;
-          if (orb_core->orb_params ()->use_lite_protocol ())
-            header_len = TAO_GIOP_LITE_HEADER_LEN;
-
-          char *buf = state.cdr.rd_ptr ();
-          buf -= header_len;
-          size_t msg_len = state.cdr.length () + header_len;
-          TAO_GIOP::dump_msg ("recv",
-                              ACE_reinterpret_cast (u_char *,
-                                                    buf),
-                              msg_len);
-        }
-    }
-
-  return state.is_complete ();
-}
-
-int
-TAO_GIOP::parse_reply (TAO_Transport *,
-                       TAO_ORB_Core *,
-                       TAO_GIOP_Message_State &state,
-                       TAO_GIOP_ServiceContextList &reply_ctx,
-                       CORBA::ULong &request_id,
-                       CORBA::ULong &reply_status)
-{
-  switch (state.message_type)
-    {
-    case TAO_GIOP::Request:
-      // In GIOP 1.0 and GIOP 1.1 this is an error, but it is
-      // *possible* to receive requests in GIOP 1.2.  Don't handle
-      // this on the firt iteration, leave it for the nearby future...
-      // ERROR too.  @@ this->reply_handler_->error ();
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "TAO (%P|%t) %N:%l TAO_GIOP::parse_reply: "
-                         "request.\n"),
-                        -1);
-
-    case TAO_GIOP::CancelRequest:
-    case TAO_GIOP::LocateRequest:
-    case TAO_GIOP::CloseConnection:
-    default:
-      // @@ Errors for the time being.
-      // @@ this->reply_handler_->error ();
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "TAO (%P|%t) %N:%l TAO_GIOP::parse_reply: "
-                         "wrong message.\n"),
-                        -1);
-
-    case TAO_GIOP::LocateReply:
-    case TAO_GIOP::Reply:
-      // Handle after the switch.
-      break;
-
-    case TAO_GIOP::Fragment:
-      // Never happens:
-      break;
-    }
-
-  // For GIOP 1.0 and 1.1 the reply_ctx comes first:
-  // @@ Use <header.giop_version> to make this work with GIOP 1.2
-  if ((state.cdr >> reply_ctx) == 0)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) TAO_GIOP::parse_reply, "
-                    "extracting context\n"));
-      return -1;
-    }
-
-  // Read the request id
-  if (!state.cdr.read_ulong (request_id))
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) : TAO_GIOP::parse_reply, "
-                    "extracting request id"));
-      return -1;
-    }
-
-  // and the reply status type.  status can be NO_EXCEPTION,
-  // SYSTEM_EXCEPTION, USER_EXCEPTION, LOCATION_FORWARD or (on GIOP
-  // 1.2) LOCATION_FORWARD_PERM
-  if (!state.cdr.read_ulong (reply_status))
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) : TAO_GIOP::parse_reply, "
-                    "extracting reply status\n"));
-      return -1;
-    }
-  return 0;
-}
-
-int
-TAO_GIOP::process_server_message (TAO_Transport *transport,
-                                  TAO_ORB_Core *orb_core,
-                                  TAO_InputCDR &input,
-                                  const TAO_GIOP_Message_State &state)
-{
-  char repbuf[ACE_CDR::DEFAULT_BUFSIZE];
-#if defined(ACE_HAS_PURIFY)
-  (void) ACE_OS::memset (repbuf,
-                         '\0',
-                         sizeof repbuf);
-#endif /* ACE_HAS_PURIFY */
-  TAO_OutputCDR output (repbuf,
-                        sizeof repbuf,
-                        TAO_ENCAP_BYTE_ORDER,
-                        orb_core->output_cdr_buffer_allocator (),
-                        orb_core->output_cdr_dblock_allocator (),
-                        orb_core->orb_params ()->cdr_memcpy_tradeoff (),
-                        orb_core->to_iso8859 (),
-                        orb_core->to_unicode ());
-
-  TAO_MINIMAL_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_RECEIVE_REQUEST_END);
-
-  switch (state.message_type)
-    {
-    case TAO_GIOP::Request:
-      // The following two routines will either raise an exception
-      // or successfully write the response into <output>
-      return TAO_GIOP::process_server_request (transport,
-                                               orb_core,
-                                               input,
-                                               output,
-                                               state.giop_version);
-
-    case TAO_GIOP::LocateRequest:
-      return TAO_GIOP::process_server_locate (transport,
-                                              orb_core,
-                                              input,
-                                              output,
-                                              state.giop_version);
-
-    case TAO_GIOP::MessageError:
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) MessageError received by server\n"));
-      break;
-
-      // These messages should never be sent to the server; it's an
-      // error if the peer tries.  Set the environment accordingly,
-      // as it's not yet been reported as an error.
-    case TAO_GIOP::Reply:
-    case TAO_GIOP::LocateReply:
-    case TAO_GIOP::CloseConnection:
-    default:   // Unknown message
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) Illegal message received by server\n"));
-      return TAO_GIOP::send_error (state.giop_version, transport);
-    }
-
-  TAO_MINIMAL_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_END);
-
-  return 0;
-}
-
-int
-TAO_GIOP::process_server_request (TAO_Transport *transport,
-                                  TAO_ORB_Core *orb_core,
-                                  TAO_InputCDR &input,
-                                  TAO_OutputCDR &output,
-                                  const TAO_GIOP_Version &version)
-{
-  CORBA::ULong request_id = 0;
-  CORBA::ULong response_required = 0;
-  CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ();
-  ACE_TRY
-    {
-      // This will extract the request header, set <response_required>
-      // as appropriate.
-
-      int parse_error;
-      TAO_GIOP_ServerRequest request (input,
-                                      output,
-                                      orb_core,
-                                      version,
-                                      parse_error);
-
-      request_id = request.request_id ();
-      response_required = request.response_expected ();
-
-      if (parse_error != 0)
-        ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                       CORBA::COMPLETED_NO));
-
-#if !defined (TAO_NO_IOR_TABLE)
-      const CORBA::Octet *object_key =
-        request.object_key ().get_buffer ();
-
-      if (ACE_OS::memcmp (object_key,
-                          &TAO_POA::objectkey_prefix[0],
-                          TAO_POA::TAO_OBJECTKEY_PREFIX_SIZE) != 0)
-        {
-          ACE_CString object_id (ACE_reinterpret_cast (const char *,
-                                                       object_key),
-                                 request.object_key ().length (),
-                                 0,
-                                 0);
-
-          // @@ This debugging output should *NOT* be used since the
-          //    object key string is not null terminated, nor can it
-          //    be null terminated without copying.  No copying should 
-          //    be done since performance is somewhat important here.
-          //    So, just remove the debugging output entirely.
-          //
-          //           if (TAO_debug_level > 0)
-          //             ACE_DEBUG ((LM_DEBUG,
-          //                         "Simple Object key %s. "
-          //                         "Doing the Table Lookup ...\n",
-          //                         object_id.c_str ()));
-
-          CORBA::Object_ptr object_reference =
-            CORBA::Object::_nil ();
-
-          // Do the Table Lookup.
-          int status =
-            orb_core->orb ()->_tao_find_in_IOR_table (object_id,
-                                                      object_reference);
-
-          // If ObjectID not in table or reference is nil raise
-          // OBJECT_NOT_EXIST.
-
-          if (status == -1 || CORBA::is_nil (object_reference))
-            ACE_TRY_THROW (CORBA::OBJECT_NOT_EXIST ());
-
-          // ObjectID present in the table with an associated NON-NULL
-          // reference.  Throw a forward request exception.
-
-          CORBA::Object_ptr dup =
-            CORBA::Object::_duplicate (object_reference);
-
-          // @@ We could simply write the response at this point...
-          ACE_TRY_THROW (PortableServer::ForwardRequest (dup));
-        }
-
-#endif /* TAO_NO_IOR_TABLE */
-
-      orb_core->object_adapter ()->dispatch_servant (request.object_key (),
-                                                     request,
-                                                     0,
-                                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-  ACE_CATCH (PortableServer::ForwardRequest, forward_request)
-    {
-      TAO_GIOP::start_message (version,
-                               TAO_GIOP::Reply,
-                               output,
-                               orb_core);
-      TAO_GIOP_ServiceContextList resp_ctx;
-      resp_ctx.length (0);
-      output << resp_ctx;
-
-      output.write_ulong (request_id);
-
-      output.write_ulong (TAO_GIOP_LOCATION_FORWARD);
-
-      CORBA::Object_ptr object_ptr =
-        forward_request.forward_reference.in();
-
-      output << object_ptr;
-    }
-#else
-  ACE_UNUSED_ARG (request_id);
-#endif /* TAO_HAS_MINIMUM_CORBA */
-  // Only CORBA exceptions are caught here.
-  ACE_CATCHANY
-    {
-      int result = 0;
-      if (response_required)
-        {
-          result = TAO_GIOP::send_reply_exception (version,
-                                                   transport,
-                                                   orb_core,
-                                                   request_id,
-                                                   &ACE_ANY_EXCEPTION);
-          if (result == -1)
-            {
-              if (TAO_debug_level > 0)
-                ACE_ERROR ((LM_ERROR,
-                            "TAO: (%P|%t) %p: cannot send exception\n",
-                            "TAO_GIOP::process_server_message"));
-              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                   "TAO: ");
-            }
-        }
-      else if (TAO_debug_level > 0)
-        {
-          // It is unfotunate that an exception (probably a system
-          // exception) was thrown by the upcall code (even by the
-          // user) when the client was not expecting a response.
-          // However, in this case, we cannot close the connection
-          // down, since it really isn't the client's fault.
-
-          ACE_ERROR ((LM_ERROR,
-                      "(%P|%t) exception thrown "
-                      "but client is not waiting a response\n"));
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "TAO: ");
-        }
-
-      return result;
-    }
-#if defined (TAO_HAS_EXCEPTIONS)
-  ACE_CATCHALL
-    {
-      // @@ TODO some c++ exception or another, but what do we do with
-      //    it?
-      // We are supposed to map it into a CORBA::UNKNOWN exception.
-      // BTW, this cannot be detected if using the <env> mapping.  If
-      // we have native exceptions but no support for them in the ORB
-      // we should still be able to catch it.  If we don't have native
-      // exceptions it couldn't have been raised in the first place!
-      int result = 0;
-      if (response_required)
-        {
-          CORBA::UNKNOWN exception
-            (CORBA::SystemException::_tao_minor_code
-             (TAO_UNHANDLED_SERVER_CXX_EXCEPTION, 0),
-             CORBA::COMPLETED_MAYBE);
-
-          result = TAO_GIOP::send_reply_exception (version,
-                                                   transport,
-                                                   orb_core,
-                                                   request_id,
-                                                   &exception);
-          if (result == -1)
-            {
-              if (TAO_debug_level > 0)
-                ACE_ERROR ((LM_ERROR,
-                            "TAO: (%P|%t) %p: cannot send exception\n",
-                            "TAO_GIOP::process_server_message"));
-              ACE_PRINT_EXCEPTION (exception, "TAO: ");
-            }
-        }
-      else if (TAO_debug_level > 0)
-        {
-          // It is unfotunate that an exception (probably a system
-          // exception) was thrown by the upcall code (even by the
-          // user) when the client was not expecting a response.
-          // However, in this case, we cannot close the connection
-          // down, since it really isn't the client's fault.
-          ACE_ERROR ((LM_ERROR,
-                      "(%P|%t) exception thrown "
-                      "but client is not waiting a response\n"));
-        }
-
-      return result;
-    }
-#endif /* TAO_HAS_EXCEPTIONS */
-  ACE_ENDTRY;
-
-  int result = 0;
-  if (response_required)
-    {
-      result = TAO_GIOP::send_message (transport,
-                                       output,
-                                       orb_core);
-      if (result == -1)
-        {
-          if (TAO_debug_level > 0)
-            {
-              // No exception but some kind of error, yet a response
-              // is required.
-              ACE_ERROR ((LM_ERROR,
-                          "TAO: (%P|%t) %p: cannot send reply\n",
-                          "TAO_GIOP::process_server_message"));
-            }
-        }
-    }
-
-  return result;
-}
-
-int
-TAO_GIOP::process_server_locate (TAO_Transport *transport,
-                                 TAO_ORB_Core* orb_core,
-                                 TAO_InputCDR &input,
-                                 TAO_OutputCDR &output,
-                                 const TAO_GIOP_Version& version)
-{
-  // This will extract the request header, set <response_required> as
-  // appropriate.
-  TAO_GIOP_LocateRequestHeader locateRequestHeader;
-
-  TAO_GIOP_LocateStatusType status = TAO_GIOP_UNKNOWN_OBJECT;
-  CORBA::Object_var forward_location_var;
-
-  CORBA::Boolean response_required = 1;
-
-  CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ();
-  ACE_TRY
-    {
-      locateRequestHeader.init (input, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-#if !defined (TAO_NO_IOR_TABLE)
-
-      const CORBA::Octet *object_key =
-        locateRequestHeader.object_key.get_buffer ();
-
-      if (ACE_OS::memcmp (object_key,
-                          &TAO_POA::objectkey_prefix[0],
-                          TAO_POA::TAO_OBJECTKEY_PREFIX_SIZE) != 0)
-        {
-          ACE_CString object_id (ACE_reinterpret_cast (const char *,
-                                                       object_key),
-                                 locateRequestHeader.object_key.length (),
-                                 0,
-                                 0);
-
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "Simple Object key %s. Doing the Table Lookup ...\n",
-                        object_id.c_str ()));
-
-          CORBA::Object_ptr object_reference;
-
-          // Do the Table Lookup.
-          int find_status =
-            orb_core->orb ()->_tao_find_in_IOR_table (object_id,
-                                                      object_reference);
-
-          // If ObjectID not in table or reference is nil raise
-          // OBJECT_NOT_EXIST.
-
-          if (CORBA::is_nil (object_reference)
-              || find_status == -1)
-            ACE_TRY_THROW (CORBA::OBJECT_NOT_EXIST ());
-
-          // ObjectID present in the table with an associated NON-NULL
-          // reference.  Throw a forward request exception.
-
-          CORBA::Object_ptr dup =
-            CORBA::Object::_duplicate (object_reference);
-
-          // @@ We could simply write the response at this point...
-          ACE_TRY_THROW (PortableServer::ForwardRequest (dup));
-        }
-#endif /* TAO_NO_IOR_TABLE */
-
-      // Execute a fake request to find out if the object is there or
-      // if the POA can activate it on demand...
-      char repbuf[ACE_CDR::DEFAULT_BUFSIZE];
-      TAO_OutputCDR dummy_output (repbuf,
-                                  sizeof repbuf);
-      // This output CDR is not used!
-
-      TAO_ObjectKey tmp_key (locateRequestHeader.object_key.length (),
-                             locateRequestHeader.object_key.length (),
-                             locateRequestHeader.object_key.get_buffer (),
-                             0);
-
-      int parse_error;
-      TAO_GIOP_ServerRequest serverRequest (locateRequestHeader.request_id,
-                                            response_required,
-                                            tmp_key,
-                                            "_non_existent",
-                                            dummy_output,
-                                            orb_core,
-                                            version,
-                                            parse_error);
-      if (parse_error != 0)
-        ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                       CORBA::COMPLETED_NO));
-
-      orb_core->object_adapter ()->dispatch_servant (serverRequest.object_key (),
-                                                     serverRequest,
-                                                     0,
-                                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (serverRequest.exception_type () == TAO_GIOP_NO_EXCEPTION)
-        {
-          // We got no exception, so the object is here.
-          status = TAO_GIOP_OBJECT_HERE;
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "TAO: (%P|%t) handle_locate() : found\n"));
-        }
-      else if (serverRequest.exception_type () != TAO_GIOP_NO_EXCEPTION)
-        {
-          forward_location_var = serverRequest.forward_location ();
-          if (!CORBA::is_nil (forward_location_var.in ()))
-            {
-              status = TAO_GIOP_OBJECT_FORWARD;
-              ACE_DEBUG ((LM_DEBUG,
-                          "handle_locate has been called: forwarding\n"));
-            }
-          else
-            {
-              // Normal exception, so the object is not here
-              status = TAO_GIOP_UNKNOWN_OBJECT;
-              ACE_DEBUG ((LM_DEBUG,
-                          "handle_locate has been called: not here\n"));
-            }
-        }
-
-    }
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-  ACE_CATCH (PortableServer::ForwardRequest, forward_request)
-    {
-      status = TAO_GIOP_OBJECT_FORWARD;
-      forward_location_var =
-        forward_request.forward_reference;
-      ACE_DEBUG ((LM_DEBUG,
-                  "handle_locate has been called: forwarding\n"));
-    }
-#endif /* TAO_HAS_MINIMUM_CORBA */
-  ACE_CATCHANY
-    {
-      // Normal exception, so the object is not here
-      status = TAO_GIOP_UNKNOWN_OBJECT;
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) TAO_GIOP::process_server_locate - "
-                    "CORBA exception raised\n"));
-    }
-#if defined (TAO_HAS_EXCEPTIONS)
-  ACE_CATCHALL
-    {
-      // Normal exception, so the object is not here
-      status = TAO_GIOP_UNKNOWN_OBJECT;
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) TAO_GIOP::process_server_locate - "
-                    "C++ exception raised\n"));
-    }
-#endif /* TAO_HAS_EXCEPTIONS */
-  ACE_ENDTRY;
-
-  // Create the response.
-  TAO_GIOP::start_message (version,
-                           TAO_GIOP::LocateReply,
-                           output,
-                           orb_core);
-  output.write_ulong (locateRequestHeader.request_id);
-  output.write_ulong (status);
-
-  if (status == TAO_GIOP_OBJECT_FORWARD)
-    {
-      CORBA::Object_ptr object_ptr = forward_location_var.in ();
-      if ((output << object_ptr) == 0)
-        {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "TAO (%P|%t) TAO_GIOP::process_server_request -"
-                        " cannot marshal object reference\n"));
-        }
-    }
-
-  int result = TAO_GIOP::send_message (transport,
-                                       output,
-                                       orb_core);
-
-  if (result == -1)
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "TAO: (%P|%t) %p: cannot send reply\n",
-                      "TAO_GIOP::process_server_message"));
-        }
-    }
-
-  return result;
-}
-
-int
-TAO_GIOP::send_reply_exception (const TAO_GIOP_Version &version,
-                                TAO_Transport *transport,
-                                TAO_ORB_Core* orb_core,
-                                CORBA::ULong request_id,
-                                CORBA::Exception *x)
-{
-  // Create a new output CDR stream
-
-  char repbuf[ACE_CDR::DEFAULT_BUFSIZE];
-#if defined(ACE_HAS_PURIFY)
-  (void) ACE_OS::memset (repbuf,
-                         '\0',
-                         sizeof repbuf);
-#endif /* ACE_HAS_PURIFY */
-  TAO_OutputCDR output (repbuf,
-                        sizeof repbuf,
-                        TAO_ENCAP_BYTE_ORDER,
-                        orb_core->output_cdr_buffer_allocator (),
-                        orb_core->output_cdr_dblock_allocator (),
-                        orb_core->orb_params ()->cdr_memcpy_tradeoff (),
-                        orb_core->to_iso8859 (),
-                        orb_core->to_unicode ());
-
-  // Construct a REPLY header.
-  TAO_GIOP::start_message (version,
-                           TAO_GIOP::Reply,
-                           output,
-                           orb_core);
-
-  // A new try/catch block, but if something goes wrong now we have no
-  // hope, just abort.
-  ACE_TRY_NEW_ENV
-    {
-      // create and write a dummy context
-      TAO_GIOP_ServiceContextList resp_ctx;
-      resp_ctx.length (0);
-      output << resp_ctx;
-
-      // Write the request ID
-      output.write_ulong (request_id);
-
-      // Write the exception
-      CORBA::TypeCode_ptr except_tc = x->_type ();
-
-      CORBA::exception_type extype =
-        CORBA::USER_EXCEPTION;
-
-      if (CORBA::SystemException::_narrow (x) != 0)
-        extype = CORBA::SYSTEM_EXCEPTION;
-
-      // write the reply_status
-      output.write_ulong (TAO_GIOP::convert_CORBA_to_GIOP_exception (extype));
-
-      // @@ Any way to implement this without interpretive
-      //    marshaling???
-      output.encode (except_tc,
-                     x,
-                     0,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (CORBA_Exception, ex)
-    {
-      // Now we know that while handling the error an other error
-      // happened -> no hope, close connection.
-
-      // Close the handle.
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) cannot marshal exception %p\n",
-                  transport->handle (),
-                  "TAO_GIOP::send_reply_exception"));
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return TAO_GIOP::send_message (transport,
-                                 output,
-                                 orb_core);
-}
-
-CORBA::Boolean
-TAO_GIOP::start_message_std (const TAO_GIOP_Version &version,
-                             TAO_GIOP::Message_Type type,
-                             TAO_OutputCDR &msg)
-{
-  msg.reset ();
-
-  // if (msg.size () < TAO_GIOP_HEADER_LEN)
-  // return 0;
-
-  static CORBA::Octet magic[] =
-  {
-    // The following works on non-ASCII platforms, such as MVS (which
-    // uses EBCDIC).
-    0x47, // 'G'
-    0x49, // 'I'
-    0x4f, // 'O'
-    0x50, // 'P'
-  };
-
-  static int magic_size = sizeof(magic)/sizeof(magic[0]);
-  msg.write_octet_array (magic, magic_size);
-  msg.write_octet (version.major);
-  msg.write_octet (version.minor);
-  msg.write_octet (TAO_ENCAP_BYTE_ORDER);
-  msg.write_octet (type);
-
-  // Write a dummy <size> later it is set to the right value...
-  CORBA::ULong size = 0;
-  msg.write_ulong (size);
-
-  return 1;
-}
-
-CORBA::Boolean
-TAO_GIOP::start_message_lite (const TAO_GIOP_Version &,
-                              TAO_GIOP::Message_Type type,
-                              TAO_OutputCDR &msg)
-{
-  msg.reset ();
-
-  // Write a dummy <size> later it is set to the right value...  @@
-  // TODO Maybe we should store the OutputCDR status in
-  CORBA::ULong size = 0;
-  msg.write_ulong (size);
-
-  msg.write_octet (type);
-
-  return 1;
-}
-
-CORBA::Boolean
-TAO_GIOP::write_request_header_std (const TAO_GIOP_ServiceContextList& svc_ctx,
-                                    CORBA::ULong request_id,
-                                    CORBA::Boolean is_roundtrip,
-                                    const TAO_opaque& key,
-                                    const char* opname,
-                                    CORBA::Principal_ptr principal,
-                                    TAO_OutputCDR &out_stream)
-{
-  out_stream << svc_ctx;
-  out_stream << request_id;
-  // @@ Messaging: this is where the extra synchronization information
-  //    should be stored.
-  out_stream << CORBA::Any::from_boolean (is_roundtrip);
-  out_stream << key;
-  out_stream << opname;
-  out_stream << principal;
-  return 1;
-}
-
-CORBA::Boolean
-TAO_GIOP::write_request_header_lite (const TAO_GIOP_ServiceContextList&,
-                                     CORBA::ULong request_id,
-                                     CORBA::Boolean is_roundtrip,
-                                     const TAO_opaque &key,
-                                     const char* opname,
-                                     CORBA::Principal_ptr,
-                                     TAO_OutputCDR &out_stream)
-{
-  out_stream << request_id;
-  out_stream << CORBA::Any::from_boolean (is_roundtrip);
-  out_stream << key;
-  out_stream << opname;
-  return 1;
-}
-
-int
-TAO_GIOP::parse_header (TAO_ORB_Core *orb_core,
-                        TAO_InputCDR &input,
-                        TAO_GIOP_Message_State& state)
-{
-  if (orb_core->orb_params ()->use_lite_protocol ())
-    return TAO_GIOP::parse_header_lite (input, state);
-  else
-    return TAO_GIOP::parse_header_std (input, state);
-}
-
-int
-TAO_GIOP::parse_header_std (TAO_InputCDR &input,
-                            TAO_GIOP_Message_State &state)
-{
-  char *buf = input.rd_ptr ();
-
-  // The values are hard-coded to support non-ASCII platforms.
-  if (!(buf [0] == 0x47      // 'G'
-        && buf [1] == 0x49   // 'I'
-        && buf [2] == 0x4f   // 'O'
-        && buf [3] == 0x50)) // 'P'
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) bad header, magic word [%c%c%c%c]\n",
-                    buf[0],
-                    buf[1],
-                    buf[2],
-                    buf[3]));
-      return -1;
-    }
-
-  state.giop_version.major = buf[TAO_GIOP_VERSION_MAJOR_OFFSET];
-  state.giop_version.minor = buf[TAO_GIOP_VERSION_MINOR_OFFSET];
-
-  if (state.giop_version.major != TAO_DEF_GIOP_MAJOR
-      || state.giop_version.minor > TAO_DEF_GIOP_MINOR)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) bad version <%d.%d>\n",
-                    state.giop_version.major,
-                    state.giop_version.minor));
-      return -1;
-    }
-
-  if (state.giop_version.minor == 0)
-    {
-      state.byte_order = buf[TAO_GIOP_MESSAGE_FLAGS_OFFSET];
-      if (TAO_debug_level > 2
-          && state.byte_order != 0 && state.byte_order != 1)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) invalid byte order <%d>"
-                      " for version <1.0>\n",
-                      state.byte_order));
-          return -1;
-        }
-    }
-  else
-    {
-      state.byte_order     = buf[TAO_GIOP_MESSAGE_FLAGS_OFFSET] & 0x01;
-      state.more_fragments = buf[TAO_GIOP_MESSAGE_FLAGS_OFFSET] & 0x02;
-      if (TAO_debug_level > 2
-          && state.giop_version.minor == 1
-          && (buf[TAO_GIOP_MESSAGE_FLAGS_OFFSET] & ~0x3) != 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) invalid flags for <%d>"
-                      " for version <1.1>\n",
-                      buf[TAO_GIOP_MESSAGE_FLAGS_OFFSET]));
-          return -1;
-        }
-
-    }
-
-  state.message_type = buf[TAO_GIOP_MESSAGE_TYPE_OFFSET];
-
-  input.reset_byte_order (state.byte_order);
-  input.skip_bytes (TAO_GIOP_MESSAGE_SIZE_OFFSET);
-  input.read_ulong (state.message_size);
-
-  if (TAO_debug_level > 2)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) Parsed header = <%d,%d,%d,%d,%d>\n",
-                  state.giop_version.major,
-                  state.giop_version.minor,
-                  state.byte_order,
-                  state.message_type,
-                  state.message_size));
-    }
-  return 0;
-}
-
-int
-TAO_GIOP::parse_header_lite (TAO_InputCDR &input,
-                             TAO_GIOP_Message_State &state)
-{
-  char *buf = input.rd_ptr ();
-
-  state.giop_version.major = TAO_DEF_GIOP_MAJOR;
-  state.giop_version.minor = TAO_DEF_GIOP_MINOR;
-  state.byte_order = TAO_ENCAP_BYTE_ORDER;
-  state.message_type = buf[TAO_GIOP_LITE_MESSAGE_TYPE_OFFSET];
-
-  input.reset_byte_order (state.byte_order);
-  input.read_ulong (state.message_size);
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class TAO_Unbounded_Sequence<TAO_GIOP_ServiceContext>;
-template class TAO_Unbounded_Sequence<TAO_IOP_TaggedComponent>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Unbounded_Sequence<TAO_GIOP_ServiceContext>
-#pragma instantiate TAO_Unbounded_Sequence<TAO_IOP_TaggedComponent>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/GIOP.h b/TAO/tao/GIOP.h
deleted file mode 100644
index 11c7fe47bd9..00000000000
--- a/TAO/tao/GIOP.h
+++ /dev/null
@@ -1,572 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Giop.h
-//
-// = DESCRIPTION
-//     GIOP data structures and support routines
-//
-//     Note that some symbols in this module are part of the
-//     "Internet" Inter-ORB Protocol (IIOP), not the General IOP.
-//     Only addressing information and certain details of connection
-//     usage are specific to IIOP; all other protocol details can be
-//     reused by ORB protocols that are built atop connection
-//     protocols other than TCP.
-//
-//     THREADING NOTE: Threads should never manipulate another
-//     thread's invocations.  In this implementation, all data
-//     structures used to represent invocations (and parts of them)
-//     are owned by the thread which created them.  Multiple threads
-//     may make of course concurrent invocations safely, since the
-//     GIOP code is reentrant.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.,
-//     Chris Cleeland <cleeland@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_GIOP_H
-#define TAO_GIOP_H
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Sequence.h"
-#include "tao/CDR.h"
-
-class TAO_Transport;
-class TAO_ORB_Core;
-
-// namespace TAO_IOP
-
-// Assigned Protocol/Profile tag values.  ORB protcols may be uniquely
-// identified by tags such as these.  This allows each ORB's own
-// objref profiles to be interchanged using IORs.
-//
-// Email to tag-request@omg.org to allocate tags.
-typedef CORBA::ULong TAO_IOP_Profile_ID;
-
-enum
-{
-  TAO_IOP_TAG_INVALID = -1,
-  TAO_IOP_TAG_INTERNET_IOP = 0,                // IIOP
-  TAO_IOP_TAG_MULTIPLE_COMPONENTS = 1,         // DCE-CIOP
-  TAO_IOP_TAG_UNIX_IOP = TAO_TAG_UIOP_PROFILE, // Read corbafwd.h
-
-  // = This is a subset of the list of other profile tags.
-  TAO_IOP_TAG_ONC_IOP = 0x4f4e4300     // ONC IOP
-};
-
-class TAO_IOP_Tagged_Profile
-{
-  // = TITLE
-  //   One per protocol.
-public:
-  TAO_IOP_Profile_ID tag;
-  TAO_opaque profile_data;
-};
-
-typedef TAO_Unbounded_Sequence<TAO_IOP_Tagged_Profile>
-        TAO_IOP_Tagged_Profile_Sequence;
-
-class TAO_IOP_IOR
-{
-  // = TITLE
-  //   InteroperableObjectReference
-  //
-  // = DESCRIPTION
-  //   ... a set of protocol-specific protocol profiles, plus a type
-  //   ID.  Only one object is denoted by all of this information.
-  //   It's OK to delete all profiles except the one for the single
-  //   protocol actually being used.
-
-public:
-  char *type_id;
-  TAO_IOP_Tagged_Profile_Sequence profiles;
-};
-
-// Some protocols can be factored into a set of optional components.
-// Use of such components is defined by the protocol's specification.
-//
-// Email to tag-request@omg.org to allocate tags.
-
-typedef CORBA::ULong TAO_IOP_ComponentId;
-
-enum
-{
-  // = DESCRIPTION
-  //   These are all defined by DCE-CIOP in OMG TC document 95-3-10.
-
-  TAO_IOP_TAG_DCE_STRING_BINDING = 100,// string binding handle
-  TAO_IOP_TAG_DCE_BINDING_NAME = 101, // CDS/GDS/... name
-  TAO_IOP_TAG_DCE_NO_PIPES = 102, // no component data
-  TAO_IOP_TAG_OBJECT_KEY = 10,  // opaque
-  TAO_IOP_TAG_ENDPOINT_ID = 11, // uuid
-  TAO_IOP_TAG_LOCATION_POLICY = 12 // octet/enum
-};
-
-class TAO_IOP_TaggedComponent
-{
-  // = DESCRIPTION
-  //   One way to represent multicomponent profiles, e.g. as done by
-  //   the DCE-CIOP protocol.  One of these gets encapsulated in
-  //   Tagged_Profile::profile_data.  TAG_MULTIPLE_COMPONENTS may be
-  //   used to represent protocol profiles structured in that way, but
-  //   protocol-specific tags facilitate simpler scanning of IORs
-  //   since you can be assured that each profile only has data used
-  //   within a single ORB protocol.
-public:
-
-  TAO_IOP_ComponentId tag;
-  TAO_opaque component_data;
-};
-
-// ****************************************************************
-
-typedef TAO_Unbounded_Sequence<TAO_IOP_TaggedComponent>
-        TAO_IOP_MultipleComponentProfile;
-
-class TAO_Export TAO_GIOP_Version
-{
-  // = TITLE
-  //   Major and Minor version number of the Inter-ORB Protocol.
-public:
-  CORBA::Octet major;
-  // Major version number
-
-  CORBA::Octet minor;
-  // Minor version number
-
-  TAO_GIOP_Version (const TAO_GIOP_Version &src);
-  // Copy constructor
-
-  TAO_GIOP_Version (CORBA::Octet maj = TAO_DEF_GIOP_MAJOR,
-                    CORBA::Octet min = TAO_DEF_GIOP_MINOR);
-  // Default constructor.
-
-  ~TAO_GIOP_Version (void);
-  // Destructor.
-
-  void set_version (CORBA::Octet maj, CORBA::Octet min);
-  // Explicitly set the major and minor version.
-
-  TAO_GIOP_Version &operator= (const TAO_GIOP_Version &src);
-  // Copy operator.
-
-  int operator== (const TAO_GIOP_Version &src);
-  int operator!= (const TAO_GIOP_Version &src);
-  // Equality operator
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_GIOP_Message_State
-{
-  // = TITLE
-  //   Represent the state of an incoming GIOP message.
-  //
-  // = DESCRIPTION
-  //   As the ORB processes a GIOP messages it needs to keep track of
-  //   how much of the message has been read, if there are any
-  //   fragments following this message, the contents of the header,
-  //   etc.
-  //   Notice that it is not a direct mapping from the
-  //   GIOP::MessageHeader IDL structure, for example, the message
-  //   flags introduced in GIOP 1.1 are expanded in several fields.
-
-public:
-  TAO_GIOP_Message_State (TAO_ORB_Core* orb_core);
-  // Constructor.
-  // The parameters are used to initialize the InputCDR stream
-
-  void reset (void);
-  // Reset the message header state and prepare it to receive the next
-  // event.
-  // already read.
-  // This method will reset the header to indicate that the last
-  // message was procesno data (not
-  // event the
-
-  int header_received (void) const;
-  // Has the header been received?
-
-  int is_complete (void);
-  // Check if the current message is complete, adjusting the fragments
-  // if required...
-
-  // = The GIOP header for the current fragment...
-  CORBA::Octet magic [4];        // "GIOP"
-  TAO_GIOP_Version giop_version; // 1.1 or 1.0
-  CORBA::Octet byte_order;       // 0 = big, 1 = little
-  CORBA::Octet more_fragments;   // For GIOP 1.1 (Requests and Replys)
-  CORBA::Octet message_type;     // MsgType above
-  CORBA::ULong message_size;     // in byte_order!
-
-  CORBA::ULong current_offset;
-  // How much of the payload has been received
-
-  TAO_InputCDR cdr;
-  // This is the InputCDR that will be used to decode the message.
-
-  ACE_Message_Block* fragments_begin;
-  ACE_Message_Block* fragments_end;
-  // The fragments are collected in a chain of message blocks (using
-  // the cont() field).  When the complete message is received the
-  // chain is reassembled into <cdr>
-
-  CORBA::Octet first_fragment_byte_order;
-  // The byte order for the the first fragment
-  // @@ The current implementation cannot handle fragments with
-  //    different byte orders, this should not be a major problem
-  //    because:
-  //    1) It is unlikely that we are going to receive fragments.
-  //    2) The spec *seems* to allow different byte_orders, but it is
-  //       unlikely that any ORB will do that.
-  //    3) Even if we allowed that at this layer the CDR classes are
-  //       not prepared to handle that.
-
-  TAO_GIOP_Version first_fragment_giop_version;
-  // The GIOP version for the first fragment
-  // @@ Same as above, all GIOP versions must match.
-
-  CORBA::Octet first_fragment_message_type;
-  // If the messages are chained this represents the message type for
-  // the *complete* message (remember that the last message will be
-  // fragment and the upper level needs to know if it is a request,
-  // locate request or what).
-
-private:
-  int append_fragment (ACE_Message_Block* current);
-  // Append <current> to the list of fragments
-  // Also resets the state, because the current message was consumed.
-};
-
-// The GIOP message header size
-#define TAO_GIOP_HEADER_LEN 12
-
-// The offset the message_size field inside the GIOP HEADER
-#define TAO_GIOP_VERSION_MAJOR_OFFSET 4
-#define TAO_GIOP_VERSION_MINOR_OFFSET 5
-#define TAO_GIOP_MESSAGE_FLAGS_OFFSET 6
-#define TAO_GIOP_MESSAGE_TYPE_OFFSET 7
-#define TAO_GIOP_MESSAGE_SIZE_OFFSET 8
-
-// The IIOP Lite header length and the offset of the message size
-// field in it.
-#define TAO_GIOP_LITE_HEADER_LEN 5
-#define TAO_GIOP_LITE_MESSAGE_SIZE_OFFSET 0
-#define TAO_GIOP_LITE_MESSAGE_TYPE_OFFSET 4
-
-// Support for Implicit ORB Service Context.
-typedef CORBA::ULong TAO_GIOP_ServiceID;
-
-enum
-{
-  // = TITLE
-  //   Values for TAO_GIOP_ServiceID.
-
-  TAO_GIOP_TransactionService = 0
-
-  // More service IDs may be defined by OMG.
-  // This is where our RIOP service ID will be defined...
-};
-
-// namespace TAO_GIOP
-
-class TAO_GIOP_ServiceContext
-{
-  // = TITLE
-  //   Sent for service context entries in the GIOP request header.
-public:
-  TAO_GIOP_ServiceID context_id;
-  TAO_opaque context_data;
-};
-
-typedef TAO_Unbounded_Sequence<TAO_GIOP_ServiceContext>
-        TAO_GIOP_ServiceContextList;
-
-extern CORBA::TypeCode_ptr TC_ServiceContextList;
-
-extern TAO_Export CORBA::Boolean
-operator<< (TAO_OutputCDR&, const TAO_GIOP_ServiceContext&);
-
-extern TAO_Export CORBA::Boolean
-operator>> (TAO_InputCDR&, TAO_GIOP_ServiceContext&);
-
-extern TAO_Export CORBA::Boolean
-operator<< (TAO_OutputCDR&, const TAO_GIOP_ServiceContextList&);
-
-extern TAO_Export CORBA::Boolean
-operator>> (TAO_InputCDR&, TAO_GIOP_ServiceContextList&);
-
-// = Reply headers
-
-enum TAO_GIOP_ReplyStatusType
-{
-  TAO_GIOP_NO_EXCEPTION,
-  // Request completed successfully
-
-  TAO_GIOP_USER_EXCEPTION,
-  // Request terminated with user exception
-
-  TAO_GIOP_SYSTEM_EXCEPTION,
-  // Request terminated with system exception
-
-  TAO_GIOP_LOCATION_FORWARD
-  // Reply is a location forward type
-};
-
-class TAO_GIOP_ReplyHeader
-{
-  // = TITLE
-  //   This class embodies the header of a GIOP reply.
-public:
-  TAO_GIOP_ServiceContextList service_info;
-  // Information
-
-  CORBA::ULong request_id;
-  // Unique identifier of the request for which this is a reply.
-
-  TAO_GIOP_ReplyStatusType reply_status;
-  // Status of the reply (see above enum).
-};
-
-class TAO_GIOP_CancelRequestHeader
-{
-  // = TITLE
-  //   Cancellation -- applies both to Requests and LocateRequests.
-public:
-  CORBA::ULong request_id;
-  // Unique identifier of the request being cancelled
-};
-
-class TAO_GIOP_LocateRequestHeader
-{
-  // = TITLE
-  //   Location service support
-public:
-  TAO_GIOP_LocateRequestHeader (void);
-  // Constructor
-
-  void init (TAO_InputCDR &msg,
-             CORBA_Environment &ACE_TRY_ENV =
-                 TAO_default_environment ());
-  // Initialize the header from the values found in <msg>.
-
-  CORBA::ULong request_id;
-  TAO_opaque object_key;
-};
-
-enum TAO_GIOP_LocateStatusType
-{
-  TAO_GIOP_UNKNOWN_OBJECT,
-  TAO_GIOP_OBJECT_HERE,
-  TAO_GIOP_OBJECT_FORWARD
-};
-
-class TAO_GIOP_LocateReplyHeader
-{
-  // = TITLE
-  //   Location reply.
-public:
-  CORBA::ULong request_id;
-  TAO_GIOP_LocateStatusType locate_status;
-};
-
-class TAO_Export TAO_GIOP
-{
-  // = TITLE
-  //   A namespace for GIOP-related operations.
-  //
-  // = DESCRIPTION
-  //   Only put static methods within this scope.
-  ACE_CLASS_IS_NAMESPACE (TAO_GIOP);
-
-public:
-
-  enum Message_Type
-  {
-    // = DESCRIPTION
-    //   All GIOP messages include a header and message type.  Not
-    //   really a message type, but needed to bring that information
-    //   back somehow.
-
-    // = GIOP message types.
-    Request = 0,                // sent by client.
-    Reply = 1,                  // by server.
-    CancelRequest = 2,          // by client.
-    LocateRequest = 3,          // by client.
-    LocateReply = 4,            // by server.
-    CloseConnection = 5,        // by server.
-    MessageError = 6,           // by both.
-    Fragment = 7                // by both.
-  };
-
-  static void send_close_connection (const TAO_GIOP_Version &version,
-                                     TAO_Transport *transport,
-                                     void *ctx);
-  // Close a connection, first sending GIOP::CloseConnection.
-
-  static CORBA::Boolean start_message (const TAO_GIOP_Version &version,
-                                       TAO_GIOP::Message_Type t,
-                                       TAO_OutputCDR &msg,
-                                       TAO_ORB_Core* orb_core);
-  // Build the header for a message of type <t> into stream <msg>.
-
-  static CORBA::Boolean write_request_header (CORBA::ULong request_id,
-                                              CORBA::Boolean is_roundtrip,
-                                              const TAO_opaque& key,
-                                              const char* opname,
-                                              CORBA::Principal_ptr principal,
-                                              TAO_OutputCDR &msg,
-                                              TAO_ORB_Core *orb_core);
-  // Write the GIOP request header.
-
-  static CORBA::Boolean write_locate_request_header (CORBA::ULong request_id,
-                                                     const TAO_opaque &key,
-                                                     TAO_OutputCDR &msg);
-  // Write the GIOP locate request header.
-
-  static int send_message (TAO_Transport *transport,
-                           TAO_OutputCDR &stream,
-                           TAO_ORB_Core* orb_core,
-                           ACE_Time_Value *max_wait_time = 0);
-  // Send message, returns TRUE if success, else FALSE.
-
-  static void dump_msg (const char *label,
-                        const u_char *ptr,
-                        size_t len);
-  // Print out a message header.
-
-  static int send_error (const TAO_GIOP_Version &version,
-                         TAO_Transport *transport);
-  // Send an error message back to a caller.
-
-  static ssize_t read_buffer (TAO_Transport *transport,
-                              char *buf,
-                              size_t len,
-                              ACE_Time_Value *max_wait_time);
-  // Loop on data read ... this is required since <recv> won't block
-  // until the requested amount of data is available.
-
-  static TAO_GIOP_ReplyStatusType convert_CORBA_to_GIOP_exception (CORBA::exception_type corba_type);
-  // Convert the exception type from CORBA to GIOP
-
-  static int read_header (TAO_Transport *transport,
-                          TAO_ORB_Core *orb_core,
-                          TAO_GIOP_Message_State &state,
-                          CORBA::ULong &header_size,
-                          TAO_InputCDR &input,
-                          ACE_Time_Value *max_wait_time);
-  static int handle_input (TAO_Transport *transport,
-                           TAO_ORB_Core *orb_core,
-                           TAO_GIOP_Message_State &state,
-                           ACE_Time_Value *max_wait_time = 0);
-
-  static int parse_reply (TAO_Transport *transport,
-                          TAO_ORB_Core *orb_core,
-                          TAO_GIOP_Message_State& state,
-                          TAO_GIOP_ServiceContextList& reply_ctx,
-                          CORBA::ULong& request_id,
-                          CORBA::ULong& reply_status);
-  static int process_server_message (TAO_Transport *transport,
-                                     TAO_ORB_Core *orb_core,
-                                     TAO_InputCDR &input,
-                                     const TAO_GIOP_Message_State& state);
-
-  static int process_server_request (TAO_Transport *transport,
-                                     TAO_ORB_Core* orb_core,
-                                     TAO_InputCDR &input,
-                                     TAO_OutputCDR &output,
-                                     const TAO_GIOP_Version& version);
-  // A request was received on the server side.
-  // <transport> is the source of the message (and thus where the
-  // replies should be sent).
-  // <orb_core> is the ORB that received the message
-  // <input> contains the message
-  // <output> can be used to store any responses
-  // <request_id> and <response_required> are set as part of the
-  // message processing.
-
-  static int process_server_locate (TAO_Transport *transport,
-                                    TAO_ORB_Core* orb_core,
-                                    TAO_InputCDR &input,
-                                    TAO_OutputCDR &output,
-                                    const TAO_GIOP_Version& version);
-  // A LocateRequest was received on the server side.
-  // <transport> is the source of the message (and thus where the
-  // replies should be sent).
-  // <orb_core> is the ORB that received the message
-  // <input> contains the message
-  // <output> can be used to store any responses
-  // <request_id> and <response_required> are set as part of the
-  // message processing.
-
-  static int send_reply_exception (const TAO_GIOP_Version &version,
-                                   TAO_Transport *transport,
-                                   TAO_ORB_Core* orb_core,
-                                   CORBA::ULong request_id,
-                                   CORBA::Exception *x);
-  // We must send a LocateReply through <transport>, this request
-  // resulted in some kind of exception.
-
-private:
-  static CORBA::Boolean start_message_std (const TAO_GIOP_Version &version,
-                                           TAO_GIOP::Message_Type t,
-                                           TAO_OutputCDR &msg);
-  // Build the standard header for a message of type <t> into
-  // stream <msg>.
-
-  static CORBA::Boolean start_message_lite (const TAO_GIOP_Version &version,
-                                            TAO_GIOP::Message_Type t,
-                                            TAO_OutputCDR &msg);
-  // Build the lightweight header for a message of type <t> into
-  // stream <msg>.
-
-  static CORBA::Boolean write_request_header_std (const TAO_GIOP_ServiceContextList& svc_ctx,
-                                                  CORBA::ULong request_id,
-                                                  CORBA::Boolean is_roundtrip,
-                                                  const TAO_opaque& key,
-                                                  const char* opname,
-                                                  CORBA::Principal_ptr principal,
-                                                  TAO_OutputCDR &msg);
-  // Encode the standard header for the Request, assuming that the
-  // GIOP header is already there.
-
-  static CORBA::Boolean write_request_header_lite (const TAO_GIOP_ServiceContextList& svc_ctx,
-                                                   CORBA::ULong request_id,
-                                                   CORBA::Boolean is_roundtrip,
-                                                   const TAO_opaque& key,
-                                                   const char* opname,
-                                                   CORBA::Principal_ptr principal,
-                                                   TAO_OutputCDR &msg);
-  // Encode the light weight header for the Request, assuming that the
-  // GIOP header is already there.
-
-  static int parse_header (TAO_ORB_Core *orb_core,
-                           TAO_InputCDR &input,
-                           TAO_GIOP_Message_State& state);
-  // Parse the header, extracting all the relevant info.
-
-  static int parse_header_std (TAO_InputCDR &input,
-                               TAO_GIOP_Message_State& state);
-
-  static int parse_header_lite (TAO_InputCDR &input,
-                                TAO_GIOP_Message_State& state);
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/GIOP.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_GIOP_H */
diff --git a/TAO/tao/GIOP.i b/TAO/tao/GIOP.i
deleted file mode 100644
index f04f67a3295..00000000000
--- a/TAO/tao/GIOP.i
+++ /dev/null
@@ -1,78 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-//
-// $Id$
-//
-
-ACE_INLINE
-TAO_GIOP_LocateRequestHeader::TAO_GIOP_LocateRequestHeader (void)
-  : request_id (0)
-{
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_GIOP_Version::TAO_GIOP_Version (const TAO_GIOP_Version &src)
-  : major (src.major),
-    minor (src.minor)
-{
-}
-
-ACE_INLINE
-TAO_GIOP_Version::TAO_GIOP_Version (CORBA::Octet maj, CORBA::Octet min)
-  : major (maj),
-    minor (min)
-{
-}
-
-ACE_INLINE
-TAO_GIOP_Version::~TAO_GIOP_Version (void)
-{
-}
-
-ACE_INLINE TAO_GIOP_Version &
-TAO_GIOP_Version::operator= (const TAO_GIOP_Version &src)
-{
-  if (this == &src)
-    return *this;
-
-  this->major = src.major;
-  this->minor = src.minor;
-  return *this;
-}
-
-ACE_INLINE void
-TAO_GIOP_Version::set_version (CORBA::Octet maj, CORBA::Octet min)
-{
-  this->major = maj;
-  this->minor = min;
-}
-
-ACE_INLINE int
-TAO_GIOP_Version::operator== (const TAO_GIOP_Version &src)
-{
-  return this->major == src.major && this->minor == src.minor;
-}
-
-ACE_INLINE int
-TAO_GIOP_Version::operator!= (const TAO_GIOP_Version &src)
-{
-  return !(*this == src);
-}
-
-// ****************************************************************
-
-ACE_INLINE void
-TAO_GIOP_Message_State::reset (void)
-{
-  this->message_size = 0;
-  this->current_offset = 0;
-  this->more_fragments = 0;
-  this->cdr.reset_contents ();
-}
-
-ACE_INLINE int
-TAO_GIOP_Message_State::header_received (void) const
-{
-  return this->message_size != 0;
-}
diff --git a/TAO/tao/GIOP_Server_Request.cpp b/TAO/tao/GIOP_Server_Request.cpp
deleted file mode 100644
index 4aec0252627..00000000000
--- a/TAO/tao/GIOP_Server_Request.cpp
+++ /dev/null
@@ -1,685 +0,0 @@
-// $Id$
-
-// Implementation of the Dynamic Server Skeleton Interface  (for GIOP)
-
-#include "tao/GIOP_Server_Request.h"
-
-#include "tao/CDR.h"
-#include "tao/POAC.h"
-#include "tao/Environment.h"
-#include "tao/NVList.h"
-#include "tao/Principal.h"
-#include "tao/ORB_Core.h"
-#include "tao/Timeprobe.h"
-#include "tao/Any.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/GIOP_Server_Request.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, GIOP_Server_Request, "$Id$")
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-
-static const char *TAO_Server_Request_Timeprobe_Description[] =
-  {
-    "GIOP_Server_Request::GIOP_Server_Request - start",
-    "GIOP_Server_Request::GIOP_Server_Request - end",
-  };
-
-enum
-  {
-    // Timeprobe description table start key
-    TAO_SERVER_REQUEST_START = 400,
-    TAO_SERVER_REQUEST_END
-  };
-
-// Setup Timeprobes
-ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Server_Request_Timeprobe_Description,
-                                  TAO_SERVER_REQUEST_START);
-
-#endif /* ACE_ENABLE_TIMEPROBES */
-
-TAO_GIOP_ServerRequest::
-    TAO_GIOP_ServerRequest (TAO_InputCDR &input,
-                            TAO_OutputCDR &output,
-                            TAO_ORB_Core *orb_core,
-                            const TAO_GIOP_Version &version,
-                            int &parse_error)
-  : incoming_ (&input),
-    outgoing_ (&output),
-    response_expected_ (0),
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-    params_ (0),
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-    retval_ (0),
-    exception_ (0),
-    exception_type_ (TAO_GIOP_NO_EXCEPTION),
-    orb_core_ (orb_core),
-    version_ (version),
-    service_info_ (),
-    request_id_ (0),
-    object_key_ (),
-    requesting_principal_ (0)
-{
-  ACE_FUNCTION_TIMEPROBE (TAO_SERVER_REQUEST_START);
-
-  parse_error = this->parse_header ();
-}
-
-int
-TAO_GIOP_ServerRequest::parse_header_std (void)
-{
-  // Tear out the service context ... we currently ignore it, but it
-  // should probably be passed to each ORB service as appropriate
-  // (e.g. transactions, security).
-  //
-  // NOTE: As security support kicks in, this is a good place to
-  // verify a digital signature, if that is required in this security
-  // environment.  It may be required even when using IPSEC security
-  // infrastructure.
-
-  TAO_InputCDR& input = *this->incoming_;
-
-  input >> this->service_info_;
-  CORBA::Boolean hdr_status = input.good_bit ();
-
-  // Get the rest of the request header ...
-
-  hdr_status = hdr_status && input.read_ulong (this->request_id_);
-  hdr_status = hdr_status && input.read_boolean (this->response_expected_);
-
-  // We use ad-hoc demarshalling here: there is no need to increase
-  // the reference count on the CDR message block, because this key
-  // will not outlive the request (or the message block).
-
-  CORBA::Long key_length;
-  hdr_status = hdr_status && input.read_long (key_length);
-  if (hdr_status)
-    {
-      this->object_key_.replace (key_length, key_length,
-                                 (CORBA::Octet*)input.rd_ptr (),
-                                 0);
-      input.skip_bytes (key_length);
-    }
-
-  if (input.char_translator () == 0)
-    {
-      CORBA::ULong length;
-      hdr_status = hdr_status && input.read_ulong (length);
-      if (hdr_status)
-        {
-          // Do not include NULL character at the end.
-          // @@ This is not getting demarshaled using the codeset
-          //    translators!
-          this->operation_.set (input.rd_ptr (),
-                                length - 1,
-                                0);
-          hdr_status = input.skip_bytes (length);
-        }
-    }
-  else
-    {
-      // @@ We could optimize for this case too, i.e. do in-place
-      //    demarshaling of the string... But there is an issue
-      //    pending on the OMG as to whether the operation should be
-      //    sent in the connection negotiated codeset or always in
-      //    ISO8859-1.
-      CORBA::String_var tmp;
-      hdr_status = hdr_status && input.read_string (tmp.inout ());
-      this->operation_.set (tmp._retn (), 1);
-    }
-
-  if (hdr_status)
-    {
-      input >> this->requesting_principal_.out ();
-      hdr_status = input.good_bit ();
-    }
-
-  return hdr_status ? 0 : -1;
-}
-
-int
-TAO_GIOP_ServerRequest::parse_header_lite (void)
-{
-  TAO_InputCDR& input = *this->incoming_;
-
-  CORBA::Boolean hdr_status = input.good_bit ();
-
-  // Get the rest of the request header ...
-
-  hdr_status = hdr_status && input.read_ulong (this->request_id_);
-  hdr_status = hdr_status && input.read_boolean (this->response_expected_);
-
-  // We use ad-hoc demarshalling here: there is no need to increase
-  // the reference count on the CDR message block, because this key
-  // will not outlive the request (or the message block).
-
-  CORBA::Long key_length;
-  hdr_status = hdr_status && input.read_long (key_length);
-  if (hdr_status)
-    {
-      this->object_key_.replace (key_length, key_length,
-                                 (CORBA::Octet*)input.rd_ptr (),
-                                 0);
-      input.skip_bytes (key_length);
-    }
-
-  if (input.char_translator () == 0)
-    {
-      CORBA::ULong length;
-      hdr_status = hdr_status && input.read_ulong (length);
-      if (hdr_status)
-        {
-          // Do not include NULL character at the end.
-          // @@ This is not getting demarshaled using the codeset
-          //    translators!
-          this->operation_.set (input.rd_ptr (),
-                                length - 1,
-                                0);
-          hdr_status = input.skip_bytes (length);
-        }
-    }
-  else
-    {
-      // @@ We could optimize for this case too, i.e. do in-place
-      //    demarshaling of the string... But there is an issue
-      //    pending on the OMG as to whether the operation should be
-      //    sent in the connection negotiated codeset or always in
-      //    ISO8859-1.
-      CORBA::String_var tmp;
-      hdr_status = hdr_status && input.read_string (tmp.inout ());
-      this->operation_.set (tmp._retn (), 1);
-    }
-
-  return hdr_status ? 0 : -1;
-}
-
-int
-TAO_GIOP_ServerRequest::parse_header (void)
-{
-  if (this->orb_core_->orb_params ()->use_lite_protocol ())
-    return this->parse_header_lite ();
-  else
-    return this->parse_header_std ();
-}
-
-// This constructor is used, by the locate request code
-
-TAO_GIOP_ServerRequest::
-    TAO_GIOP_ServerRequest (CORBA::ULong &request_id,
-                            CORBA::Boolean &response_expected,
-                            TAO_ObjectKey &object_key,
-                            const ACE_CString &operation,
-                            TAO_OutputCDR &output,
-                            TAO_ORB_Core *orb_core,
-                            const TAO_GIOP_Version &version,
-                            int &parse_error)
-  : operation_ (operation),
-    incoming_ (0),
-    outgoing_ (&output),
-    response_expected_ (response_expected),
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-    params_ (0),
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-    retval_ (0),
-    exception_ (0),
-    exception_type_ (TAO_GIOP_NO_EXCEPTION),
-    orb_core_ (orb_core),
-    version_ (version),
-    service_info_ (0),
-    request_id_ (request_id),
-    object_key_ (object_key),
-    requesting_principal_ (0)
-{
-  parse_error = 0;
-}
-
-TAO_GIOP_ServerRequest::~TAO_GIOP_ServerRequest (void)
-{
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  if (this->params_)
-    CORBA::release (this->params_);
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  delete this->retval_;
-  delete this->exception_;
-}
-
-CORBA::ORB_ptr
-TAO_GIOP_ServerRequest::orb (void)
-{
-  return this->orb_core_->orb ();
-}
-
-TAO_POA *
-TAO_GIOP_ServerRequest::oa (void)
-{
-  return this->orb_core_->root_poa ();
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-// Unmarshal in/inout params, and set up to marshal the appropriate
-// inout/out/return values later on.
-
-void
-TAO_GIOP_ServerRequest::arguments (CORBA::NVList_ptr &list,
-                                   CORBA::Environment &ACE_TRY_ENV)
-{
-  // Save params for later use when marshaling the reply.
-  this->params_ = list;
-
-  // Then unmarshal each "in" and "inout" parameter.
-  for (u_int i = 0; i < list->count (); i++)
-    {
-      CORBA::NamedValue_ptr nv = list->item (i, ACE_TRY_ENV);
-      ACE_CHECK;
-
-      // check if it is an in or inout parameter
-      if (ACE_BIT_DISABLED (nv->flags (), CORBA::ARG_IN | CORBA::ARG_INOUT))
-        continue;
-
-      CORBA::Any_ptr any = nv->value ();
-      CORBA::TypeCode_var tc = any->type ();
-
-      // @@ (JP) The following code depends on the fact that
-      // TO_InputCDR does not contain chained message blocks.
-      char *begin, *end;
-
-      // This will be the start of a new message block.
-      begin = this->incoming_->rd_ptr ();
-
-      // Skip over the next aregument.
-      CORBA::TypeCode::traverse_status status =
-        this->incoming_->skip (tc.in (), ACE_TRY_ENV);
-      ACE_CHECK;
-
-      if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          const char* param_name = nv->name ();
-
-          if (param_name == 0)
-            param_name = "(no name given)";
-
-          ACE_ERROR ((LM_ERROR,
-                      "TAO_GIOP_ServerRequest::arguments - problem while"
-                      " decoding parameter %d <%s>\n", i, param_name));
-          return;
-        }
-
-      // This will be the end of the new message block.
-      end = this->incoming_->rd_ptr ();
-
-      // Allocate the new message block and set its endpoints.
-      ACE_Message_Block *cdr;
-
-      ACE_NEW (cdr,
-               ACE_Message_Block (end - begin));
-
-      cdr->rd_ptr (begin);
-
-      cdr->wr_ptr (end);
-
-      // Stick it into the Any. It gets duplicated there.
-      any->_tao_replace (tc.in (),
-                         cdr,
-                         ACE_TRY_ENV);
-      ACE_CHECK;
-
-      // Now we can release the original.
-      ACE_Message_Block::release (cdr);
-    }
-
-  // If any data is left over, it'd be context values ... else error.
-  // We don't support context values, so it's always an error.
-
-  // @@ (TAO) support for Contexts??
-  if (incoming_->length () != 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "TAO_GIOP_ServerRequest::arguments - "
-                  "%d bytes left in buffer\n", incoming_->length ()));
-      ACE_THROW (CORBA::BAD_PARAM ());
-    }
-}
-
-// Store the result value.  There's either an exception, or a result,
-// but not both of them.  Results (and exceptions) can be reported
-// only after the parameter list has been provided (maybe empty).
-
-void
-TAO_GIOP_ServerRequest::set_result (const CORBA::Any &value,
-                                CORBA::Environment &ACE_TRY_ENV)
-{
-  // setting a result when another result already exists or if an exception
-  // exists is an error
-  if (this->retval_ || this->exception_)
-    ACE_THROW (CORBA::BAD_INV_ORDER ());
-
-  this->retval_ = new CORBA::Any (value);
-}
-
-// Store the exception value.
-
-void
-TAO_GIOP_ServerRequest::set_exception (const CORBA::Any &value,
-                                       CORBA::Environment &ACE_TRY_ENV)
-{
-  if (this->retval_ || this->exception_)
-    ACE_THROW (CORBA::BAD_INV_ORDER ());
-  else
-  {
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-    // Try to narrow to ForwardRequest
-    PortableServer::ForwardRequest_ptr forward_request =
-      PortableServer::ForwardRequest::_narrow ((CORBA::Exception *) value.value ());
-
-    // If narrowing of exception succeeded
-    if (forward_request != 0)
-      {
-        this->forward_location_ = forward_request->forward_reference;
-        this->exception_type_ = TAO_GIOP_USER_EXCEPTION;
-      }
-    // Normal exception
-    else
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-      {
-        this->exception_ = new CORBA::Any (value);
-
-        // @@ This cast is not safe, but we haven't implemented the >>=
-        // and <<= operators for base exceptions (yet).
-        CORBA_Exception* x = (CORBA_Exception*)value.value ();
-        if (CORBA_UserException::_narrow (x) != 0)
-          this->exception_type_ = TAO_GIOP_USER_EXCEPTION;
-        else
-          this->exception_type_ = TAO_GIOP_SYSTEM_EXCEPTION;
-      }
-   }
-}
-
-// this method will be utilized by the DSI servant to marshal outgoing
-// parameters
-
-void
-TAO_GIOP_ServerRequest::dsi_marshal (CORBA::Environment &ACE_TRY_ENV)
-{
-  // NOTE: if "env" is set, it takes precedence over exceptions
-  // reported using the mechanism of the ServerRequest.  Only system
-  // exceptions are reported that way ...
-  //
-  // XXX Exception reporting is ambiguous; it can be cleaner than
-  // this.  With both language-mapped and dynamic/explicit reporting
-  // mechanisms, one of must be tested "first" ... so an exception
-  // reported using the other mechanism could be "lost".  Perhaps only
-  // the language mapped one should be used for system exceptions.
-
-
-  // only if there wasn't any exception, we proceed
-  if (this->exception_type_ == TAO_GIOP_NO_EXCEPTION &&
-      CORBA::is_nil (this->forward_location_.in ()))
-    {
-      // ... then send any return value ...
-      if (this->retval_)
-        {
-          CORBA::TypeCode_var tc = this->retval_->type ();
-                if (this->retval_->any_owns_data ())
-            {
-              (void) this->outgoing_->encode (tc.in (),
-                                              retval_->value (),
-                                              0, ACE_TRY_ENV);
-              ACE_CHECK;
-            }
-          else
-            {
-              TAO_InputCDR cdr (retval_->_tao_get_cdr ());
-              (void) this->outgoing_->append (tc.in (), &cdr,
-                                              ACE_TRY_ENV);
-              ACE_CHECK;
-            }
-        }
-
-      // ... Followed by "inout" and "out" parameters, left to right
-      if (this->params_)
-        {
-          for (u_int i = 0;
-               i < this->params_->count ();
-               i++)
-            {
-              CORBA::NamedValue_ptr nv = this->params_->item (i, ACE_TRY_ENV);
-              ACE_CHECK;
-
-              if (!(nv->flags () & (CORBA::ARG_INOUT|CORBA::ARG_OUT)))
-                continue;
-
-              CORBA::Any_ptr any = nv->value ();
-              CORBA::TypeCode_var tc = any->type ();
-              if (any->any_owns_data ())
-                {
-                  (void) this->outgoing_->encode (tc.in (),
-                                                  any->value (),
-                                                  0, ACE_TRY_ENV);
-                  ACE_CHECK;
-                }
-              else
-                {
-                  TAO_InputCDR cdr (any->_tao_get_cdr ());
-                  (void) this->outgoing_->append (tc.in (),
-                                                  &cdr, ACE_TRY_ENV);
-                  ACE_CHECK;
-                }
-            }
-        }
-    }
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-// Extension
-void
-TAO_GIOP_ServerRequest::demarshal (CORBA::Environment &ACE_TRY_ENV,
-                                   // ORB related exception reporting
-                                   const TAO_Call_Data_Skel *info,
-                                   // call description
-                                   ...)
-{
-  CORBA::ULong i;
-  const TAO_Param_Data_Skel *pdp;
-  va_list param_vector;
-  va_start (param_vector, info);
-
-  for (i = 0, pdp = info->params;
-       i < info->param_count;
-       i++, pdp++)
-    {
-      void *ptr = va_arg (param_vector, void *);
-
-      if ((pdp->mode == CORBA::ARG_IN)
-          || (pdp->mode == CORBA::ARG_INOUT))
-        {
-          // Then just unmarshal the value.
-          (void) incoming_->decode (pdp->tc, ptr, 0, ACE_TRY_ENV);
-          ACE_CHECK;
-        }
-    }
-  va_end (param_vector);
-}
-
-// Extension
-
-void
-TAO_GIOP_ServerRequest::marshal (CORBA::Environment &ACE_TRY_ENV,
-                                 // ORB related exception reporting
-                                 //                             CORBA::Environment &skel_env,
-                                 // skeleton related exception reporting
-                                 const TAO_Call_Data_Skel *info,
-                                 // call description
-                                 ...)
-{
-  // what is "ACE_TRY_ENV" and "skel_env"?
-  // "skel_env" holds the exception that got raised inside the operation
-  // implementation (upcall)
-  //
-  // "orb_env" is the exception that may have been raised due to things going
-  // wrong in the entire dispatch process. These are always system exceptions.
-
-  // check if we are inside with an exception. This may have happened
-  // since the upcall could have set some exception
-#if 0 /* ASG */
-  if (skel_env.exception ())
-    {
-      // We must increase the "refcnt" on the exception, because it is
-      // "owned" by both <skel_env> and (eventually) by the
-      // Server_Request.
-      CORBA::Exception_ptr exception = skel_env.exception ();
-      exception->_incr_refcnt ();
-
-      // The Any does not own the because ultimately it will be owned
-      // by the Server_Request via the call to "set_exception"
-      CORBA::Any any (skel_env.exception ()->_type (), exception);
-      this->set_exception (any, ACE_TRY_ENV);
-    }
-#endif
-
-  // Setup a Reply message so that we can marshal all the outgoing parameters
-  // into it. If an exception was set, then that gets marshaled into the reply
-  // message and we don't do anything after that
-  this->init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-
-#if 0 /* ASG */
-  // exception? nothing to do after this
-  if (orb_env.exception () || skel_env.exception ())
-    return;
-  ACE_CHECK;
-#endif
-
-  CORBA::ULong i;
-  const TAO_Param_Data_Skel *pdp;
-  va_list param_vector;
-  va_start (param_vector, info);
-
-  ACE_TRY
-    {
-      for (i = 0, pdp = info->params;
-           i < info->param_count;
-           i++, pdp++)
-        {
-          void *ptr = va_arg (param_vector, void *);
-
-          if (pdp->mode == 0)
-            {
-              // check if the return type is not void
-              CORBA::TCKind result = pdp->tc->kind (ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-              if (result != CORBA::tk_void)
-                {
-                  // Then just marshal the value.
-                  (void) this->outgoing_->encode (pdp->tc, ptr, 0,
-                                                  ACE_TRY_ENV);
-                  ACE_TRY_CHECK;
-                }
-            }
-          else if ((pdp->mode == CORBA::ARG_INOUT)
-                   || (pdp->mode == CORBA::ARG_OUT))
-            {
-              // Then just marshal the value.
-              (void) this->outgoing_->encode (pdp->tc, ptr, 0, ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-            }
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO_GIOP_ServerRequest::marshal - parameter encode failed");
-      ACE_RETHROW;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-
-  va_end (param_vector);
-}
-
-void
-TAO_GIOP_ServerRequest::init_reply (CORBA::Environment &ACE_TRY_ENV)
-{
-  // Construct a REPLY header.
-  TAO_GIOP::start_message (this->version_,
-                           TAO_GIOP::Reply,
-                           *this->outgoing_,
-                           this->orb_core_);
-
-  TAO_GIOP_ServiceContextList resp_ctx;
-  resp_ctx.length (0);
-  *this->outgoing_ << resp_ctx;
-  this->outgoing_->write_ulong (this->request_id_);
-
-  // Standard exceptions are caught in Connect::handle_input
-
-  // Forward exception only.
-  if (!CORBA::is_nil (this->forward_location_.in ()))
-    {
-      this->outgoing_->write_ulong (TAO_GIOP_LOCATION_FORWARD);
-
-      CORBA::Object_ptr object_ptr = this->forward_location_.in ();
-      if ((*this->outgoing_ << object_ptr) == 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO_GIOP_ServerRequest::marshal - "
-                      "encoding forwarded objref failed\n"));
-          return;
-        }
-    }
-
-  // Any exception at all.
-  else if (this->exception_ == 0)
-    {
-      // First finish the GIOP header ...
-      this->outgoing_->write_ulong (TAO_GIOP_NO_EXCEPTION);
-    }
-  else
-    {
-      CORBA::TypeCode_ptr except_tc;
-
-      except_tc = this->exception_->type ();
-
-      // Finish the GIOP Reply header, then marshal the exception.
-      // XXX x->type () someday ...
-
-      this->outgoing_->write_ulong (this->exception_type_);
-
-      // we use the any's ACE_Message_Block
-      TAO_InputCDR cdr (this->exception_->_tao_get_cdr ());
-      (void) this->outgoing_->append (except_tc, &cdr, ACE_TRY_ENV);
-    }
-}
-
-CORBA::Object_ptr
-TAO_GIOP_ServerRequest::forward_location (void)
-// get the forward_location
-{
-  return CORBA::Object::_duplicate (this->forward_location_.in ());
-}
-
-CORBA::ULong
-TAO_GIOP_ServerRequest::exception_type (void)
-// get the exception type
-{
-  return this->exception_type_;
-}
diff --git a/TAO/tao/GIOP_Server_Request.h b/TAO/tao/GIOP_Server_Request.h
deleted file mode 100644
index 8aecef49e3a..00000000000
--- a/TAO/tao/GIOP_Server_Request.h
+++ /dev/null
@@ -1,220 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    GIOP_Server_Request.h
-//
-// = DESCRIPTION
-//    Header file for CORBA's Dynamic Server Skeleton Interface's
-//    "Server Request" type.  (for GIOP)
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems, Inc. and Chris Cleeland.
-//     Modifications by Aniruddha Gokhale based on CORBAv2.2 Feb 98
-// ============================================================================
-
-#ifndef TAO_GIOP_SERVER_REQUEST_H
-#define TAO_GIOP_SERVER_REQUEST_H
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Server_Request.h"
-#include "tao/Principal.h"
-
-class TAO_Export TAO_GIOP_ServerRequest : public CORBA_ServerRequest
-{
-  // = TITLE
-  //    Class representing an GIOP ServerRequest object.
-public:
-  // = Initialization and termination methods.
-  TAO_GIOP_ServerRequest (TAO_InputCDR &input,
-                          TAO_OutputCDR &output,
-                          TAO_ORB_Core *orb_core,
-                          const TAO_GIOP_Version &version,
-                          int &parse_error);
-  // Constructor
-  TAO_GIOP_ServerRequest (CORBA::ULong &request_id,
-                          CORBA::Boolean &response_expected,
-                          TAO_ObjectKey &object_key,
-                          const ACE_CString &operation,
-                          TAO_OutputCDR &output,
-                          TAO_ORB_Core *orb_core,
-                          const TAO_GIOP_Version &version,
-                          int &parse_error);
-
-  virtual ~TAO_GIOP_ServerRequest (void);
-  // Destructor.
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  // = General ServerRequest operations
-  void arguments (CORBA::NVList_ptr &list,
-                  CORBA_Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
-
-  void set_result (const CORBA::Any &value,
-                   CORBA_Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
-
-  void set_exception (const CORBA::Any &value,
-                      CORBA_Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-
-  virtual void dsi_marshal (CORBA_Environment &ACE_TRY_ENV =
-                                TAO_default_environment ());
-  // does the marshaling of outgoing parameters and is used by the DSI
-  // based scheme
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  // = Request attributes.
-
-  const char *operation (void) const;
-  // return the operation name
-
-  unsigned int operation_length (void) const;
-  // return the legnth of the operation
-
-  //  CORBA::Context_ptr ctx (void);
-  // return the context pointer
-
-  // = TAO extensions
-
-  CORBA::ORB_ptr  orb (void);
-  // return the underlying ORB
-
-  TAO_POA *oa (void);
-  // return the Object Adapter
-
-  //
-  // = TAO extensions
-  // meant to be used internally.
-  //
-
-  virtual void demarshal (CORBA_Environment &ACE_TRY_ENV,
-                          const TAO_Call_Data_Skel *info,
-                          ...);
-  // demarshal incoming parameters. Used by the SII skeleton (i.e., the IDL
-  // compiler generated skeleton)
-
-  virtual void marshal (CORBA_Environment &ACE_TRY_ENV,
-                        //                        CORBA_Environment &skel_env,
-                        const TAO_Call_Data_Skel *info,
-                        ...);
-  // marshal outgoing parameters and return value. This is used by the SSI
-  // i.e., by the IDL compiler generated skeletons.
-
-  virtual void init_reply (CORBA_Environment &ACE_TRY_ENV =
-                               TAO_default_environment ());
-  // start a Reply message
-
-  virtual TAO_InputCDR &incoming (void);
-  // Retrieve the incoming stream.
-
-  virtual TAO_OutputCDR &outgoing (void);
-  // Retrieve the outgoing stream.
-
-  virtual CORBA::Boolean response_expected (void) const;
-  // is the response expected
-
-  virtual CORBA::Principal_ptr principal (void) const;
-
-  virtual const TAO_ObjectKey &object_key (void) const;
-
-  virtual const TAO_GIOP_ServiceContextList &service_info (void) const;
-
-  // The pseudo object methods, not really needed because the class is
-  // not in the spec, but we add them for the sake of completeness.
-  static TAO_GIOP_ServerRequest* _duplicate (TAO_GIOP_ServerRequest*);
-  static TAO_GIOP_ServerRequest* _nil (void);
-
-  // To handle System Exceptions at the lowest level,
-  // a method returning the request_id_ is needed.
-
-  CORBA::ULong request_id (void);
-
-  CORBA::Object_ptr forward_location (void);
-  // get the forward_location
-
-  CORBA::ULong exception_type (void);
-  // get the exception type
-
-private:
-  int parse_header (void);
-  // Parse the request header and store the result on this object.
-
-  int parse_header_std (void);
-  // Parse the standard GIOP request header and store the result on
-  // this object.
-
-  int parse_header_lite (void);
-  // Parse the lightweight version of the GIOP request header and
-  // store the result on this object.
-
-private:
-  ACE_CString operation_;
-  // Operation name.
-
-  CORBA::Object_var forward_location_;
-
-  TAO_InputCDR *incoming_;
-  // Incoming stream.
-
-  TAO_OutputCDR *outgoing_;
-  // Outgoing stream.
-
-  CORBA::Boolean response_expected_;
-  // is it oneway or twoway
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  CORBA::NVList_ptr params_;
-  // Incoming parameters.
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  CORBA::Any_ptr retval_;
-  // Return value.
-
-  CORBA::Any_ptr exception_;
-  // Any exception which might be raised.
-
-  //  TAO_GIOP_ReplyStatusType exception_type_;
-  CORBA::ULong exception_type_;
-  // exception type (will be NO_EXCEPTION in the majority of the cases)
-
-  TAO_ORB_Core* orb_core_;
-  // A pointer to the ORB Core for the context where the request was
-  // created.
-
-  TAO_GIOP_Version version_;
-  // The version for the GIOP request, the reply must have the same
-  // one.
-
-  TAO_GIOP_ServiceContextList service_info_;
-  // The service context for the request (CORBA Reference?)
-
-  CORBA::ULong request_id_;
-  // Unique identifier for a request
-
-  TAO_ObjectKey object_key_;
-  // The object key of the destination object.
-
-  CORBA::Principal_var requesting_principal_;
-  // Identifies the requester
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/GIOP_Server_Request.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_GIOP_SERVER_REQUEST_H */
diff --git a/TAO/tao/GIOP_Server_Request.i b/TAO/tao/GIOP_Server_Request.i
deleted file mode 100644
index 5f2ab14107e..00000000000
--- a/TAO/tao/GIOP_Server_Request.i
+++ /dev/null
@@ -1,78 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// @@ TODO TAO allocates its ServerRequest objects from the stack,
-// using reference counting wouldn't help much.  Using a _clone()
-// method would make the following methods really easy to implement,
-// but that's hard to implement for the extremely optimized
-// TAO_GIOP_ServerRequest.
-// Another solution would be to modify the class hierarchy, make
-// ServerRequest the "slow" version (with copies for each field) and
-// TAO_GIOP_ServerRequest the "fast" version (with no copies at all). The
-// first would be use for DII and the later for SII.
-
-ACE_INLINE TAO_InputCDR &
-TAO_GIOP_ServerRequest::incoming (void)
-{
-  return *this->incoming_;
-}
-
-ACE_INLINE TAO_OutputCDR &
-TAO_GIOP_ServerRequest::outgoing (void)
-{
-  return *this->outgoing_;
-}
-
-// Invocation attributes.
-
-ACE_INLINE const char *
-TAO_GIOP_ServerRequest::operation (void) const
-{
-  return this->operation_.c_str ();
-}
-
-// get the length of the operation name.
-ACE_INLINE unsigned int
-TAO_GIOP_ServerRequest::operation_length (void) const
-{
-  return this->operation_.length ();
-}
-
-#if 0
-//@@ (TAO) to do after Context is implemented
-ACE_INLINE CORBA::Context_ptr
-TAO_GIOP_ServerRequest::ctx (void)
-{
-  return 0;
-}
-#endif
-
-ACE_INLINE CORBA::Boolean
-TAO_GIOP_ServerRequest::response_expected (void) const
-{
-  return this->response_expected_;
-}
-
-ACE_INLINE CORBA::Principal_ptr
-TAO_GIOP_ServerRequest::principal (void) const
-{
-  return this->requesting_principal_.ptr ();
-}
-
-ACE_INLINE const TAO_ObjectKey &
-TAO_GIOP_ServerRequest::object_key (void) const
-{
-  return this->object_key_;
-}
-
-ACE_INLINE const TAO_GIOP_ServiceContextList &
-TAO_GIOP_ServerRequest::service_info (void) const
-{
-  return this->service_info_;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_GIOP_ServerRequest::request_id (void)
-{
-  return this->request_id_;
-}
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
deleted file mode 100644
index bde9b999deb..00000000000
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ /dev/null
@@ -1,222 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//
-// = FILENAME
-//
-// = DESCRIPTION
-//
-// = AUTHOR
-//
-// ============================================================================
-
-#include "tao/IIOP_Acceptor.h"
-#include "tao/IIOP_Profile.h"
-#include "tao/MProfile.h"
-#include "tao/ORB_Core.h"
-#include "tao/Server_Strategy_Factory.h"
-#include "tao/GIOP.h"
-#include "tao/debug.h"
-
-#if !defined(__ACE_INLINE__)
-#include "tao/IIOP_Acceptor.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(tao, IIOP_Acceptor, "$Id$")
-
-// ****************************************************************
-
-TAO_IIOP_Acceptor::TAO_IIOP_Acceptor (void)
-  : TAO_Acceptor (TAO_IOP_TAG_INTERNET_IOP),
-    base_acceptor_ (),
-    version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR),
-    orb_core_ (0)
-{
-}
-
-// TODO =
-//    2) For V1.[1,2] there are tagged components
-//    3) Create multiple profiles for wild carded endpoints (may be multiple
-//       interfaces over which we can receive requests.  Thus a profile
-//       must be made for each one.
-
-int
-TAO_IIOP_Acceptor::create_mprofile (const TAO_ObjectKey &object_key,
-                                    TAO_MProfile &mprofile)
-{
-  // @@ we only make one for now
-  int count = mprofile.profile_count ();
-  if ((mprofile.size () - count) < 1)
-    {
-      if (mprofile.grow (count + 1) == -1)
-        return -1;
-    }
-
-  TAO_IIOP_Profile *pfile;
-  ACE_NEW_RETURN (pfile,
-                  TAO_IIOP_Profile (this->host_.c_str (),
-                                    this->address_.get_port_number (),
-                                    object_key,
-                                    this->address_,
-                                    this->version_,
-                                    this->orb_core_),
-                  -1);
-
-  if (mprofile.give_profile (pfile) == -1)
-    return -1;
-
-  if (this->orb_core_->orb_params ()->std_profile_components () == 0)
-    return 0;
-
-  pfile->tagged_components ().set_orb_type (TAO_ORB_TYPE);
-
-  CONV_FRAME::CodeSetComponentInfo code_set_info;
-  code_set_info.ForCharData.native_code_set  = TAO_DEFAULT_CHAR_CODESET_ID;
-  code_set_info.ForWcharData.native_code_set = TAO_DEFAULT_WCHAR_CODESET_ID;
-  pfile->tagged_components ().set_code_sets (code_set_info);
-
-  return 0;
-}
-
-int
-TAO_IIOP_Acceptor::is_collocated (const TAO_Profile* pfile)
-{
-  const TAO_IIOP_Profile *profile =
-    ACE_dynamic_cast(const TAO_IIOP_Profile*, pfile);
-
-  // compare the port and sin_addr (numeric host address)
-  return profile->object_addr () == this->address_;
-}
-
-ACE_Event_Handler *
-TAO_IIOP_Acceptor::acceptor (void)
-{
-  return &base_acceptor_;
-}
-
-int
-TAO_IIOP_Acceptor::close (void)
-{
-  return this->base_acceptor_.close ();
-}
-
-int
-TAO_IIOP_Acceptor::open (TAO_ORB_Core *orb_core,
-                         int major,
-                         int minor,
-                         ACE_CString &address)
-{
-  if (major >=0 && minor >= 0)
-    this->version_.set_version (ACE_static_cast (CORBA::Octet,major),
-                                ACE_static_cast (CORBA::Octet,minor));
-  ACE_INET_Addr addr (address.c_str ());
-
-  return this->open_i (orb_core, addr);
-}
-
-int
-TAO_IIOP_Acceptor::open_default (TAO_ORB_Core *orb_core)
-{
-  // @@ Until we can support multihomed machines correctly we must
-  //    pick the "default interface" and only listen on that IP
-  //    address.
-
-  ACE_INET_Addr addr;
-  char buffer[MAXHOSTNAMELEN + 1];
-  if (addr.get_host_name (buffer, sizeof(buffer)) != 0)
-    return -1;
-
-  addr.set (u_short(0), buffer, 1);
-
-  this->host_ = buffer;
-
-  return this->open_i (orb_core, addr);
-}
-
-int
-TAO_IIOP_Acceptor::open_i (TAO_ORB_Core* orb_core,
-                           const ACE_INET_Addr& addr)
-{
-  this->orb_core_ = orb_core;
-
-  if (this->base_acceptor_.open (orb_core, addr) == -1)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "\n\nTAO (%P|%t) IIOP_Acceptor::open_i - %p\n\n",
-                    "cannot open acceptor"));
-      return -1;
-    }
-
-  // @@ Should this be a catastrophic error???
-  if (this->base_acceptor_.acceptor ().get_local_addr (this->address_) != 0)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "\n\nTAO (%P|%t) IIOP_Acceptor::open_i - %p\n\n",
-                    "cannot get local addr"));
-      return -1;
-    }
-
-  if (orb_core->orb_params ()->use_dotted_decimal_addresses ())
-    {
-      const char *tmp;
-      if ((tmp = addr.get_host_addr ()) == 0)
-        {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "\n\nTAO (%P|%t) IIOP_Acceptor::open_i - %p\n\n",
-                        "cannot cache hostname"));
-          return -1;
-        }
-      this->host_ = tmp;
-    }
-  else
-    {
-      char tmp_host[MAXHOSTNAMELEN+1];
-      if (addr.get_host_name (tmp_host, sizeof(tmp_host)) != 0)
-        {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "\n\nTAO (%P|%t) IIOP_Acceptor::open_i - %p\n\n",
-                        "cannot cache hostname"));
-          return -1;
-        }
-      this->host_ = tmp_host;
-    }
-
-  if (TAO_debug_level > 5)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "\nTAO (%P|%t) IIOP_Acceptor::open_i - "
-                  "listening on: <%s:%u>\n",
-                  this->host_.c_str (),
-                  this->address_.get_port_number ()));
-    }
-
-  return 0;
-}
-
-CORBA::ULong
-TAO_IIOP_Acceptor::endpoint_count (void)
-{
-  // @@ for now just assume one!
-  // we should take a look at the local address, if it is zero then
-  // get the list of available IP interfaces and return this number.
-  return 1;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Acceptor<TAO_IIOP_Server_Connection_Handler, TAO_SOCK_ACCEPTOR>;
-template class TAO_Acceptor_Impl<TAO_IIOP_Server_Connection_Handler, TAO_SOCK_ACCEPTOR>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Acceptor<TAO_IIOP_Server_Connection_Handler, TAO_SOCK_ACCEPTOR>
-#pragma instantiate TAO_Acceptor_Impl<TAO_IIOP_Server_Connection_Handler, TAO_SOCK_ACCEPTOR>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h
deleted file mode 100644
index c79d7b1de47..00000000000
--- a/TAO/tao/IIOP_Acceptor.h
+++ /dev/null
@@ -1,113 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    IIOP_Acceptor.h
-//
-// = DESCRIPTION
-//    IIOP specific acceptor processing
-//
-// = AUTHOR
-//    Fred Kuhns
-//
-// ============================================================================
-
-#ifndef TAO_IIOP_ACCEPTOR_H
-#define TAO_IIOP_ACCEPTOR_H
-
-#include "tao/Pluggable.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/IIOP_Connect.h"
-#include "tao/Acceptor_Impl.h"
-
-#include "ace/Acceptor.h"
-#include "ace/SOCK_Acceptor.h"
-
-// TAO IIOP_Acceptor concrete call defination
-
-class TAO_Export TAO_IIOP_Acceptor : public TAO_Acceptor
-{
-  // = TITLE
-  //   TAO_IIOP_Acceptor
-  //
-  // = DESCRIPTION
-  //   The IIOP-specific bridge class for the concrete acceptor.
-  //
-public:
-  // TAO_IIOP_Acceptor (ACE_INET_Addr &addr);
-  // Create Acceptor object using addr.
-
-  TAO_IIOP_Acceptor (void);
-  // Create Acceptor object using addr.
-
-  virtual int open (TAO_ORB_Core *orb_core,
-                    int version_major,
-                    int version_minor,
-                    ACE_CString &address);
-  // initialize acceptor for this address.
-
-  virtual int open_default (TAO_ORB_Core *orb_core);
-  // Open an acceptor on the default endpoint for this protocol
-
-  int create_mprofile (const TAO_ObjectKey &object_key,
-                       TAO_MProfile &mprofile);
-  // create profile objects for this Acceptor using the SAP
-  // (service access point, Host and Port) and object_key.
-
-  // = See TAO_Acceptor
-  virtual int is_collocated (const TAO_Profile*);
-
-  ACE_Event_Handler *acceptor (void);
-  // Return the underlying acceptor object, ACE_Acceptor
-
-  virtual int close (void);
-  // Closes the acceptor
-
-  CORBA::ULong endpoint_count (void);
-  // return the number of profiles this will generate
-
-  const ACE_INET_Addr& address (void) const;
-  // @@ Helper method for the implementation repository, should go
-  //    away
-
-  typedef TAO_Acceptor_Impl<TAO_IIOP_Server_Connection_Handler, ACE_SOCK_ACCEPTOR> TAO_IIOP_BASE_ACCEPTOR;
-
-private:
-  int open_i (TAO_ORB_Core* orb_core,
-              const ACE_INET_Addr& addr);
-  // Implement the common part of the open*() methods
-
-private:
-  TAO_IIOP_BASE_ACCEPTOR base_acceptor_;
-  // the concrete acceptor, as a pointer to it's base class.
-
-  ACE_INET_Addr address_;
-  ACE_CString host_;
-  // Cache the information about the endpoint serviced by this
-  // acceptor.
-  // @@ TODO there may in fact be multiple hostnames for this
-  //    endpoint. For example it the IP address is INADDR_ANY
-  //    (0.0.0.0) then there will be possibly a different hostname for
-  //    each interface.
-
-  TAO_GIOP_Version version_;
-  // The GIOP version for this endpoint
-
-  TAO_ORB_Core *orb_core_;
-  // ORB Core.
-};
-
-#if defined(__ACE_INLINE__)
-#include "tao/IIOP_Acceptor.i"
-#endif /* __ACE_INLINE__ */
-
-#endif  /* TAO_IIOP_ACCEPTOR_H */
diff --git a/TAO/tao/IIOP_Acceptor.i b/TAO/tao/IIOP_Acceptor.i
deleted file mode 100644
index d8d4b96d83e..00000000000
--- a/TAO/tao/IIOP_Acceptor.i
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-
-ACE_INLINE const ACE_INET_Addr&
-TAO_IIOP_Acceptor::address (void) const
-{
-  return this->address_;
-}
diff --git a/TAO/tao/IIOP_Connect.cpp b/TAO/tao/IIOP_Connect.cpp
deleted file mode 100644
index fa6615cbc5c..00000000000
--- a/TAO/tao/IIOP_Connect.cpp
+++ /dev/null
@@ -1,386 +0,0 @@
-// $Id$
-
-#include "tao/IIOP_Connect.h"
-#include "tao/Timeprobe.h"
-#include "tao/debug.h"
-#include "tao/ORB_Core.h"
-#include "tao/ORB.h"
-#include "tao/CDR.h"
-#include "tao/GIOP.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/IIOP_Connect.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, IIOP_Connect, "$Id$")
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-
-static const char *TAO_IIOP_Connect_Timeprobe_Description[] =
-{
-  "IIOP_Server_Connection_Handler::handle_input - start",
-  "IIOP_Server_Connection_Handler::handle_input - end",
-
-  "IIOP_Server_Connection_Handler::handle_locate - start",
-  "IIOP_Server_Connection_Handler::handle_locate - end",
-
-  "IIOP_Server_Connection_Handler::receive_request - end",
-
-  "IIOP_Client_Connection_Handler::send_request - start",
-  "IIOP_Client_Connection_Handler::send_request - end"};
-
-enum
-{
-  // Timeprobe description table start key
-  TAO_IIOP_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_START = 300,
-  TAO_IIOP_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_END,
-
-  TAO_IIOP_SERVER_CONNECTION_HANDLER_HANDLE_LOCATE_START,
-  TAO_IIOP_SERVER_CONNECTION_HANDLER_HANDLE_LOCATE_END,
-
-  TAO_IIOP_SERVER_CONNECTION_HANDLER_RECEIVE_REQUEST_END,
-
-  TAO_IIOP_CLIENT_CONNECTION_HANDLER_SEND_REQUEST_START,
-  TAO_IIOP_CLIENT_CONNECTION_HANDLER_SEND_REQUEST_END
-};
-
-// Setup Timeprobes
-ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_IIOP_Connect_Timeprobe_Description,
-                                  TAO_IIOP_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_START);
-
-#endif /* ACE_ENABLE_TIMEPROBES */
-
-TAO_IIOP_Handler_Base::TAO_IIOP_Handler_Base (TAO_ORB_Core *orb_core)
-  : TAO_SVC_HANDLER (orb_core->thr_mgr (), 0, 0)
-{
-}
-
-TAO_IIOP_Handler_Base::TAO_IIOP_Handler_Base (ACE_Thread_Manager *t)
-  : TAO_SVC_HANDLER (t, 0, 0)
-{
-}
-
-// ****************************************************************
-
-TAO_IIOP_Server_Connection_Handler::TAO_IIOP_Server_Connection_Handler (ACE_Thread_Manager *t)
-  : TAO_IIOP_Handler_Base (t),
-    transport_ (this, 0),
-    orb_core_ (0),
-    tss_resources_ (0)
-{
-  // This constructor should *never* get called, it is just here to
-  // make the compiler happy: the default implementation of the
-  // Creation_Strategy requires a constructor with that signature, we
-  // don't use that implementation, but some (most?) compilers
-  // instantiate it anyway.
-  ACE_ASSERT (this->orb_core_ != 0);
-}
-
-TAO_IIOP_Server_Connection_Handler::TAO_IIOP_Server_Connection_Handler (TAO_ORB_Core *orb_core)
-  : TAO_IIOP_Handler_Base (orb_core),
-    transport_ (this, orb_core),
-    orb_core_ (orb_core),
-    tss_resources_ (orb_core->get_tss_resources ())
-{
-}
-
-TAO_IIOP_Server_Connection_Handler::~TAO_IIOP_Server_Connection_Handler (void)
-{
-}
-
-int
-TAO_IIOP_Server_Connection_Handler::open (void*)
-{
-#if !defined (ACE_LACKS_SOCKET_BUFSIZ)
-  int sndbufsize =
-    this->orb_core_->orb_params ()->sock_sndbuf_size ();
-  int rcvbufsize =
-    this->orb_core_->orb_params ()->sock_rcvbuf_size ();
-
-  if (this->peer ().set_option (SOL_SOCKET,
-                                SO_SNDBUF,
-                                (void *) &sndbufsize,
-                                sizeof (sndbufsize)) == -1
-      && errno != ENOTSUP)
-    return -1;
-  else if (this->peer ().set_option (SOL_SOCKET,
-                                     SO_RCVBUF,
-                                     (void *) &rcvbufsize,
-                                     sizeof (rcvbufsize)) == -1
-           && errno != ENOTSUP)
-    return -1;
-#endif /* !ACE_LACKS_SOCKET_BUFSIZ */
-
-#if defined (TCP_NODELAY)
-  int nodelay = 1;
-  if (this->peer ().set_option (IPPROTO_TCP,
-                                TCP_NODELAY,
-                                (void *) &nodelay,
-                                sizeof (nodelay)) == -1)
-    return -1;
-#endif /* TCP_NODELAY */
-
-  (void) this->peer ().enable (ACE_CLOEXEC);
-  // Set the close-on-exec flag for that file descriptor. If the
-  // operation fails we are out of luck (some platforms do not support
-  // it and return -1).
-
-  // Called by the <Strategy_Acceptor> when the handler is completely
-  // connected.
-  ACE_INET_Addr addr;
-
-  if (this->peer ().get_remote_addr (addr) == -1)
-    return -1;
-
-  char client[MAXHOSTNAMELEN + 16];
-  (void) addr.addr_to_string (client, sizeof (client));
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO (%P|%t) IIOP connection from client <%s> on %d\n",
-                client, this->peer ().get_handle ()));
-
-  return 0;
-}
-
-int
-TAO_IIOP_Server_Connection_Handler::activate (long flags,
-                                              int n_threads,
-                                              int force_active,
-                                              long priority,
-                                              int grp_id,
-                                              ACE_Task_Base *task,
-                                              ACE_hthread_t thread_handles[],
-                                              void *stack[],
-                                              size_t stack_size[],
-                                              ACE_thread_t  thread_names[])
-{
-  if (TAO_orbdebug)
-    ACE_DEBUG  ((LM_DEBUG,
-                 "TAO (%P|%t) IIOP_Server_Connection_Handler::activate %d "
-                 "threads, flags = %d\n",
-                 n_threads,
-                 flags,
-                 THR_BOUND));
-
-  return TAO_SVC_HANDLER::activate (flags,
-                                    n_threads,
-                                    force_active,
-                                    priority,
-                                    grp_id,
-                                    task,
-                                    thread_handles,
-                                    stack,
-                                    stack_size,
-                                    thread_names);
-}
-
-int
-TAO_IIOP_Server_Connection_Handler::handle_close (ACE_HANDLE handle,
-                                                  ACE_Reactor_Mask rm)
-{
-  if (TAO_orbdebug)
-    ACE_DEBUG  ((LM_DEBUG,
-                 "TAO (%P|%t) IIOP_Server_Connection_Handler::handle_close "
-                 "(%d, %d)\n",
-                 handle,
-                 rm));
-
-  return TAO_SVC_HANDLER::handle_close (handle, rm);
-}
-
-int
-TAO_IIOP_Server_Connection_Handler::svc (void)
-{
-  // This method is called when an instance is "activated", i.e.,
-  // turned into an active object.  Presumably, activation spawns a
-  // thread with this method as the "worker function".
-  int result = 0;
-
-  // Inheriting the ORB_Core tss stuff from the parent thread.
-  this->orb_core_->inherit_from_parent_thread (this->tss_resources_);
-
-  if (TAO_orbdebug)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO (%P|%t) IIOP_Server_Connection_Handler::svc begin\n"));
-
-  // Here we simply synthesize the "typical" event loop one might find
-  // in a reactive handler, except that this can simply block waiting
-  // for input.
-
-  while ((result = handle_input ()) >= 0)
-    continue;
-
-  if (TAO_orbdebug)
-    ACE_DEBUG  ((LM_DEBUG,
-                 "(%P|%t) TAO_IIOP_Server_Connection_Handler::svc end\n"));
-
-  return result;
-}
-
-int
-TAO_IIOP_Server_Connection_Handler::handle_input (ACE_HANDLE)
-{
-  int result = TAO_GIOP::handle_input (this->transport (),
-                                       this->orb_core_,
-                                       this->transport_.message_state_);
-
-  if (result == -1 && TAO_debug_level > 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - %p\n",
-                  "IIOP_Server_Connection_Handler::handle_input, "
-                  "handle_input"));
-    }
-
-  if (result == 0 || result == -1)
-    return result;
-
-  result = TAO_GIOP::process_server_message (this->transport (),
-                                             this->orb_core_,
-                                             this->transport_.message_state_.cdr,
-                                             this->transport_.message_state_);
-  if (result != -1)
-    {
-      this->transport_.message_state_.reset ();
-      result = 0;
-    }
-
-  return result;
-}
-
-// ****************************************************************
-
-//    transport obj.
-TAO_IIOP_Client_Connection_Handler::
-TAO_IIOP_Client_Connection_Handler (ACE_Thread_Manager *t,
-                                    TAO_ORB_Core* orb_core)
-  : TAO_IIOP_Handler_Base (t),
-    transport_ (this, orb_core),
-    orb_core_ (orb_core)
-{
-}
-
-TAO_IIOP_Client_Connection_Handler::~TAO_IIOP_Client_Connection_Handler (void)
-{
-}
-
-
-// @@ Should I do something here to enable non-blocking?? (Alex).
-// @@ Alex: I don't know if this is the place to do it, but the way to
-//    do it is:
-//    if (this->peer ().enable (ACE_NONBLOCK) == -1)
-//       return -1;
-//    Probably we will need to use the transport to decide if it is
-//    needed or not.
-
-int
-TAO_IIOP_Client_Connection_Handler::open (void *)
-{
-  // @@ TODO: This flags should be set using the RT CORBA policies...
-
-  // Here is where we could enable all sorts of things such as
-  // nonblock I/O, sock buf sizes, TCP no-delay, etc.
-
-#if !defined (ACE_LACKS_SOCKET_BUFSIZ)
-  int sndbufsize =
-    this->orb_core_->orb_params ()->sock_sndbuf_size ();
-  int rcvbufsize =
-    this->orb_core_->orb_params ()->sock_rcvbuf_size ();
-
-  if (this->peer ().set_option (SOL_SOCKET,
-                                SO_SNDBUF,
-                                (void *) &sndbufsize,
-                                sizeof (sndbufsize)) == -1
-      && errno != ENOTSUP)
-    return -1;
-  else if (this->peer ().set_option (SOL_SOCKET,
-                                     SO_RCVBUF,
-                                     (void *) &rcvbufsize,
-                                     sizeof (rcvbufsize)) == -1
-           && errno != ENOTSUP)
-    return -1;
-#endif /* ACE_LACKS_SOCKET_BUFSIZ */
-
-  int nodelay = 1;
-
-#if defined (TCP_NODELAY)
-  if (this->peer ().set_option (IPPROTO_TCP,
-                                TCP_NODELAY,
-                                (void *) &nodelay,
-                                sizeof (nodelay)) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "NODELAY failed\n"),
-                      -1);
-#endif /* TCP_NODELAY */
-
-  (void) this->peer ().enable (ACE_CLOEXEC);
-  // Set the close-on-exec flag for that file descriptor. If the
-  // operation fails we are out of luck (some platforms do not support
-  // it and return -1).
-
-  // Called by the <Strategy_Acceptor> when the handler is completely
-  // connected.
-  ACE_INET_Addr addr;
-
-  if (this->peer ().get_remote_addr (addr) == -1)
-    return -1;
-
-  char server[MAXHOSTNAMELEN + 16];
-
-  (void) addr.addr_to_string (server, sizeof (server));
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO (%P|%t) IIOP connection to server <%s> on %d\n",
-                server, this->peer ().get_handle ()));
-
-  // Register the handler with the Reactor if necessary.
-  return this->transport ()->wait_strategy ()->register_handler ();
-}
-
-int
-TAO_IIOP_Client_Connection_Handler::handle_close (ACE_HANDLE handle,
-                                                  ACE_Reactor_Mask rm)
-{
-  // @@ Alex: we need to figure out if the transport decides to close
-  //    us or something else.  If it is something else (for example
-  //    the cached connector trying to make room for other
-  //    connections) then we should let the transport know, so it can
-  //    in turn take appropiate action (such as sending exceptions to
-  //    all waiting reply handlers).
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG  ((LM_DEBUG,
-                 "TAO (%P|%t) IIOP_Client_Connection_Handler::"
-                 "handle_close (%d, %d)\n", handle, rm));
-
-  if (this->recycler ())
-    this->recycler ()->mark_as_closed (this->recycling_act ());
-
-  // Deregister this handler with the ACE_Reactor.
-  if (this->reactor ())
-    {
-      ACE_Reactor_Mask mask =
-        ACE_Event_Handler::ALL_EVENTS_MASK | ACE_Event_Handler::DONT_CALL;
-
-      // Make sure there are no timers.
-      this->reactor ()->cancel_timer (this);
-
-      // Remove self from reactor.
-      this->reactor ()->remove_handler (this, mask);
-    }
-
-  this->peer ().close ();
-
-  return 0;
-}
-
-
-// ****************************************************************
-
-#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/IIOP_Connect.h b/TAO/tao/IIOP_Connect.h
deleted file mode 100644
index c53c2315c84..00000000000
--- a/TAO/tao/IIOP_Connect.h
+++ /dev/null
@@ -1,158 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//   IIOP_Connect.h
-//
-// = AUTHOR
-//   Chris Cleeland
-//
-// ============================================================================
-
-#ifndef TAO_IIOP_CONNECT_H
-#define TAO_IIOP_CONNECT_H
-
-#include "ace/Reactor.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Acceptor.h"
-#include "ace/SOCK_Acceptor.h"
-#include "ace/Synch.h"
-#include "ace/Svc_Handler.h"
-
-#include "tao/corbafwd.h"
-#include "tao/Wait_Strategy.h"
-
-#include "tao/IIOP_Transport.h"
-
-// Forward Decls
-class TAO_ORB_Core;
-class TAO_ORB_Core_TSS_Resources;
-
-
-typedef ACE_Svc_Handler<TAO_SOCK_STREAM, ACE_NULL_SYNCH>
-        TAO_SVC_HANDLER;
-
-// ****************************************************************
-
-class TAO_IIOP_Handler_Base : public TAO_SVC_HANDLER
-{
-public:
-  TAO_IIOP_Handler_Base (ACE_Thread_Manager *t);
-  TAO_IIOP_Handler_Base (TAO_ORB_Core *orb_core);
-
-  virtual TAO_Transport *transport (void) = 0;
-};
-
-class TAO_Export TAO_IIOP_Client_Connection_Handler : public TAO_IIOP_Handler_Base
-{
-  // = TITLE
-  //      <Svc_Handler> used on the client side and returned by the
-  //      <TAO_CONNECTOR>.
-public:
-  // = Intialization method.
-  TAO_IIOP_Client_Connection_Handler (ACE_Thread_Manager *t = 0,
-                                      TAO_ORB_Core* orb_core = 0);
-
-  virtual ~TAO_IIOP_Client_Connection_Handler (void);
-
-  // = <Connector> hook.
-  virtual int open (void *);
-  // Activation template method.
-
-  // = Event Handler overloads
-
-  virtual int handle_input (ACE_HANDLE = ACE_INVALID_HANDLE);
-  // Called when a a response from a twoway invocation is available.
-
-  virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
-                            ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK);
-  // Perform appropriate closing.
-
-  virtual int close (u_long flags = 0);
-  // Object termination hook.
-
-  virtual TAO_Transport *transport (void);
-  // Return the transport objects
-
-protected:
-  TAO_IIOP_Client_Transport transport_;
-  // Reference to the transport object, it is owned by this class.
-
-  TAO_ORB_Core *orb_core_;
-  // Cached ORB Core.
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_IIOP_Server_Connection_Handler : public TAO_IIOP_Handler_Base
-{
-  // = TITLE
-  //   Handles requests on a single connection in a server.
-
-public:
-  TAO_IIOP_Server_Connection_Handler (ACE_Thread_Manager* t = 0);
-  TAO_IIOP_Server_Connection_Handler (TAO_ORB_Core *orb_core);
-  ~TAO_IIOP_Server_Connection_Handler (void);
-  // Constructor.
-
-  virtual int open (void *);
-  // Called by the <Strategy_Acceptor> when the handler is completely
-  // connected.  Argument is unused.
-
-  // = Active object activation method.
-  virtual int activate (long flags = THR_NEW_LWP,
-                        int n_threads = 1,
-                        int force_active = 0,
-                        long priority = ACE_DEFAULT_THREAD_PRIORITY,
-                        int grp_id = -1,
-                        ACE_Task_Base *task = 0,
-                        ACE_hthread_t thread_handles[] = 0,
-                        void *stack[] = 0,
-                        size_t stack_size[] = 0,
-                        ACE_thread_t  thread_names[] = 0);
-
-  virtual int svc (void);
-  // Only used when the handler is turned into an active object by
-  // calling <activate>.  This serves as the event loop in such cases.
-
-  // = Template Methods Called by <handle_input>
-
-  TAO_Transport *transport (void);
-
-protected:
-
-  // = Event Handler overloads
-
-  virtual int handle_input (ACE_HANDLE = ACE_INVALID_HANDLE);
-  // Reads a message from the <peer()>, dispatching and servicing it
-  // appropriately.
-
-  virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
-                            ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK);
-  // Perform appropriate closing.
-
-protected:
-  TAO_IIOP_Server_Transport transport_;
-  // @@ New transport object reference.
-
-  TAO_ORB_Core *orb_core_;
-  // Cached ORB Core.
-
-  TAO_ORB_Core_TSS_Resources *tss_resources_;
-  // Cached tss resources of the ORB that activated this object.
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao/IIOP_Connect.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_IIOP_CONNECT_H */
diff --git a/TAO/tao/IIOP_Connect.i b/TAO/tao/IIOP_Connect.i
deleted file mode 100644
index 1730c5a7244..00000000000
--- a/TAO/tao/IIOP_Connect.i
+++ /dev/null
@@ -1,29 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-ACE_INLINE TAO_Transport *
-TAO_IIOP_Server_Connection_Handler::transport (void)
-{
-  return &(this->transport_);
-}
-
-ACE_INLINE TAO_Transport *
-TAO_IIOP_Client_Connection_Handler::transport (void)
-{
-  return &(this->transport_);
-}
-
-ACE_INLINE int
-TAO_IIOP_Client_Connection_Handler::handle_input (ACE_HANDLE)
-{
-  // Call the waiter to handle the input.
-  return this->transport ()->wait_strategy ()->handle_input ();
-}
-
-ACE_INLINE int
-TAO_IIOP_Client_Connection_Handler::close (u_long)
-{
-  this->destroy ();
-
-  return 0;
-}
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
deleted file mode 100644
index 7e77bf21ab9..00000000000
--- a/TAO/tao/IIOP_Connector.cpp
+++ /dev/null
@@ -1,485 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//
-// = FILENAME
-//
-// = DESCRIPTION
-//
-// = AUTHOR
-//
-// ============================================================================
-
-#include "tao/IIOP_Connector.h"
-#include "tao/IIOP_Profile.h"
-#include "tao/GIOP.h"
-#include "tao/debug.h"
-#include "tao/ORB_Core.h"
-#include "tao/Client_Strategy_Factory.h"
-#include "tao/Environment.h"
-
-ACE_RCSID(tao, IIOP_Connector, "$Id$")
-
-// ****************************************************************
-
-TAO_IIOP_Connect_Creation_Strategy::
-  TAO_IIOP_Connect_Creation_Strategy (ACE_Thread_Manager* t,
-                                      TAO_ORB_Core *orb_core)
-    :  ACE_Creation_Strategy<TAO_IIOP_Client_Connection_Handler> (t),
-       orb_core_ (orb_core)
-{
-}
-
-int
-TAO_IIOP_Connect_Creation_Strategy::make_svc_handler (
-    TAO_IIOP_Client_Connection_Handler *&sh)
-{
-  if (sh == 0)
-    {
-      ACE_NEW_RETURN (sh,
-                      TAO_IIOP_Client_Connection_Handler (
-                          this->orb_core_->thr_mgr (),
-                          this->orb_core_),
-                      -1);
-    }
-  return 0;
-}
-
-// ****************************************************************
-
-typedef ACE_Cached_Connect_Strategy<TAO_IIOP_Client_Connection_Handler,
-                                    TAO_SOCK_CONNECTOR,
-                                    TAO_Cached_Connector_Lock>
-        TAO_CACHED_CONNECT_STRATEGY;
-
-TAO_IIOP_Connector::TAO_IIOP_Connector (void)
-  : TAO_Connector (TAO_IOP_TAG_INTERNET_IOP),
-    base_connector_ (),
-    orb_core_ (0)
-{
-}
-
-int
-TAO_IIOP_Connector::open (TAO_ORB_Core *orb_core)
-{
-  this->orb_core_ = orb_core;
-
-  TAO_Cached_Connector_Lock *connector_lock = 0;
-  ACE_NEW_RETURN (connector_lock,
-                  TAO_Cached_Connector_Lock (this->orb_core_),
-                  -1);
-
-  TAO_CACHED_CONNECT_STRATEGY *cached_connect_strategy =
-    new TAO_CACHED_CONNECT_STRATEGY (
-        new TAO_IIOP_Connect_Creation_Strategy (this->orb_core_->thr_mgr (),
-                                                this->orb_core_),
-        0,
-        0,
-        connector_lock,
-        1);
-
-  return this->base_connector_.open (this->orb_core_->reactor (),
-                                     &this->null_creation_strategy_,
-                                     cached_connect_strategy,
-                                     &this->null_activation_strategy_);
-}
-
-int
-TAO_IIOP_Connector::close (void)
-{
-  TAO_CACHED_CONNECT_STRATEGY *cached_connect_strategy =
-    ACE_dynamic_cast (TAO_CACHED_CONNECT_STRATEGY *,
-                      this->base_connector_.connect_strategy ());
-
-  // Zap the creation strategy that we created earlier
-  delete cached_connect_strategy->creation_strategy ();
-  delete cached_connect_strategy;
-
-  this->base_connector_.close ();
-  return 0;
-}
-
-int
-TAO_IIOP_Connector::connect (TAO_Profile *profile,
-                             TAO_Transport *& transport,
-                             ACE_Time_Value *max_wait_time)
-{
-  if (profile->tag () != TAO_IOP_TAG_INTERNET_IOP)
-    return -1;
-
-  TAO_IIOP_Profile *iiop_profile =
-    ACE_dynamic_cast (TAO_IIOP_Profile *, profile);
-
-  if (iiop_profile == 0)
-    return -1;
-
-  const ACE_INET_Addr &oa = iiop_profile->object_addr ();
-
-  ACE_Synch_Options synch_options;
-  if (max_wait_time != 0)
-    {
-      synch_options.set (ACE_Synch_Options::USE_TIMEOUT,
-                         *max_wait_time);
-    }
-
-  TAO_IIOP_Client_Connection_Handler* result;
-
-  // the connect call will set the hint () stored in the Profile
-  // object; but we obtain the transport in the <result>
-  // variable. Other threads may modify the hint, but we are not
-  // affected.
-  errno = 0;
-  if (this->base_connector_.connect (iiop_profile->hint (),
-                                     result,
-                                     oa,
-                                     synch_options) == -1)
-    { // Give users a clue to the problem.
-      if (TAO_orbdebug)
-        {
-          char buffer [MAXNAMELEN * 2];
-          profile->addr_to_string (buffer, (MAXNAMELEN * 2) - 1);
-          ACE_DEBUG ((LM_ERROR, "(%P|%t) %s:%u, connection to "
-                      "%s failed (%p)\n",
-                      __FILE__,
-                      __LINE__,
-                      buffer,
-                      "errno"));
-        }
-
-      return -1;
-    }
-
-  transport = result->transport ();
-
-  return 0;
-}
-
-int
-TAO_IIOP_Connector::preconnect (const char *preconnects)
-{
-  // Check for the proper protocol prefix.
-  if (this->check_prefix (preconnects) != 0)
-    return 0; // Failure: zero successful preconnections
-
-  const char *protocol_removed = ACE_OS::strstr (preconnects, "://") + 3;
-  // "+ 3" since strlen of "://" is 3.
-
-  char *preconnections = ACE_OS::strdup (protocol_removed);
-
-  int successes = 0;
-  if (preconnections)
-    {
-      ACE_INET_Addr dest;
-      ACE_Unbounded_Stack<ACE_INET_Addr> dests;
-
-      size_t num_connections;
-
-      char *nextptr = 0;
-      char *where = 0;
-      for (where = ACE::strsplit_r (preconnections, ",", nextptr);
-           where != 0;
-           where = ACE::strsplit_r (0, ",", nextptr))
-        {
-          int version_offset = 0;
-          // Additional offset to remove version from preconnect, if it exists.
-
-          if (isdigit (where[0]) &&
-              where[1] == '.' &&
-              isdigit (where[2]) &&
-              where[3] == '@')
-            version_offset = 4;
-
-          // @@ For now, we just drop the version prefix.  However, at
-          //    some point in the future the version may become useful.
-
-          char *tport = 0;
-          char *thost = where + version_offset;
-          char *sep = ACE_OS::strchr (where, ':');
-
-          if (sep)
-            {
-              *sep = '\0';
-              tport = sep + 1;
-
-              dest.set (ACE_OS::atoi (tport), thost);
-              dests.push (dest);
-            }
-          else
-            {
-              // No port was specified so assume that the port will be the
-              // IANA assigned port for IIOP.
-              //
-              //    IIOP:           683
-              //    IIOP over SSL:  684
-
-              dest.set (683, thost);
-              dests.push (dest);
-
-              if (TAO_debug_level > 0)
-                {
-                  ACE_DEBUG ((LM_DEBUG,
-                              "TAO (%P|%t) No port specified for <%s>.  "
-                              "Using <%d> as default port.\n",
-                              where,
-                              dest.get_port_number ()));
-                }
-            }
-        }
-
-      // Create an array of addresses from the stack, as well as an
-      // array of eventual handlers.
-      num_connections = dests.size ();
-      ACE_INET_Addr *remote_addrs = 0;
-      TAO_IIOP_Client_Connection_Handler **handlers = 0;
-      char *failures = 0;
-
-      ACE_NEW_RETURN (remote_addrs,
-                      ACE_INET_Addr[num_connections],
-                      -1);
-      ACE_NEW_RETURN (handlers,
-                      TAO_IIOP_Client_Connection_Handler *[num_connections],
-                      -1);
-      ACE_NEW_RETURN (failures,
-                      char[num_connections],
-                      -1);
-
-      size_t slot = 0;
-
-      // Fill in the remote address array
-      while (dests.pop (remote_addrs[slot]) == 0)
-        handlers[slot++] = 0;
-
-      // Finally, try to connect.
-      this->base_connector_.connect_n (num_connections,
-                                       handlers,
-                                       remote_addrs,
-                                       failures);
-      // Loop over all the failures and set the handlers that
-      // succeeded to idle state.
-      for (slot = 0;
-           slot < num_connections;
-           slot++)
-        {
-          if (!failures[slot])
-            {
-              handlers[slot]->idle ();
-              successes++;
-
-              if (TAO_debug_level > 0)
-                {
-                  ACE_DEBUG ((LM_DEBUG,
-                              "TAO (%P|%t) Preconnection <%s:%d> "
-                              "succeeded.\n",
-                              remote_addrs[slot].get_host_name (),
-                              remote_addrs[slot].get_port_number ()));
-                }
-            }
-          else
-            {
-              if (TAO_debug_level > 0)
-                {
-                  ACE_DEBUG ((LM_DEBUG,
-                              "TAO (%P|%t) Preconnection <%s:%d> failed.\n",
-                              remote_addrs[slot].get_host_name (),
-                              remote_addrs[slot].get_port_number ()));
-                }
-            }
-        }
-
-      ACE_OS::free (preconnections);
-
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) IIOP preconnections: %d successes and "
-                      "%d failures.\n",
-                      successes,
-                      num_connections - successes));
-        }
-    }
-
-  return successes;
-}
-
-TAO_Profile*
-TAO_IIOP_Connector::create_profile (TAO_InputCDR& cdr)
-{
-  TAO_Profile* pfile;
-  ACE_NEW_RETURN (pfile,
-                  TAO_IIOP_Profile (this->orb_core_),
-                  0);
-
-  int r = pfile->decode (cdr);
-  if (r == -1)
-    {
-      pfile->_decr_refcnt ();
-      pfile = 0;
-    }
-
-  return pfile;
-}
-
-void
-TAO_IIOP_Connector::make_profile (const char *endpoint,
-                                  TAO_Profile *&profile,
-                                  CORBA::Environment &ACE_TRY_ENV)
-{
-  // The endpoint should be of the form:
-  //
-  //    N.n@host:port/object_key
-  //
-  // or:
-  //
-  //    host:port/object_key
-
-  ACE_NEW_THROW_EX (profile,
-                    TAO_IIOP_Profile (endpoint,
-                                      this->orb_core_,
-                                      ACE_TRY_ENV),
-                    CORBA::NO_MEMORY ());
-
-  ACE_CHECK;
-}
-
-
-int
-TAO_IIOP_Connector::check_prefix (const char *endpoint)
-{
-  // Check for a valid string
-  if (!endpoint || !*endpoint)
-    return -1;  // Failure
-
-  const char *protocol[] = { "iiop", "iioploc" };
-  // This is valid for any protocol beginning with `iiop' or `iioploc'.
-
-  // Check for the proper prefix in the IOR.  If the proper prefix isn't
-  // in the IOR then it is not an IOR we can use.
-  if (ACE_OS::strncasecmp (endpoint,
-                           protocol[0],
-                           ACE_OS::strlen (protocol[0])) == 0 ||
-      ACE_OS::strncasecmp (endpoint,
-                           protocol[1],
-                           ACE_OS::strlen (protocol[1])) == 0)
-    {
-      return 0;  // Success
-    }
-
-  return -1;
-  // Failure: not an IIOP IOR
-  // DO NOT throw an exception here.
-}
-
-char
-TAO_IIOP_Connector::object_key_delimiter (void) const
-{
-  return TAO_IIOP_Profile::object_key_delimiter;
-}
-
-
-#define TAO_SVC_TUPLE ACE_Svc_Tuple<TAO_IIOP_Client_Connection_Handler>
-#define CACHED_CONNECT_STRATEGY ACE_Cached_Connect_Strategy<TAO_IIOP_Client_Connection_Handler, TAO_SOCK_CONNECTOR, TAO_Cached_Connector_Lock>
-#define REFCOUNTED_HASH_RECYCLABLE_ADDR ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Node<ACE_INET_Addr>;
-template class ACE_Unbounded_Stack<ACE_INET_Addr>;
-template class ACE_Unbounded_Stack_Iterator<ACE_INET_Addr>;
-
-template class ACE_Creation_Strategy<TAO_IIOP_Client_Connection_Handler>;
-template class ACE_Connect_Strategy<TAO_IIOP_Client_Connection_Handler, TAO_SOCK_CONNECTOR>;
-template class ACE_Strategy_Connector<TAO_IIOP_Client_Connection_Handler, TAO_SOCK_CONNECTOR>;
-template class ACE_NOOP_Creation_Strategy<TAO_IIOP_Client_Connection_Handler>;
-template class ACE_Concurrency_Strategy<TAO_IIOP_Client_Connection_Handler>;
-template class ACE_NOOP_Concurrency_Strategy<TAO_IIOP_Client_Connection_Handler>;
-template class ACE_Recycling_Strategy<TAO_IIOP_Client_Connection_Handler>;
-template class ACE_Connector<TAO_IIOP_Client_Connection_Handler, TAO_SOCK_CONNECTOR>;
-
-template class ACE_Node<TAO_IIOP_Client_Connection_Handler *>;
-
-template class ACE_Svc_Handler<TAO_SOCK_STREAM, ACE_NULL_SYNCH>;
-template class CACHED_CONNECT_STRATEGY;
-template class REFCOUNTED_HASH_RECYCLABLE_ADDR;
-template class ACE_Map_Manager<int, TAO_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Iterator_Base<int, TAO_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Iterator<int, TAO_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Reverse_Iterator<int, TAO_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>;
-template class TAO_SVC_TUPLE;
-
-template class ACE_Map_Entry<int, TAO_SVC_TUPLE*>;
-
-template class ACE_Hash_Map_Entry<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *>;
-template class ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>;
-template class ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>;
-
-#if defined(ACE_HAS_THREADS)
-template class ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_MUTEX>;
-#endif /* ACE_HAS_THREADS */
-
-template class ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Node<ACE_INET_Addr>
-#pragma instantiate ACE_Unbounded_Stack<ACE_INET_Addr>
-#pragma instantiate ACE_Unbounded_Stack_Iterator<ACE_INET_Addr>
-
-#pragma instantiate ACE_Creation_Strategy<TAO_IIOP_Client_Connection_Handler>
-#pragma instantiate ACE_Connect_Strategy<TAO_IIOP_Client_Connection_Handler, TAO_SOCK_CONNECTOR>
-#pragma instantiate ACE_Strategy_Connector<TAO_IIOP_Client_Connection_Handler, TAO_SOCK_CONNECTOR>
-#pragma instantiate ACE_NOOP_Creation_Strategy<TAO_IIOP_Client_Connection_Handler>
-#pragma instantiate ACE_Concurrency_Strategy<TAO_IIOP_Client_Connection_Handler>
-#pragma instantiate ACE_NOOP_Concurrency_Strategy<TAO_IIOP_Client_Connection_Handler>
-#pragma instantiate ACE_Recycling_Strategy<TAO_IIOP_Client_Connection_Handler>
-#pragma instantiate ACE_Connector<TAO_IIOP_Client_Connection_Handler, TAO_SOCK_CONNECTOR>
-
-#pragma instantiate ACE_Node<TAO_IIOP_Client_Connection_Handler *>
-
-#pragma instantiate ACE_Svc_Handler<TAO_SOCK_STREAM, ACE_NULL_SYNCH>
-#pragma instantiate CACHED_CONNECT_STRATEGY
-#pragma instantiate REFCOUNTED_HASH_RECYCLABLE_ADDR
-#pragma instantiate TAO_SVC_TUPLE
-#pragma instantiate ACE_Map_Manager<int, TAO_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Iterator_Base<int, TAO_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Iterator<int, TAO_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Reverse_Iterator<int, TAO_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Entry<int, TAO_SVC_TUPLE*>
-
-#pragma instantiate ACE_Hash_Map_Entry<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *>
-#pragma instantiate ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>
-#pragma instantiate ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>
-
-#if defined(ACE_HAS_THREADS)
-#pragma instantiate ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_MUTEX>
-#endif /* ACE_HAS_THREADS */
-
-#pragma instantiate ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_IIOP_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h
deleted file mode 100644
index 6b9eb5e576e..00000000000
--- a/TAO/tao/IIOP_Connector.h
+++ /dev/null
@@ -1,116 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    IIOP_Connector.h
-//
-// = DESCRIPTION
-//    IIOP specific connector processing
-//
-// = AUTHOR
-//    Fred Kuhns <fredk@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_IIOP_CONNECTOR_H
-#define TAO_IIOP_CONNECTOR_H
-
-#include "ace/Connector.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SOCK_Connector.h"
-#include "tao/Pluggable.h"
-#include "tao/IIOP_Connect.h"
-
-typedef ACE_Strategy_Connector<TAO_IIOP_Client_Connection_Handler, TAO_SOCK_CONNECTOR>
-        TAO_IIOP_BASE_CONNECTOR;
-
-// ****************************************************************
-
-class TAO_Export TAO_IIOP_Connect_Creation_Strategy : public ACE_Creation_Strategy<TAO_IIOP_Client_Connection_Handler>
-{
-  // = TITLE
-  //   Helper creation strategy
-  //
-  // = DESCRIPTION
-  //   Creates UIOP_Client_Connection_Handler objects but satisfies
-  //   the interface required by the
-  //   ACE_Creation_Strategy<TAO_IIOP_Client_Connection_Handler>
-  //
-public:
-  TAO_IIOP_Connect_Creation_Strategy (ACE_Thread_Manager * = 0,
-                                      TAO_ORB_Core* orb_core = 0);
-
-  virtual int make_svc_handler (TAO_IIOP_Client_Connection_Handler *&sh);
-  // Makes TAO_IIOP_Client_Connection_Handlers
-
-private:
-  TAO_ORB_Core* orb_core_;
-  // The ORB
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_IIOP_Connector : public TAO_Connector
-{
-  // = TITLE
-  //   IIOP-specific Connector bridge for pluggable protocols.
-  //
-  // = DESCRIPTION
-  //   Concrete instance of the TAO_Connector class.  Responsible
-  //   for establishing a connection with a server and is called from the
-  //   Connector_Registory.
-  //
-public:
-  // = Initialization and termination methods.
-  TAO_IIOP_Connector (void);
-  // Constructor.
-
-  // = The TAO_Connector methods, please check the documentation on
-  // Pluggable.h
-  int open (TAO_ORB_Core *orb_core);
-  int close (void);
-  int connect (TAO_Profile *profile,
-               TAO_Transport *&transport,
-               ACE_Time_Value *max_wait_time);
-  int preconnect (const char *preconnections);
-  TAO_Profile *create_profile (TAO_InputCDR& cdr);
-
-  virtual int check_prefix (const char *endpoint);
-
-  virtual char object_key_delimiter (void) const;
-
-protected:
-  // = More TAO_Connector methods, please check the documentation on
-  //   Pluggable.h
-  virtual void make_profile (const char *endpoint,
-                             TAO_Profile *&,
-                             CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-protected:
-  typedef ACE_NOOP_Concurrency_Strategy<TAO_IIOP_Client_Connection_Handler>
-        TAO_NULL_ACTIVATION_STRATEGY;
-
-  typedef ACE_NOOP_Creation_Strategy<TAO_IIOP_Client_Connection_Handler>
-        TAO_NULL_CREATION_STRATEGY;
-
-private:
-  TAO_NULL_ACTIVATION_STRATEGY null_activation_strategy_;
-  TAO_NULL_CREATION_STRATEGY null_creation_strategy_;
-
-  TAO_IIOP_BASE_CONNECTOR  base_connector_;
-  // The connector initiating connection requests for IIOP.
-
-  TAO_ORB_Core *orb_core_;
-  // ORB Core.
-};
-
-#endif  /* TAO_IIOP_CONNECTOR_H */
diff --git a/TAO/tao/IIOP_Factory.cpp b/TAO/tao/IIOP_Factory.cpp
deleted file mode 100644
index cfcc66f5f7b..00000000000
--- a/TAO/tao/IIOP_Factory.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-// $Id$
-
-#include "tao/IIOP_Factory.h"
-#include "tao/IIOP_Acceptor.h"
-#include "tao/IIOP_Connector.h"
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID(tao, IIOP_Factory, "$Id$")
-
-static const char prefix_[] = "iiop";
-
-TAO_IIOP_Protocol_Factory::TAO_IIOP_Protocol_Factory (void)
-  :  major_ (TAO_DEF_GIOP_MAJOR),
-     minor_ (TAO_DEF_GIOP_MINOR)
-{
-}
-
-TAO_IIOP_Protocol_Factory::~TAO_IIOP_Protocol_Factory (void)
-{
-}
-
-int
-TAO_IIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix)
-{
-  const char *protocol[] = { "iiop", "iioploc" };
-  // This is valid for any protocol beginning with `iiop' or `iioploc'.
-
-  // Check for the proper prefix in the IOR.  If the proper prefix isn't
-  // in the IOR then it is not an IOR we can use.
-  return (ACE_OS::strcasecmp (prefix.c_str (), protocol[0]) == 0 ||
-          ACE_OS::strcasecmp (prefix.c_str (), protocol[1]) == 0);
-}
-
-const char *
-TAO_IIOP_Protocol_Factory::prefix (void) const
-{
-  return ::prefix_;
-}
-
-TAO_Acceptor *
-TAO_IIOP_Protocol_Factory::make_acceptor (void)
-{
-  TAO_Acceptor *acceptor = 0;
-
-  ACE_NEW_RETURN (acceptor,
-                  TAO_IIOP_Acceptor,
-                  0);
-
-  return acceptor;
-}
-
-int
-TAO_IIOP_Protocol_Factory::init (int /* argc */,
-                                 char* /* argv */ [])
-{
-  return 0;
-}
-
-TAO_Connector *
-TAO_IIOP_Protocol_Factory::make_connector (void)
-{
-  TAO_Connector *connector = 0;
-
-  ACE_NEW_RETURN (connector,
-                  TAO_IIOP_Connector,
-                  0);
-  return connector;
-}
-
-int
-TAO_IIOP_Protocol_Factory::requires_explicit_endpoint (void) const
-{
-  return 0;
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_IIOP_Protocol_Factory,
-                       ASYS_TEXT ("IIOP_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_IIOP_Protocol_Factory),
-                       ACE_Service_Type::DELETE_THIS |
-                                  ACE_Service_Type::DELETE_OBJ,
-                       0)
-
-ACE_FACTORY_DEFINE (TAO, TAO_IIOP_Protocol_Factory)
diff --git a/TAO/tao/IIOP_Factory.h b/TAO/tao/IIOP_Factory.h
deleted file mode 100644
index 99064e46151..00000000000
--- a/TAO/tao/IIOP_Factory.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// -*- C++ -*-
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   Protocol_Factory.h
-//
-// = AUTHOR
-//   Fred Kuhns <fredk@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_IIOP_FACTORY_H
-#define TAO_IIOP_FACTORY_H
-
-#include "tao/Protocol_Factory.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_Acceptor;
-class TAO_Connector;
-
-class TAO_Export TAO_IIOP_Protocol_Factory : public TAO_Protocol_Factory
-{
-public:
-  TAO_IIOP_Protocol_Factory (void);
-  virtual ~TAO_IIOP_Protocol_Factory (void);
-
-  // = Service Configurator hooks.
-  virtual int init (int argc, char* argv[]);
-  // Dynamic linking hook
-
-  virtual int match_prefix (const ACE_CString &prefix);
-  // Verify prefix is a match
-
-  virtual const char *prefix (void) const;
-  // Returns the prefix used by the protocol.
-
-  // = Check Protocol_Factory.h for a description of these methods.
-  virtual TAO_Acceptor  *make_acceptor (void);
-  virtual TAO_Connector *make_connector  (void);
-  virtual int requires_explicit_endpoint (void) const;
-
-private:
-  int major_;
-  int minor_;
-  // Changing the version number can be used to provide backwards
-  // compatibility with old clients.
-};
-
-ACE_STATIC_SVC_DECLARE (TAO_IIOP_Protocol_Factory)
-ACE_FACTORY_DECLARE (TAO, TAO_IIOP_Protocol_Factory)
-
-#endif /* TAO_IIOP_FACTORY_H */
diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
deleted file mode 100644
index 9a721c2528e..00000000000
--- a/TAO/tao/IIOP_Profile.cpp
+++ /dev/null
@@ -1,474 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-
-
-#include "tao/IIOP_Profile.h"
-#include "tao/IIOP_Connect.h"
-#include "tao/GIOP.h"
-#include "tao/CDR.h"
-#include "tao/Environment.h"
-#include "tao/ORB.h"
-#include "tao/ORB_Core.h"
-#include "tao/POA.h"
-#include "tao/debug.h"
-
-ACE_RCSID(tao, IIOP_Profile, "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "tao/IIOP_Profile.i"
-#endif /* __ACE_INLINE__ */
-
-static const char *prefix_ = "iiop:";
-
-const char TAO_IIOP_Profile::object_key_delimiter = '/';
-
-TAO_IIOP_Profile::TAO_IIOP_Profile (const ACE_INET_Addr &addr,
-                                    const TAO_ObjectKey &object_key,
-                                    const TAO_GIOP_Version &version,
-                                    TAO_ORB_Core *orb_core)
-  : TAO_Profile (TAO_IOP_TAG_INTERNET_IOP),
-    host_ (),
-    port_ (0),
-    version_ (version),
-    object_key_ (object_key),
-    object_addr_ (addr),
-    hint_ (0),
-    orb_core_ (orb_core)
-{
-  this->set (addr);
-}
-
-TAO_IIOP_Profile::TAO_IIOP_Profile (const char* host,
-                                    CORBA::UShort port,
-                                    const TAO_ObjectKey &object_key,
-                                    const ACE_INET_Addr &addr,
-                                    const TAO_GIOP_Version &version,
-                                    TAO_ORB_Core *orb_core)
-  : TAO_Profile (TAO_IOP_TAG_INTERNET_IOP),
-    host_ (),
-    port_ (port),
-    version_ (version),
-    object_key_ (object_key),
-    object_addr_ (addr),
-    hint_ (0),
-    orb_core_ (orb_core)
-{
-  if (host != 0)
-    this->host_ = host;
-}
-
-TAO_IIOP_Profile::TAO_IIOP_Profile (const TAO_IIOP_Profile &pfile)
-  : TAO_Profile (pfile.tag ()),
-    host_ (pfile.host_),
-    port_ (pfile.port_),
-    version_ (pfile.version_),
-    object_key_ (pfile.object_key_),
-    object_addr_ (pfile.object_addr_),
-    hint_ (pfile.hint_),
-    orb_core_ (pfile.orb_core_)
-{
-  // @@ Do we need this copy constructor?  Won't the default copy
-  //    constructor work just as well?  -Ossama
-}
-
-TAO_IIOP_Profile::TAO_IIOP_Profile (const char *string,
-                                    TAO_ORB_Core *orb_core,
-                                    CORBA::Environment &ACE_TRY_ENV)
-  : TAO_Profile (TAO_IOP_TAG_INTERNET_IOP),
-    host_ (),
-    port_ (0),
-    version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR),
-    object_key_ (),
-    object_addr_ (),
-    hint_ (0),
-    orb_core_ (orb_core)
-{
-  parse_string (string, ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-TAO_IIOP_Profile::TAO_IIOP_Profile (TAO_ORB_Core *orb_core)
-  : TAO_Profile (TAO_IOP_TAG_INTERNET_IOP),
-    host_ (),
-    port_ (0),
-    version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR),
-    object_key_ (),
-    object_addr_ (),
-    hint_ (0),
-    orb_core_ (orb_core)
-{
-}
-
-int
-TAO_IIOP_Profile::set (const ACE_INET_Addr &addr)
-{
-  this->port_ = addr.get_port_number();
-
-  if (this->orb_core_->orb_params ()->use_dotted_decimal_addresses ())
-    {
-      const char *temp = addr.get_host_addr ();
-      if (temp == 0)
-        return -1;
-      else
-        this->host_ = temp;
-    }
-  else
-    {
-      char temphost[MAXHOSTNAMELEN + 1];
-
-      if (addr.get_host_name (temphost,
-                              sizeof temphost) != 0)
-        return -1;
-
-      this->host_ = CORBA::string_dup (temphost);
-    }
-
-  return 0;
-}
-
-TAO_IIOP_Profile::~TAO_IIOP_Profile (void)
-{
-}
-
-// return codes:
-// -1 -> error
-//  0 -> can't understand this version
-//  1 -> success.
-int
-TAO_IIOP_Profile::decode (TAO_InputCDR& cdr)
-{
-  CORBA::ULong encap_len = cdr.length ();
-
-  // Read and verify major, minor versions, ignoring IIOP
-  // profiles whose versions we don't understand.
-  //
-  if (!(cdr.read_octet (this->version_.major)
-        && this->version_.major == TAO_DEF_GIOP_MAJOR
-        && cdr.read_octet (this->version_.minor)
-        && this->version_.minor <= TAO_DEF_GIOP_MINOR))
-  {
-    if (TAO_debug_level > 0)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) IIOP_Profile::decode - v%d.%d\n",
-                    this->version_.major,
-                    this->version_.minor));
-      }
-  }
-
-  // Get host and port
-  if (cdr.read_string (this->host_.out ()) == 0
-      || cdr.read_ushort (this->port_) == 0)
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) IIOP_Profile::decode - "
-                      "error while decoding host/port"));
-        }
-      return -1;
-    }
-
-  this->object_addr_.set (this->port_, this->host_.in ());
-
-  // ... and object key.
-
-  if ((cdr >> this->object_key_) == 0)
-    return -1;
-
-  // Tagged Components *only* exist after version 1.0!
-  // For GIOP 1.2, IIOP and GIOP have same version numbers!
-  if (this->version_.major > 1
-      || this->version_.minor > 0)
-    if (this->tagged_components_.decode (cdr) == 0)
-      return -1;
-
-  if (cdr.length () != 0 && TAO_debug_level)
-    {
-      // If there is extra data in the profile we are supposed to
-      // ignore it, but print a warning just in case...
-      ACE_DEBUG ((LM_DEBUG,
-                  "%d bytes out of %d left after IIOP profile data\n",
-                  cdr.length (),
-                  encap_len));
-    }
-
-  if (cdr.good_bit ())
-    return 1;
-
-  return -1;
-}
-
-int
-TAO_IIOP_Profile::parse_string (const char *string,
-                                CORBA::Environment &ACE_TRY_ENV)
-{
-  if (!string || !*string)
-    {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (
-        CORBA_SystemException::_tao_minor_code (
-          TAO_NULL_POINTER_MINOR_CODE,
-          0),
-        CORBA::COMPLETED_NO),
-        -1);
-    }
-
-  // Remove the "N.n@" version prefix, if it exists, and verify the
-  // version is one that we accept.
-
-  // Check for version
-  if (isdigit (string [0]) &&
-      string[1] == '.' &&
-      isdigit (string [2]) &&
-      string[3] == '@')
-    {
-      // @@ This may fail for non-ascii character sets [but take that
-      // with a grain of salt]
-      this->version_.set_version ((char) (string [0] - '0'),
-                                  (char) (string [2] - '0'));
-      string += 4;
-      // Skip over the "N.n@"
-    }
-
-  if (this->version_.major != TAO_DEF_GIOP_MAJOR ||
-      this->version_.minor >  TAO_DEF_GIOP_MINOR)
-    {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (), -1);
-    }
-
-  // Pull off the "hostname:port/" part of the objref
-  // Copy the string because we are going to modify it...
-  CORBA::String_var copy (string);
-
-  char *start = copy.inout ();
-  char *cp = ACE_OS::strchr (start, ':');  // Look for a port
-
-  if (cp == 0)
-    {
-      // No host/port delimiter!
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (
-        CORBA_SystemException::_tao_minor_code (
-          TAO_NULL_POINTER_MINOR_CODE,
-          0),
-        CORBA::COMPLETED_NO),
-        -1);
-    }
-
-  char *okd = ACE_OS::strchr (start, this->object_key_delimiter);
-
-  if (okd == 0)
-    {
-      // No object key delimiter!
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (
-        CORBA_SystemException::_tao_minor_code (
-          TAO_NULL_POINTER_MINOR_CODE,
-          0),
-        CORBA::COMPLETED_NO),
-        -1);
-    }
-
-  // Don't increment the pointer 'cp' directly since we still need
-  // to use it immediately after this block.
-
-  CORBA::ULong length = okd - (cp + 1);
-  // Don't allocate space for the colon ':'.
-
-  CORBA::String_var tmp = CORBA::string_alloc (length);
-
-  ACE_OS::strncpy (tmp.inout (), cp + 1, length);
-  tmp[length] = '\0';
-
-  this->port_ = (CORBA::UShort) ACE_OS::atoi (tmp.in ());
-
-  length = cp - start;
-
-  tmp = CORBA::string_alloc (length);
-
-  ACE_OS::strncpy (tmp.inout (), start, length);
-  tmp[length] = '\0';
-
-  this->host_ = tmp._retn ();
-
-  this->object_addr_.set (this->port_, this->host_.in ());
-
-  start = ++okd;  // increment past the object key separator
-
-  TAO_POA::decode_string_to_sequence (this->object_key_, start);
-
-  return 1;
-}
-
-CORBA::Boolean
-TAO_IIOP_Profile::is_equivalent (const TAO_Profile *other_profile)
-{
-
-  if (other_profile->tag () != TAO_IOP_TAG_INTERNET_IOP)
-    return 0;
-
-  const TAO_IIOP_Profile *op =
-    ACE_dynamic_cast (const TAO_IIOP_Profile *, other_profile);
-
-  ACE_ASSERT (op->object_key_.length () < UINT_MAX);
-
-  return this->port_ == op->port_
-    && this->object_key_ == op->object_key_
-    && ACE_OS::strcmp (this->host_.in (), op->host_.in ()) == 0
-    && this->version_ == op->version_;
-}
-
-CORBA::ULong
-TAO_IIOP_Profile::hash (CORBA::ULong max,
-                        CORBA::Environment &)
-{
-  CORBA::ULong hashval;
-
-  // Just grab a bunch of convenient bytes and hash them; could do
-  // more (hostname, full key, exponential hashing) but no real need
-  // to do so except if performance requires a more costly hash.
-
-  hashval = this->object_key_.length () * this->port_;
-  hashval += this->version_.minor;
-
-  if (this->object_key_.length () >= 4)
-    {
-      hashval += this->object_key_ [1];
-      hashval += this->object_key_ [3];
-    }
-
-  return hashval % max;
-}
-
-int
-TAO_IIOP_Profile::addr_to_string (char *buffer, size_t length)
-{
-  size_t actual_len =
-    ACE_OS::strlen (this->host_.in ()) // chars in host name
-    + sizeof (':')                     // delimiter
-    + ACE_OS::strlen ("65536")         // max port
-    + sizeof ('\0');
-
-  if (length < actual_len)
-    return -1;
-
-  ACE_OS::sprintf (buffer, "%s:%d",
-                   this->host_.in (), this->port_);
-
-  return 0;
-}
-
-const char *
-TAO_IIOP_Profile::host (const char *h)
-{
-  this->host_ = h;
-
-  return this->host_.in ();
-}
-
-void
-TAO_IIOP_Profile::reset_hint (void)
-{
-  if (this->hint_)
-    {
-      this->hint_->cleanup_hint ();
-      this->hint_ = 0;
-    }
-}
-
-TAO_IIOP_Profile &
-TAO_IIOP_Profile::operator= (const TAO_IIOP_Profile &src)
-{
-  this->version_ = src.version_;
-
-  this->object_key_ = src.object_key_;
-
-  this->object_addr_.set (src.object_addr_);
-
-  this->port_ = src.port_;
-
-  this->host_ = src.host_;
-
-  return *this;
-}
-
-CORBA::String
-TAO_IIOP_Profile::to_string (CORBA::Environment &)
-{
-  CORBA::String_var key;
-  TAO_POA::encode_sequence_to_string (key.inout(),
-                                      this->object_key ());
-
-  u_int buflen = (ACE_OS::strlen (::prefix_) +
-                  2 /* double-slash separator */ +
-                  1 /* major version */ +
-                  1 /* decimal point */ +
-                  1 /* minor version */ +
-                  1 /* `@' character */ +
-                  ACE_OS::strlen (this->host_.in ()) +
-                  1 /* colon separator */ +
-                  5 /* port number */ +
-                  1 /* object key separator */ +
-                  ACE_OS::strlen (key));
-
-  CORBA::String buf = CORBA::string_alloc (buflen);
-
-  static const char digits [] = "0123456789";
-
-  ACE_OS::sprintf (buf,
-                   "%s//%c.%c@%s:%d%c%s",
-                   ::prefix_,
-                   digits [this->version_.major],
-                   digits [this->version_.minor],
-                   this->host_.in (),
-                   this->port_,
-                   this->object_key_delimiter,
-                   key.in ());
-  return buf;
-}
-
-const char *
-TAO_IIOP_Profile::prefix (void)
-{
-  return ::prefix_;
-}
-
-int
-TAO_IIOP_Profile::encode (TAO_OutputCDR &stream) const
-{
-  // UNSIGNED LONG, protocol tag
-  stream.write_ulong (this->tag ());
-
-  // Create the encapsulation....
-  TAO_OutputCDR encap (ACE_CDR::DEFAULT_BUFSIZE,
-                       TAO_ENCAP_BYTE_ORDER,
-                       this->orb_core_->output_cdr_buffer_allocator (),
-                       this->orb_core_->output_cdr_dblock_allocator (),
-                       this->orb_core_->orb_params ()->cdr_memcpy_tradeoff (),
-                       this->orb_core_->to_iso8859 (),
-                       this->orb_core_->to_unicode ());
-
-  encap.write_octet (TAO_ENCAP_BYTE_ORDER);
-
-  // The GIOP version
-  encap.write_octet (this->version_.major);
-  encap.write_octet (this->version_.minor);
-
-  // STRING hostname from profile
-  encap.write_string (this->host_.in ());
-
-  // UNSIGNED SHORT port number
-  encap.write_ushort (this->port_);
-
-  // OCTET SEQUENCE for object key
-  encap << this->object_key_;
-
-  if (this->version_.major > 1
-      || this->version_.minor > 0)
-    this->tagged_components_.encode (encap);
-
-  // write the encapsulation as an octet sequence...
-  stream << CORBA::ULong (encap.total_length ());
-  stream.write_octet_array_mb (encap.begin ());
-
-  return 1;
-}
diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h
deleted file mode 100644
index bed181740ba..00000000000
--- a/TAO/tao/IIOP_Profile.h
+++ /dev/null
@@ -1,193 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     IIOP_Profile.h
-//
-// = DESCRIPTION
-//     IIOP profile specific processing
-//
-// = AUTHOR
-//     Fred Kuhns <fredk@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_IIOP_PROFILE_H
-#define TAO_IIOP_PROFILE_H
-
-#include "tao/ORB.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Pluggable.h"
-#include "tao/Object_KeyC.h"
-#include "tao/GIOP.h"
-#include "tao/Tagged_Components.h"
-
-#include "ace/Synch.h"
-#include "ace/INET_Addr.h"
-
-class TAO_IIOP_Client_Connection_Handler;
-
-// TAO IIOP_Profile concrete Profile definitions
-class TAO_Export TAO_IIOP_Profile : public TAO_Profile
-{
-  // = TITLE
-  //   This class defines the protocol specific attributes required
-  //   for locating ORBs over a TCP/IP network.
-  //
-  // = DESCRIPTION
-  //   This class defines the IIOP profile as specified in the CORBA
-  //   specification.
-public:
-  static const char object_key_delimiter;
-  // The object key delimiter that IIOP uses or expects.
-
-  static const char *prefix (void);
-  // Return the char string prefix.
-
-  TAO_IIOP_Profile (const ACE_INET_Addr &addr,
-                    const TAO_ObjectKey &object_key,
-                    const TAO_GIOP_Version &version,
-                    TAO_ORB_Core *orb_core);
-  // Profile constructor, same as above except the object_key has
-  // already been marshaled.
-
-  TAO_IIOP_Profile (const char *host,
-                    CORBA::UShort port,
-                    const TAO_ObjectKey &object_key,
-                    const ACE_INET_Addr &addr,
-                    const TAO_GIOP_Version &version,
-                    TAO_ORB_Core *orb_core);
-  //  Profile constructor, this is the most efficient since it
-  // doesn't require any address resolution processing.
-
-  TAO_IIOP_Profile (const char *string,
-                    TAO_ORB_Core *orb_core,
-                    CORBA::Environment &ACE_TRY_ENV);
-  // Create object using a string ior.
-
-  TAO_IIOP_Profile (const TAO_IIOP_Profile &pfile);
-  // Profile copy constructor
-
-  TAO_IIOP_Profile &operator= (const TAO_IIOP_Profile &src);
-  // Copy operator.
-
-  TAO_IIOP_Profile (TAO_ORB_Core *orb_core);
-  // Profile constructor, default.
-
-  ~TAO_IIOP_Profile (void);
-  // Destructor is to be called only through <_decr_refcnt>.
-
-  int parse_string (const char *string,
-                    CORBA::Environment &ACE_TRY_ENV);
-  // Initialize this object using the given input string.
-
-  CORBA::String to_string (CORBA::Environment &ACE_TRY_ENV);
-  // Return a string representation for this profile.
-  // client must deallocate memory.
-
-  int decode (TAO_InputCDR& cdr);
-  // Initialize this object using the given CDR octet string.
-
-  virtual int encode (TAO_OutputCDR &stream) const;
-  // Encode this profile in a stream, i.e. marshal it.
-
-  const TAO_ObjectKey &object_key (void) const;
-  // @@ deprecated, return a reference to the Object Key.
-
-  TAO_ObjectKey &object_key (TAO_ObjectKey& objkey);
-  // @@ deprecated. set the Object Key.
-
-  TAO_ObjectKey *_key (void) const;
-  //  Return a pointer to the Object Key.
-
-  CORBA::Boolean is_equivalent (const TAO_Profile *other_profile);
-  // Return true if this profile is equivalent to other_profile.  Two
-  // profiles are equivalent iff their key, port, host, object_key and
-  // version are the same.
-
-  CORBA::ULong hash (CORBA::ULong max,
-                     CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // Return a hash value for this object.
-
-  int addr_to_string (char *buffer, size_t length);
-  // Return a string representation for the address.
-
-  const ACE_INET_Addr &object_addr (void) const;
-  //  return a reference to the object_addr.
-
-  const char *host (void);
-  // Return a pointer to the host string.  This object maintains
-  // ownership of this string.
-
-  const char *host (const char *h);
-  // Copy the string h into host and return the resulting pointer.
-  // This object maintains ownership of this string.
-
-  CORBA::UShort port (void);
-  // Return the port number.
-
-  CORBA::UShort port (CORBA::UShort p);
-  // Set the port number.
-
-  const TAO_GIOP_Version& version (void) const;
-  // Return a pointer to this profile's version.  This object
-  // maintains ownership.
-
-  TAO_IIOP_Client_Connection_Handler *&hint (void);
-  //  This is a hint for which connection handler to use.
-
-  void reset_hint (void);
-  //  Reset the hint's value.
-
-  const TAO_Tagged_Components& tagged_components (void) const;
-  TAO_Tagged_Components& tagged_components (void);
-  // Access the tagged components, notice that they are empty and
-  // ignored for GIOP 1.0
-
-private:
-  int set (const ACE_INET_Addr &addr);
-  // helper method to set the INET_Addr.
-
-private:
-
-  CORBA::String_var host_;
-  // String representing the hosts name.
-
-  CORBA::UShort port_;
-  // TCP port number
-
-  TAO_GIOP_Version version_;
-  // IIOP version number.
-
-  TAO_ObjectKey object_key_;
-  // object_key associated with this profile.
-
-  ACE_INET_Addr object_addr_;
-  // Cached instance of <ACE_INET_Addr> for use in making
-  // invocations, etc.
-
-  TAO_IIOP_Client_Connection_Handler *hint_;
-  // Pointer to a connection handler which we successfully used
-  // already.
-
-  TAO_ORB_Core *orb_core_;
-  // ORB Core.
-
-  TAO_Tagged_Components tagged_components_;
-  // The tagged components
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/IIOP_Profile.i"
-#endif /* __ACE_INLINE__ */
-
-#endif  /* TAO_IIOP_PROFILE_H */
diff --git a/TAO/tao/IIOP_Profile.i b/TAO/tao/IIOP_Profile.i
deleted file mode 100644
index 805a6faf961..00000000000
--- a/TAO/tao/IIOP_Profile.i
+++ /dev/null
@@ -1,69 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-ACE_INLINE const TAO_ObjectKey &
-TAO_IIOP_Profile::object_key (void) const
-{
-  return this->object_key_;
-}
-
-ACE_INLINE TAO_ObjectKey &
-TAO_IIOP_Profile::object_key (TAO_ObjectKey& objkey)
-{
-  this->object_key_ = objkey;
-  return this->object_key_;
-}
-
-ACE_INLINE TAO_ObjectKey *
-TAO_IIOP_Profile::_key (void) const
-{
-  return new TAO_ObjectKey (this->object_key_);
-}
-
-ACE_INLINE const ACE_INET_Addr&
-TAO_IIOP_Profile::object_addr (void) const
-{
-  return this->object_addr_;
-}
-
-ACE_INLINE const char *
-TAO_IIOP_Profile::host (void)
-{
-  return this->host_.in ();
-}
-
-ACE_INLINE CORBA::UShort
-TAO_IIOP_Profile::port (void)
-{
-  return this->port_;
-}
-
-ACE_INLINE CORBA::UShort
-TAO_IIOP_Profile::port (CORBA::UShort p)
-{
-  return this->port_ = p;
-}
-
-ACE_INLINE const TAO_GIOP_Version &
-TAO_IIOP_Profile::version (void) const
-{
-  return this->version_;
-}
-
-ACE_INLINE TAO_IIOP_Client_Connection_Handler *&
-TAO_IIOP_Profile::hint(void)
-{
-  return this->hint_;
-}
-
-ACE_INLINE const TAO_Tagged_Components&
-TAO_IIOP_Profile::tagged_components (void) const
-{
-  return this->tagged_components_;
-}
-
-ACE_INLINE TAO_Tagged_Components&
-TAO_IIOP_Profile::tagged_components (void)
-{
-  return this->tagged_components_;
-}
diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp
deleted file mode 100644
index 1d0de12047e..00000000000
--- a/TAO/tao/IIOP_Transport.cpp
+++ /dev/null
@@ -1,522 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-
-
-#include "tao/IIOP_Transport.h"
-#include "tao/IIOP_Connect.h"
-#include "tao/IIOP_Profile.h"
-#include "tao/Timeprobe.h"
-#include "tao/CDR.h"
-#include "tao/Transport_Mux_Strategy.h"
-#include "tao/Wait_Strategy.h"
-#include "tao/Reply_Dispatcher.h"
-#include "tao/ORB_Core.h"
-#include "tao/debug.h"
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-
-static const char *TAO_Transport_Timeprobe_Description[] =
-  {
-    "IIOP_Transport::send - start",
-    "IIOP_Transport::send - end",
-
-    "IIOP_Transport::receive - start",
-    "IIOP_Transport::receive - end",
-
-    "IIOP_Client_Transport::start_request - start",
-    "IIOP_Client_Transport::start_request - end"
-  };
-
-enum
-  {
-    TAO_IIOP_TRANSPORT_SEND_START = 1200,
-    TAO_IIOP_TRANSPORT_SEND_END,
-
-    TAO_IIOP_TRANSPORT_RECEIVE_START,
-    TAO_IIOP_TRANSPORT_RECEIVE_END,
-
-    TAO_IIOP_CLIENT_TRANSPORT_START_REQUEST_START,
-    TAO_IIOP_CLIENT_TRANSPORT_START_REQUEST_END
-  };
-
-
-// Setup Timeprobes
-ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Transport_Timeprobe_Description,
-                                  TAO_IIOP_TRANSPORT_SEND_START);
-
-#endif /* ACE_ENABLE_TIMEPROBES */
-
-TAO_IIOP_Transport::TAO_IIOP_Transport (TAO_IIOP_Handler_Base *handler,
-                                        TAO_ORB_Core *orb_core)
-  : TAO_Transport (TAO_IOP_TAG_INTERNET_IOP,
-                   orb_core),
-    handler_ (handler)
-{
-}
-
-TAO_IIOP_Transport::~TAO_IIOP_Transport (void)
-{
-}
-
-TAO_IIOP_Handler_Base *&
-TAO_IIOP_Transport::handler (void)
-{
-  return this->handler_;
-}
-
-int
-TAO_IIOP_Transport::idle (void)
-{
-  return this->handler_->idle();
-}
-
-void
-TAO_IIOP_Transport::close_connection (void)
-{
-  this->handler_->handle_close ();
-}
-
-ACE_HANDLE
-TAO_IIOP_Transport::handle (void)
-{
-  return this->handler_->get_handle ();
-}
-
-// ****************************************************************
-
-TAO_IIOP_Server_Transport::
-    TAO_IIOP_Server_Transport (TAO_IIOP_Server_Connection_Handler *handler,
-                               TAO_ORB_Core* orb_core)
-  : TAO_IIOP_Transport (handler, orb_core),
-    server_handler_ (handler),
-    message_state_ (orb_core)
-{
-}
-
-TAO_IIOP_Server_Transport::~TAO_IIOP_Server_Transport (void)
-{
-}
-
-// ****************************************************************
-
-TAO_IIOP_Client_Transport::
-    TAO_IIOP_Client_Transport (TAO_IIOP_Client_Connection_Handler *handler,
-                               TAO_ORB_Core *orb_core)
-  :  TAO_IIOP_Transport (handler,
-                         orb_core),
-     client_handler_ (handler)
-{
-}
-
-TAO_IIOP_Client_Transport::~TAO_IIOP_Client_Transport (void)
-{
-}
-
-TAO_IIOP_Client_Connection_Handler *
-TAO_IIOP_Client_Transport::client_handler (void)
-{
-  return this->client_handler_;
-}
-
-void
-TAO_IIOP_Client_Transport::start_request (TAO_ORB_Core *orb_core,
-                                          const TAO_Profile* pfile,
-                                          const char* opname,
-                                          CORBA::ULong request_id,
-                                          CORBA::Boolean is_roundtrip,
-                                          TAO_OutputCDR &output,
-                                          CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_IIOP_CLIENT_TRANSPORT_START_REQUEST_START);
-
-  const TAO_IIOP_Profile* profile =
-    ACE_dynamic_cast(const TAO_IIOP_Profile*, pfile);
-
-  // Obtain object key.
-  const TAO_ObjectKey& key = profile->object_key ();
-
-  // @@ This should be implemented in the transport object, which
-  //    would query the profile to obtain the version...
-  if (TAO_GIOP::start_message (profile->version (),
-                               TAO_GIOP::Request,
-                               output,
-                               orb_core) == 0)
-    ACE_THROW (CORBA::MARSHAL ());
-
-  // Then fill in the rest of the RequestHeader
-  //
-  // The first element of header is service context list;
-  // transactional context would be acquired here using the
-  // transaction service APIs.  Other kinds of context are as yet
-  // undefined.
-  //
-  // Last element of request header is the principal; no portable way
-  // to get it, we just pass empty principal (convention: indicates
-  // "anybody").  Steps upward in security include passing an
-  // unverified user ID, and then verifying the message (i.e. a dummy
-  // service context entry is set up to hold a digital signature for
-  // this message, then patched shortly before it's sent).
-  static CORBA::Principal_ptr principal = 0;
-
-  if (TAO_GIOP::write_request_header (request_id,
-                                      is_roundtrip,
-                                      key,
-                                      opname,
-                                      principal,
-                                      output,
-                                      orb_core) == 0)
-    ACE_THROW (CORBA::MARSHAL ());
-}
-
-void
-TAO_IIOP_Client_Transport::start_locate (TAO_ORB_Core *orb_core,
-                                         const TAO_Profile* pfile,
-                                         CORBA::ULong request_id,
-                                         TAO_OutputCDR &output,
-                                         CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  const TAO_IIOP_Profile* profile =
-    ACE_dynamic_cast(const TAO_IIOP_Profile*, pfile);
-
-  // Obtain object key.
-  const TAO_ObjectKey& key = profile->object_key ();
-
-  // @@ This should be implemented in the transport object, which
-  //    would query the profile to obtain the version...
-  if (TAO_GIOP::start_message (profile->version (),
-                               TAO_GIOP::Request,
-                               output,
-                               orb_core) == 0)
-    ACE_THROW (CORBA::MARSHAL ());
-
-
-  if (TAO_GIOP::write_locate_request_header (request_id,
-                                             key,
-                                             output) != 0)
-    ACE_THROW (CORBA::MARSHAL ());
-}
-
-int
-TAO_IIOP_Client_Transport::send_request (TAO_ORB_Core *orb_core,
-                                         TAO_OutputCDR &stream,
-                                         int two_way,
-                                         ACE_Time_Value *max_wait_time)
-{
-  if (this->ws_->sending_request (orb_core,
-                                  two_way) == -1)
-    return -1;
-
-  if (TAO_GIOP::send_message (this,
-                              stream,
-                              orb_core,
-                              max_wait_time) == -1)
-    return -1;
-
-  return this->idle_after_send ();
-}
-
-// Return 0, when the reply is not read fully, 1 if it is read fully.
-// @@ This code should go in the TAO_Transport class is repeated for
-//    each transport!!
-int
-TAO_IIOP_Client_Transport::handle_client_input (int /* block */,
-                                                ACE_Time_Value *max_wait_time)
-{
-  // When we multiplex several invocations over a connection we need
-  // to allocate the CDR stream *here*, but when there is a single
-  // request over a connection the CDR stream can be pre-allocated on
-  // the stack of the thread that sent the request!
-  // Can we preserve this optimization on the new architecture?
-  //
-  // here is how:
-  //
-  // Use an "factory" to obtain the CDR stream, in the Muxed case the
-  // factory simply allocates a new one, in the Exclusive case the
-  // factory returns a pointer to the pre-allocated CDR.
-
-  // Get the message state from the Transport Mux Strategy. 
-  TAO_GIOP_Message_State* message_state =
-    this->tms_->get_message_state ();
-
-  if (message_state == 0)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) IIOP_Transport::handle_client_input -"
-                    " nil message state\n"));
-      return -1;
-    }
-  
-  int result = TAO_GIOP::handle_input (this,
-                                       this->orb_core_,
-                                       *message_state,
-                                       max_wait_time);
-  if (result == -1)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - %p\n",
-                    "IIOP_Transport::handle_client_input, handle_input"));
-      return -1;
-    }
-  if (result == 0)
-    return result;
-
-  // OK, the complete message is here...
-
-  TAO_GIOP_ServiceContextList reply_ctx;
-  CORBA::ULong request_id;
-  CORBA::ULong reply_status;
-
-  result = TAO_GIOP::parse_reply (this,
-                                  this->orb_core_,
-                                  *message_state,
-                                  reply_ctx,
-                                  request_id,
-                                  reply_status);
-  if (result == -1)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - %p\n",
-                    "IIOP_Transport::handle_client_input, parse reply"));
-      message_state->reset ();
-      return -1;
-    }
-
-  result =
-    this->tms_->dispatch_reply (request_id,
-                                reply_status,
-                                message_state->giop_version,
-                                reply_ctx,
-                                message_state);
-
-  if (result == -1)
-    {
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) : IIOP_Client_Transport::"
-                    "handle_client_input - "
-                    "dispatch reply failed\n"));
-      message_state->reset ();
-      return -1;
-    }
-
-  if (result == 0)
-    {
-      message_state->reset ();
-      return 0;
-    }
-
-  // This is a NOOP for the Exclusive request case, but it actually
-  // destroys the stream in the muxed case.
-  this->tms_->destroy_message_state (message_state);
-
-  return result;
-}
-
-int
-TAO_IIOP_Client_Transport::register_handler (void)
-{
-  ACE_Reactor *r = this->orb_core ()->reactor ();
-  if (r == this->client_handler ()->reactor ())
-    return 0;
-
-  return r->register_handler (this->client_handler (),
-                              ACE_Event_Handler::READ_MASK);
-}
-
-int
-TAO_IIOP_Client_Transport::check_unexpected_data (void)
-{
-  // @@ Alex: This should *not* be part of the client connection
-  //    handler, we should treat any incoming data as a GIOP message.
-  //    The server can always send the "CloseConnection" message and
-  //    we should act accordingly.
-  //    Finally: in the future the server may send requests though
-  //    GIOP 1.2 connections, we shouldn't hard-code the current GIOP
-  //    state machine at this level...
-
-  // We're a client, so we're not expecting to see input.  Still we
-  // better check what it is!
-  char ignored;
-  ssize_t ret = this->client_handler ()->peer().recv (&ignored,
-                                                      sizeof ignored,
-                                                      MSG_PEEK);
-  switch (ret)
-    {
-    case 0:
-    case -1:
-      // 0 is a graceful shutdown
-      // -1 is a somewhat ugly shutdown
-      //
-      // Both will result in us returning -1 and this connection
-      // getting closed
-      //
-      // if (errno == EWOULDBLOCK)
-      // return 0;
-
-      if (TAO_debug_level)
-        ACE_DEBUG ((LM_WARNING,
-                    "TAO_IIOP_Client_Transport::check_unexpected_data: "
-                    "closing connection on fd %d\n",
-                    this->client_handler ()->peer().get_handle ()));
-      break;
-
-    case 1:
-      //
-      // @@ Fix me!!
-      //
-      // This should be the close connection message.  Since we don't
-      // handle this yet, log an error, and close the connection.
-      ACE_ERROR ((LM_WARNING,
-                  "TAO_IIOP_Client_Transport::check_unexpected_data: "
-                  "input while not expecting a response; "
-                  "closing connection on fd %d\n",
-                  this->client_handler ()->peer().get_handle ()));
-      break;
-    }
-
-  // We're not expecting input at this time, so we'll always
-  // return -1 for now.
-  return -1;
-}
-
-// *********************************************************************
-
-ssize_t
-TAO_IIOP_Transport::send (const ACE_Message_Block *mblk,
-                          ACE_Time_Value *max_wait_time)
-{
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_IIOP_TRANSPORT_SEND_START);
-
-  // For the most part this was copied from GIOP::send_request and
-  // friends.
-
-  iovec iov[IOV_MAX];
-  int iovcnt = 0;
-  ssize_t n = 0;
-  ssize_t nbytes = 0;
-
-  for (const ACE_Message_Block *i = mblk;
-       i != 0;
-       i = i->cont ())
-    {
-      // Make sure there is something to send!
-      if (i->length () > 0)
-        {
-          iov[iovcnt].iov_base = i->rd_ptr ();
-          iov[iovcnt].iov_len  = i->length ();
-          iovcnt++;
-
-          // The buffer is full make a OS call.  @@ TODO this should
-          // be optimized on a per-platform basis, for instance, some
-          // platforms do not implement writev() there we should copy
-          // the data into a buffer and call send_n(). In other cases
-          // there may be some limits on the size of the iovec, there
-          // we should set IOV_MAX to that limit.
-          if (iovcnt == IOV_MAX)
-            {
-              if (max_wait_time == 0)
-                n = this->handler_->peer ().sendv_n ((const iovec *) iov,
-                                                     iovcnt);
-              else
-                n = ACE::writev (this->handler_->peer ().get_handle (),
-                                 (const iovec*)iov,
-                                 iovcnt,
-                                 max_wait_time);
-
-              if (n <= 0)
-                return n;
-
-              nbytes += n;
-              iovcnt = 0;
-            }
-        }
-    }
-
-  // Check for remaining buffers to be sent!
-  if (iovcnt != 0)
-    {
-      n = this->handler_->peer ().sendv_n ((const iovec *) iov,
-                                           iovcnt);
-      if (n < 1)
-        return n;
-
-      nbytes += n;
-    }
-
-  return nbytes;
-}
-
-ssize_t
-TAO_IIOP_Transport::send (const u_char *buf,
-                          size_t len,
-                          ACE_Time_Value *)
-{
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_IIOP_TRANSPORT_SEND_START);
-
-  return this->handler_->peer ().send_n (buf, len);
-}
-
-ssize_t
-TAO_IIOP_Transport::send (const iovec *iov,
-                          int iovcnt,
-                          ACE_Time_Value *)
-{
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_IIOP_TRANSPORT_SEND_START);
-
-  return this->handler_->peer ().sendv_n ((const iovec *) iov,
-                                          iovcnt);
-}
-
-ssize_t
-TAO_IIOP_Transport::recv (char *buf,
-                          size_t len,
-                          ACE_Time_Value *max_wait_time)
-{
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_IIOP_TRANSPORT_RECEIVE_START);
-
-  return ACE::recv_n (this->handler_->peer ().get_handle (),
-                      buf,
-                      len,
-                      max_wait_time);
-}
-
-ssize_t
-TAO_IIOP_Transport::recv (char *buf,
-                          size_t len,
-                          int flags,
-                          ACE_Time_Value *max_wait_time)
-{
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_IIOP_TRANSPORT_RECEIVE_START);
-
-  return ACE::recv_n (this->handler_->peer ().get_handle (),
-                      buf,
-                      len,
-                      flags,
-                      max_wait_time);
-}
-
-ssize_t
-TAO_IIOP_Transport::recv (iovec *iov,
-                          int iovcnt,
-                          ACE_Time_Value *)
-{
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_IIOP_TRANSPORT_RECEIVE_START);
-
-  return handler_->peer ().recvv_n (iov, iovcnt);
-}
-
-// Default action to be taken for send request.
-int
-TAO_IIOP_Transport::send_request (TAO_ORB_Core *  /* orb_core */,
-                                  TAO_OutputCDR & /* stream   */,
-                                  int             /* twoway   */,
-                                  ACE_Time_Value * /* max_wait_time */)
-{
-  return -1;
-}
diff --git a/TAO/tao/IIOP_Transport.h b/TAO/tao/IIOP_Transport.h
deleted file mode 100644
index c0f3c05aea1..00000000000
--- a/TAO/tao/IIOP_Transport.h
+++ /dev/null
@@ -1,211 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     IIOP_Transport.h
-//
-// = DESCRIPTION
-//     IIOP Transport specific processing
-//
-// = AUTHOR
-//     Fred Kuhns <fredk@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_IIOP_TRANSPORT_H
-#define TAO_IIOP_TRANSPORT_H
-
-#include "tao/Pluggable.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/GIOP.h"
-
-// Forward decls.
-class TAO_IIOP_Handler_Base;
-class TAO_IIOP_Client_Connection_Handler;
-class TAO_IIOP_Server_Connection_Handler;
-class TAO_ORB_Core;
-
-class TAO_Export TAO_IIOP_Transport : public TAO_Transport
-{
-  // = TITLE
-  //   This class acts as a bridge class to the transport specific
-  //   connection handler (handler_).
-  //
-  // = DESCRIPTION
-  //   Specialization of the base TAO_Transport class to handle the IIOP
-  //   protocol.  This class in turn will be further specialized for
-  //   the client and server side.
-public:
-  TAO_IIOP_Transport (TAO_IIOP_Handler_Base *handler,
-                      TAO_ORB_Core *orb_core);
-  // Base object's creator method.
-
-  ~TAO_IIOP_Transport (void);
-  // Default destructor.
-
-  CORBA::ULong tag (void);
-  // Returns the specific IOP instance, in this case IIOP.
-
-  void close_connection (void);
-  // Call the corresponding connection handlers close method.
-
-  int idle (void);
-  // Idles the corresponding connection handler.
-
-  TAO_IIOP_Handler_Base *&handler (void);
-  // Return a reference to the corresponding connection handler.
-
-  ACE_HANDLE handle (void);
-  // Return the underlying connection handle.
-
-  ssize_t send (const ACE_Message_Block *mblk,
-                ACE_Time_Value *s = 0);
-  // Write the contents of the Message_Block to the connection.
-
-  ssize_t send (const u_char *buf,
-                size_t len,
-                ACE_Time_Value *s = 0);
-  // Write the contents of the buffer of length len to the connection.
-
-  ssize_t send (const iovec *iov,
-                int iovcnt,
-                ACE_Time_Value *s = 0);
-  // Write the contents of iovcnt iovec's to the connection.
-
-  ssize_t recv (char *buf,
-                size_t len,
-                ACE_Time_Value *s = 0);
-  // Read len bytes from into buf.
-
-  ssize_t recv (char *buf,
-                size_t len,
-                int flags,
-                ACE_Time_Value *s = 0);
-  // Read len bytes from into buf using flags.
-
-  ssize_t recv (iovec *iov,
-                int iovcnt,
-                ACE_Time_Value *s = 0);
-  //  Read received data into the iovec buffers.
-
-  virtual int send_request (TAO_ORB_Core *orb_core ,
-                            TAO_OutputCDR &stream,
-                            int twoway,
-                            ACE_Time_Value *max_wait_time);
-  // Default action to be taken for send request.
-
-protected:
-  TAO_IIOP_Handler_Base *handler_;
-  // the connection service handler used for accessing lower layer
-  // communication protocols.
-};
-
-class TAO_Export TAO_IIOP_Client_Transport : public TAO_IIOP_Transport
-{
-  // = TITLE
-  //   The Transport class used for Client side communication with a
-  //   server.
-  //
-  // = DESCRIPTION
-  //   Specialization of the TAO_IIOP_Transport class for client
-  //   side.  Methods related to sending one and two way requests
-  //   lives here.
-public:
-  TAO_IIOP_Client_Transport (TAO_IIOP_Client_Connection_Handler *handler,
-                             TAO_ORB_Core *orb_core);
-  // Constructor.  Note, TAO_IIOP_Handler_Base is the base class for
-  // both TAO_IIOP_Client_Connection_Handler and
-  // TAO_IIOP_Server_Connection_Handler.
-
-  ~TAO_IIOP_Client_Transport (void);
-  // destructor
-
-  TAO_IIOP_Client_Connection_Handler *client_handler (void);
-  // return a pointer to the client's connection handler.
-
-  virtual void start_request (TAO_ORB_Core *orb_core,
-                              const TAO_Profile *profile,
-                              const char* opname,
-                              CORBA::ULong request_id,
-                              CORBA::Boolean is_twoway,
-                              TAO_OutputCDR &output,
-                              CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Fill into <output> the right headers to make a request.
-
-  virtual void start_locate (TAO_ORB_Core *orb_core,
-                             const TAO_Profile *profile,
-                             CORBA::ULong request_id,
-                             TAO_OutputCDR &output,
-                             CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Fill into <output> the right headers to make a locate request.
-
-  int send_request (TAO_ORB_Core *orb_core,
-                    TAO_OutputCDR &stream,
-                    int twoway,
-                    ACE_Time_Value *max_wait_time);
-  // This is a bridge method for the connection handlers
-  // <send_request> method.  The connection handler is responsible for
-  // concurrency strategies, typically using the leader-follower
-  // pattern.
-
-  int handle_client_input (int block = 0,
-                           ACE_Time_Value *max_time_value = 0);
-  // Read and handle the reply. Returns 0 when there is Short Read on
-  // the connection. Returns 1 when the full reply is read and
-  // handled. If <block> is 1, then reply is read in a blocking
-  // manner.
-
-  virtual int register_handler (void);
-  // Register the handler with the reactor. This will be called by the
-  // Wait Strategy if Reactor is used  for that strategy.
-
-protected:
-  int check_unexpected_data (void);
-  // This method checks for unexpected data.
-
-private:
-  TAO_IIOP_Client_Connection_Handler *client_handler_;
-  // pointer to the corresponding client side connection handler.
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_IIOP_Server_Transport : public TAO_IIOP_Transport
-{
-  // = TITLE
-  //   The Transport class used for server communication with a
-  //   connected client.
-  //
-  // = DESCRIPTION
-  //   Specialization of the TAO_IIOP_Transport class for the server side.
-  //   methods for reading messages (requests) and sending replies live
-  //   here.
-public:
-
-  TAO_IIOP_Server_Transport (TAO_IIOP_Server_Connection_Handler *handler,
-                             TAO_ORB_Core *orb_core);
-  //  Default creator method.
-
-  ~TAO_IIOP_Server_Transport (void);
-  // Default destructor
-
-  TAO_IIOP_Server_Connection_Handler *server_handler_;
-  // Pointer to the corresponding connection handler.
-
-  TAO_GIOP_Message_State message_state_;
-  // This keep the state of the current message, to enable
-  // non-blocking reads, fragment reassembly, etc.
-};
-
-#endif  /* TAO_IIOP_TRANSPORT_H */
diff --git a/TAO/tao/IOP.pidl b/TAO/tao/IOP.pidl
deleted file mode 100644
index 83d3580fdbe..00000000000
--- a/TAO/tao/IOP.pidl
+++ /dev/null
@@ -1,72 +0,0 @@
-//
-// $Id$
-//
-
-#pragma prefix "omg.org"
-
-module IOP
-{
-  typedef unsigned long ProfileId;
-  const ProfileId TAG_INTERNET_IOP = 0;
-  const ProfileId TAG_MULTIPLE_COMPONENTS = 0;
-  
-  struct TaggedProfile {
-    ProfileId       tag;
-    sequence<octet> profile_data;
-  };
-
-  struct IOR {
-    string                    type_id;
-    sequence<TaggedProfile>   profiles;
-  };
-
-  typedef unsigned long ComponentId;
-  struct TaggedComponent {
-    ComponentId     tag;
-    sequence<octet> component_data;
-  };
-  typedef sequence<TaggedComponent> MultipleComponentProfile;
-
-  const ComponentId TAG_ORB_TYPE = 0;
-  const ComponentId TAG_CODE_SETS = 1;
-  const ComponentId TAG_POLICIES = 2;
-  const ComponentId TAG_ALTERNATE_IIOP_ADDRESS = 3;
-  const ComponentId TAG_ASSOCIATION_OPTIONS = 13;
-  const ComponentId TAG_SEC_NAME = 14;
-  const ComponentId TAG_SPKM_1_SEC_MECH = 15;
-  const ComponentId TAG_SPKM_2_SEC_MECH = 16;
-  const ComponentId TAG_KerberosV5_SEC_MECH = 17;
-  const ComponentId TAG_CSI_ECMA_Secret_SEC_MECH = 18;
-  const ComponentId TAG_CSI_ECMA_Hybrid_SEC_MECH = 19;
-  const ComponentId TAG_SSL_SEC_TRANS = 20;
-  const ComponentId TAG_CSI_ECMA_Public_SEC_MECH = 21;
-  const ComponentId TAG_GENERIC_SEC_MECH = 22;
-
-  const ComponentId TAG_COMPLETE_OBJECT_KEY = 5;
-  const ComponentId TAG_ENDPOINT_ID_POSITION = 6;
-  const ComponentId TAG_LOCATION_POLICY = 12;
-  const ComponentId TAG_DCE_STRING_BINDING = 100;
-  const ComponentId TAG_DCE_BINDING_NAME = 101;
-  const ComponentId TAG_DCE_NO_PIPES = 102;
-  const ComponentId TAG_DCE_SEC_MECH = 103;
-
-  typedef unsigned long ServiceId;
-  struct ServiceContext {
-    ServiceId          context_id;
-    sequence <octet>   context_data;
-  };
-  typedef sequence <ServiceContext> ServiceContextList;
-
-  const ServiceId TransactionService = 0;
-  const ServiceId CodeSets = 1;
-  const ServiceId ChainBypassCheck = 2;
-  const ServiceId ChainBypassInfo = 3;
-  const ServiceId LogicalThreadId = 4;
-  const ServiceId BI_DIR_IIOP = 5;
-  const ServiceId SendingContextRunTime = 6;
-  const ServiceId INVOCATION_POLICIES = 7;
-  // const ServiceId FORWARDED_IDENTITY = 8;
-  const ServiceId UnknownExceptionInfo = 9;
-};
-
-#pragma prefix ""
diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp
deleted file mode 100644
index e6074797507..00000000000
--- a/TAO/tao/IOPC.cpp
+++ /dev/null
@@ -1,1223 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   IOPC.cpp
-//
-// = DESCRIPTION
-//   Generated from IOP.pidl, that contains the OMG standarized IOP
-//   module.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#include "tao/IOPC.h"
-#include "tao/Any.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/IOPC.i"
-#endif /* !defined INLINE */
-
-static const CORBA::Long _oc_IOP_ProfileId[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-  10, ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x64000000),  // name = ProfileId
-  CORBA::tk_ulong,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_IOP_ProfileId (CORBA::tk_alias, sizeof (_oc_IOP_ProfileId), (char *) &_oc_IOP_ProfileId, 0, sizeof (IOP::ProfileId));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ProfileId, &_tc_TAO_tc_IOP_ProfileId)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_INTERNET_IOP, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_MULTIPLE_COMPONENTS, 0)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_IOP_TaggedProfile[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54616767), ACE_NTOHL (0x65645072), ACE_NTOHL (0x6f66696c), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
-  14, ACE_NTOHL (0x54616767), ACE_NTOHL (0x65645072), ACE_NTOHL (0x6f66696c), ACE_NTOHL (0x65000000),  // name = TaggedProfile
-  2, // member count
-  4, ACE_NTOHL (0x74616700),  // name = tag
-  CORBA::tk_alias, // typecode kind for typedefs
-  60, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-    10, ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x64000000),  // name = ProfileId
-    CORBA::tk_ulong,
-
-
-  13, ACE_NTOHL (0x70726f66), ACE_NTOHL (0x696c655f), ACE_NTOHL (0x64617461), ACE_NTOHL (0x0),  // name = profile_data
-  CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-
-    0,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedProfile (CORBA::tk_struct, sizeof (_oc_IOP_TaggedProfile), (char *) &_oc_IOP_TaggedProfile, 0, sizeof (IOP::TaggedProfile));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TaggedProfile, &_tc_TAO_tc_IOP_TaggedProfile)
-TAO_NAMESPACE_END
-
-// *************************************************************
-// IOP::TaggedProfile::_tao_seq_Octet
-// *************************************************************
-
-IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (void)
-{}
-IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size
-  :
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- (max)
-{}
-IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  :
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- (max, length, buffer, release)
-{}
-IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor
-  :
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- (seq)
-{}
-IOP::TaggedProfile::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
-{}
-
-// ****************************************************************
-
-static const CORBA::Long _oc_IOP_IOR[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  24, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x494f523a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/IOR:1.0
-  4, ACE_NTOHL (0x494f5200),  // name = IOR
-  2, // member count
-  8, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f696400),  // name = type_id
-  CORBA::tk_string,
-  0, // string length
-  9, ACE_NTOHL (0x70726f66), ACE_NTOHL (0x696c6573), ACE_NTOHL (0x0),  // name = profiles
-  CORBA::tk_sequence, // typecode kind
-  200, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    184, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54616767), ACE_NTOHL (0x65645072), ACE_NTOHL (0x6f66696c), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
-      14, ACE_NTOHL (0x54616767), ACE_NTOHL (0x65645072), ACE_NTOHL (0x6f66696c), ACE_NTOHL (0x65000000),  // name = TaggedProfile
-      2, // member count
-      4, ACE_NTOHL (0x74616700),  // name = tag
-      CORBA::tk_alias, // typecode kind for typedefs
-      60, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-        10, ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x64000000),  // name = ProfileId
-        CORBA::tk_ulong,
-
-
-      13, ACE_NTOHL (0x70726f66), ACE_NTOHL (0x696c655f), ACE_NTOHL (0x64617461), ACE_NTOHL (0x0),  // name = profile_data
-      CORBA::tk_sequence, // typecode kind
-      12, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        CORBA::tk_octet,
-
-        0,
-
-
-    0,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_IOP_IOR (CORBA::tk_struct, sizeof (_oc_IOP_IOR), (char *) &_oc_IOP_IOR, 0, sizeof (IOP::IOR));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IOR, &_tc_TAO_tc_IOP_IOR)
-TAO_NAMESPACE_END
-
-// *************************************************************
-// IOP::IOR::_tao_seq_TaggedProfile
-// *************************************************************
-
-IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (void)
-{}
-IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (CORBA::ULong max) // uses max size
-  : TAO_Unbounded_Sequence<IOP::TaggedProfile> (max)
-{}
-IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (CORBA::ULong max, CORBA::ULong length, IOP::TaggedProfile *buffer, CORBA::Boolean release)
-  : TAO_Unbounded_Sequence<IOP::TaggedProfile> (max, length, buffer, release)
-{}
-IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (const _tao_seq_TaggedProfile &seq) // copy ctor
-  : TAO_Unbounded_Sequence<IOP::TaggedProfile> (seq)
-{}
-IOP::IOR::_tao_seq_TaggedProfile::~_tao_seq_TaggedProfile (void) // dtor
-{}
-
-static const CORBA::Long _oc_IOP_ComponentId[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x7449643a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
-  12, ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74496400),  // name = ComponentId
-  CORBA::tk_ulong,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_IOP_ComponentId (CORBA::tk_alias, sizeof (_oc_IOP_ComponentId), (char *) &_oc_IOP_ComponentId, 0, sizeof (IOP::ComponentId));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ComponentId, &_tc_TAO_tc_IOP_ComponentId)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_IOP_TaggedComponent[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54616767), ACE_NTOHL (0x6564436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
-  16, ACE_NTOHL (0x54616767), ACE_NTOHL (0x6564436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e7400),  // name = TaggedComponent
-  2, // member count
-  4, ACE_NTOHL (0x74616700),  // name = tag
-  CORBA::tk_alias, // typecode kind for typedefs
-  60, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x7449643a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
-    12, ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74496400),  // name = ComponentId
-    CORBA::tk_ulong,
-
-
-  15, ACE_NTOHL (0x636f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x745f6461), ACE_NTOHL (0x74610000),  // name = component_data
-  CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-
-    0,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponent (CORBA::tk_struct, sizeof (_oc_IOP_TaggedComponent), (char *) &_oc_IOP_TaggedComponent, 0, sizeof (IOP::TaggedComponent));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TaggedComponent, &_tc_TAO_tc_IOP_TaggedComponent)
-TAO_NAMESPACE_END
-
-// *************************************************************
-// IOP::TaggedComponent::_tao_seq_Octet
-// *************************************************************
-
-IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (void)
-{}
-IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size
-  : TAO_Unbounded_Sequence<CORBA::Octet> (max)
-{}
-IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  : TAO_Unbounded_Sequence<CORBA::Octet> (max, length, buffer, release)
-{}
-IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor
-  : TAO_Unbounded_Sequence<CORBA::Octet> (seq)
-{}
-IOP::TaggedComponent::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
-{}
-
-// *************************************************************
-// IOP::MultipleComponentProfile
-// *************************************************************
-
-IOP::MultipleComponentProfile::MultipleComponentProfile (void)
-{}
-IOP::MultipleComponentProfile::MultipleComponentProfile (CORBA::ULong max) // uses max size
-  : TAO_Unbounded_Sequence<IOP::TaggedComponent> (max)
-{}
-IOP::MultipleComponentProfile::MultipleComponentProfile (CORBA::ULong max, CORBA::ULong length, IOP::TaggedComponent *buffer, CORBA::Boolean release)
-  : TAO_Unbounded_Sequence<IOP::TaggedComponent> (max, length, buffer, release)
-{}
-IOP::MultipleComponentProfile::MultipleComponentProfile (const MultipleComponentProfile &seq) // copy ctor
-  : TAO_Unbounded_Sequence<IOP::TaggedComponent> (seq)
-{}
-IOP::MultipleComponentProfile::~MultipleComponentProfile (void) // dtor
-{}
-
-static const CORBA::Long _oc_IOP_MultipleComponentProfile[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  45, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x4d756c74), ACE_NTOHL (0x69706c65), ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x7450726f), ACE_NTOHL (0x66696c65), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/MultipleComponentProfile:1.0
-  25, ACE_NTOHL (0x4d756c74), ACE_NTOHL (0x69706c65), ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x7450726f), ACE_NTOHL (0x66696c65), ACE_NTOHL (0x0),  // name = MultipleComponentProfile
-  CORBA::tk_sequence, // typecode kind
-  200, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    184, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54616767), ACE_NTOHL (0x6564436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
-      16, ACE_NTOHL (0x54616767), ACE_NTOHL (0x6564436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e7400),  // name = TaggedComponent
-      2, // member count
-      4, ACE_NTOHL (0x74616700),  // name = tag
-      CORBA::tk_alias, // typecode kind for typedefs
-      60, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x7449643a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
-        12, ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74496400),  // name = ComponentId
-        CORBA::tk_ulong,
-
-
-      15, ACE_NTOHL (0x636f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x745f6461), ACE_NTOHL (0x74610000),  // name = component_data
-      CORBA::tk_sequence, // typecode kind
-      12, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        CORBA::tk_octet,
-
-        0,
-
-
-    0,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_IOP_MultipleComponentProfile (CORBA::tk_alias, sizeof (_oc_IOP_MultipleComponentProfile), (char *) &_oc_IOP_MultipleComponentProfile, 0, sizeof (IOP::MultipleComponentProfile));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_MultipleComponentProfile, &_tc_TAO_tc_IOP_MultipleComponentProfile)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_ORB_TYPE, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_CODE_SETS, 1)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_POLICIES, 2)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_ALTERNATE_IIOP_ADDRESS, 3)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_ASSOCIATION_OPTIONS, 13)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_SEC_NAME, 14)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_SPKM_1_SEC_MECH, 15)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_SPKM_2_SEC_MECH, 16)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_KerberosV5_SEC_MECH, 17)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_CSI_ECMA_Secret_SEC_MECH, 18)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_CSI_ECMA_Hybrid_SEC_MECH, 19)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_SSL_SEC_TRANS, 20)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_CSI_ECMA_Public_SEC_MECH, 21)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_GENERIC_SEC_MECH, 22)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_COMPLETE_OBJECT_KEY, 5)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_ENDPOINT_ID_POSITION, 6)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_LOCATION_POLICY, 12)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_DCE_STRING_BINDING, 100)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_DCE_BINDING_NAME, 101)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_DCE_NO_PIPES, 102)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_DCE_SEC_MECH, 103)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_IOP_ServiceId[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636549), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ServiceId:1.0
-  10, ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636549), ACE_NTOHL (0x64000000),  // name = ServiceId
-  CORBA::tk_ulong,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceId (CORBA::tk_alias, sizeof (_oc_IOP_ServiceId), (char *) &_oc_IOP_ServiceId, 0, sizeof (IOP::ServiceId));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServiceId, &_tc_TAO_tc_IOP_ServiceId)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_IOP_ServiceContext[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636543), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78743a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/ServiceContext:1.0
-  15, ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636543), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78740000),  // name = ServiceContext
-  2, // member count
-  11, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x6578745f), ACE_NTOHL (0x69640000),  // name = context_id
-  CORBA::tk_alias, // typecode kind for typedefs
-  60, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636549), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ServiceId:1.0
-    10, ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636549), ACE_NTOHL (0x64000000),  // name = ServiceId
-    CORBA::tk_ulong,
-
-
-  13, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x6578745f), ACE_NTOHL (0x64617461), ACE_NTOHL (0x0),  // name = context_data
-  CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-
-    0,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceContext (CORBA::tk_struct, sizeof (_oc_IOP_ServiceContext), (char *) &_oc_IOP_ServiceContext, 0, sizeof (IOP::ServiceContext));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServiceContext, &_tc_TAO_tc_IOP_ServiceContext)
-TAO_NAMESPACE_END
-
-// *************************************************************
-// IOP::ServiceContext::_tao_seq_Octet
-// *************************************************************
-
-IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (void)
-{}
-IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size
-  : TAO_Unbounded_Sequence<CORBA::Octet> (max)
-{}
-IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  : TAO_Unbounded_Sequence<CORBA::Octet> (max, length, buffer, release)
-{}
-IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor
-  : TAO_Unbounded_Sequence<CORBA::Octet> (seq)
-{}
-IOP::ServiceContext::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
-{}
-
-// *************************************************************
-// IOP::ServiceContextList
-// *************************************************************
-
-IOP::ServiceContextList::ServiceContextList (void)
-{}
-IOP::ServiceContextList::ServiceContextList (CORBA::ULong max) // uses max size
-  : TAO_Unbounded_Sequence<IOP::ServiceContext> (max)
-{}
-IOP::ServiceContextList::ServiceContextList (CORBA::ULong max, CORBA::ULong length, IOP::ServiceContext *buffer, CORBA::Boolean release)
-  : TAO_Unbounded_Sequence<IOP::ServiceContext> (max, length, buffer, release)
-{}
-IOP::ServiceContextList::ServiceContextList (const ServiceContextList &seq) // copy ctor
-  : TAO_Unbounded_Sequence<IOP::ServiceContext> (seq)
-{}
-IOP::ServiceContextList::~ServiceContextList (void) // dtor
-{}
-
-static const CORBA::Long _oc_IOP_ServiceContextList[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636543), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78744c69), ACE_NTOHL (0x73743a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/ServiceContextList:1.0
-  19, ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636543), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78744c69), ACE_NTOHL (0x73740000),  // name = ServiceContextList
-  CORBA::tk_sequence, // typecode kind
-  208, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    192, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636543), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78743a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/ServiceContext:1.0
-      15, ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636543), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78740000),  // name = ServiceContext
-      2, // member count
-      11, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x6578745f), ACE_NTOHL (0x69640000),  // name = context_id
-      CORBA::tk_alias, // typecode kind for typedefs
-      60, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636549), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ServiceId:1.0
-        10, ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636549), ACE_NTOHL (0x64000000),  // name = ServiceId
-        CORBA::tk_ulong,
-
-
-      13, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x6578745f), ACE_NTOHL (0x64617461), ACE_NTOHL (0x0),  // name = context_data
-      CORBA::tk_sequence, // typecode kind
-      12, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        CORBA::tk_octet,
-
-        0,
-
-
-    0,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceContextList (CORBA::tk_alias, sizeof (_oc_IOP_ServiceContextList), (char *) &_oc_IOP_ServiceContextList, 0, sizeof (IOP::ServiceContextList));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServiceContextList, &_tc_TAO_tc_IOP_ServiceContextList)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TransactionService, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, CodeSets, 1)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, ChainBypassCheck, 2)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, ChainBypassInfo, 3)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, LogicalThreadId, 4)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, BI_DIR_IIOP, 5)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, SendingContextRunTime, 6)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, INVOCATION_POLICIES, 7)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, UnknownExceptionInfo, 9)
-TAO_NAMESPACE_END
-void operator<<= (CORBA::Any &_tao_any, const IOP::TaggedProfile &_tao_elem) // copying
-{
-  IOP::TaggedProfile *_any_val;
-  ACE_NEW (_any_val, IOP::TaggedProfile (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (IOP::_tc_TaggedProfile, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, IOP::TaggedProfile *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (IOP::_tc_TaggedProfile, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::TaggedProfile *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (IOP::_tc_TaggedProfile, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (IOP::TaggedProfile *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, IOP::TaggedProfile, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (IOP::_tc_TaggedProfile, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (IOP::_tc_TaggedProfile, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const IOP::IOR &_tao_elem) // copying
-{
-  IOP::IOR *_any_val;
-  ACE_NEW (_any_val, IOP::IOR (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (IOP::_tc_IOR, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, IOP::IOR *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (IOP::_tc_IOR, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::IOR *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (IOP::_tc_IOR, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (IOP::IOR *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, IOP::IOR, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (IOP::_tc_IOR, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (IOP::_tc_IOR, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const IOP::TaggedComponent &_tao_elem) // copying
-{
-  IOP::TaggedComponent *_any_val;
-  ACE_NEW (_any_val, IOP::TaggedComponent (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (IOP::_tc_TaggedComponent, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, IOP::TaggedComponent *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (IOP::_tc_TaggedComponent, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::TaggedComponent *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (IOP::_tc_TaggedComponent, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (IOP::TaggedComponent *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, IOP::TaggedComponent, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (IOP::_tc_TaggedComponent, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (IOP::_tc_TaggedComponent, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::MultipleComponentProfile &_tao_elem
-  ) // copying
-{
-  IOP::MultipleComponentProfile *_tao_any_val;
-  ACE_NEW (_tao_any_val, IOP::MultipleComponentProfile (_tao_elem));
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (IOP::_tc_MultipleComponentProfile, _tao_any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, IOP::MultipleComponentProfile *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (IOP::_tc_MultipleComponentProfile, _tao_elem, 0, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::MultipleComponentProfile *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (IOP::_tc_MultipleComponentProfile, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (IOP::MultipleComponentProfile *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, IOP::MultipleComponentProfile, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (IOP::_tc_MultipleComponentProfile, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (IOP::_tc_MultipleComponentProfile, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const IOP::ServiceContext &_tao_elem) // copying
-{
-  IOP::ServiceContext *_any_val;
-  ACE_NEW (_any_val, IOP::ServiceContext (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (IOP::_tc_ServiceContext, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, IOP::ServiceContext *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (IOP::_tc_ServiceContext, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::ServiceContext *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (IOP::_tc_ServiceContext, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (IOP::ServiceContext *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, IOP::ServiceContext, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (IOP::_tc_ServiceContext, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (IOP::_tc_ServiceContext, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::ServiceContextList &_tao_elem
-  ) // copying
-{
-  IOP::ServiceContextList *_tao_any_val;
-  ACE_NEW (_tao_any_val, IOP::ServiceContextList (_tao_elem));
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (IOP::_tc_ServiceContextList, _tao_any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, IOP::ServiceContextList *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (IOP::_tc_ServiceContextList, _tao_elem, 0, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::ServiceContextList *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (IOP::_tc_ServiceContextList, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (IOP::ServiceContextList *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, IOP::ServiceContextList, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (IOP::_tc_ServiceContextList, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (IOP::_tc_ServiceContextList, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IOP::TaggedProfile::_tao_seq_Octet &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-
-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-    {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_dynamic_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::TaggedProfile::_tao_seq_Octet *)&_tao_sequence);
-      if (oseq->mb ())
-        return strm.write_octet_array_mb (oseq->mb ());
-      else
-        return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-
-#else /* TAO_NO_COPY_OCTET_SEQUENCES */
-    return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IOP::TaggedProfile::_tao_seq_Octet &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-
-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-    if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE))
-    {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_dynamic_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
-      oseq->replace (_tao_seq_len, strm.start ());
-      oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-      strm.skip_bytes (_tao_seq_len);
-      return 1;
-    }
-    else
-      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-
-#else /* TAO_NO_COPY_OCTET_SEQUENCES */
-    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IOP::IOR::_tao_seq_TaggedProfile &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IOP::IOR::_tao_seq_TaggedProfile &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IOP::TaggedComponent::_tao_seq_Octet &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-
-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-    {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_dynamic_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::TaggedComponent::_tao_seq_Octet *)&_tao_sequence);
-      if (oseq->mb ())
-        return strm.write_octet_array_mb (oseq->mb ());
-      else
-        return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-
-#else /* TAO_NO_COPY_OCTET_SEQUENCES */
-    return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IOP::TaggedComponent::_tao_seq_Octet &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-
-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-    if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE))
-    {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_dynamic_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
-      oseq->replace (_tao_seq_len, strm.start ());
-      oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-      strm.skip_bytes (_tao_seq_len);
-      return 1;
-    }
-    else
-      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-
-#else /* TAO_NO_COPY_OCTET_SEQUENCES */
-    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IOP::MultipleComponentProfile &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IOP::MultipleComponentProfile &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IOP::ServiceContext::_tao_seq_Octet &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-
-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-    {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_dynamic_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::ServiceContext::_tao_seq_Octet *)&_tao_sequence);
-      if (oseq->mb ())
-        return strm.write_octet_array_mb (oseq->mb ());
-      else
-        return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-
-#else /* TAO_NO_COPY_OCTET_SEQUENCES */
-    return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IOP::ServiceContext::_tao_seq_Octet &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-
-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-    if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE))
-    {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_dynamic_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
-      oseq->replace (_tao_seq_len, strm.start ());
-      oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-      strm.skip_bytes (_tao_seq_len);
-      return 1;
-    }
-    else
-      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-
-#else /* TAO_NO_COPY_OCTET_SEQUENCES */
-    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IOP::ServiceContextList &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IOP::ServiceContextList &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
diff --git a/TAO/tao/IOPC.h b/TAO/tao/IOPC.h
deleted file mode 100644
index 8ff683969d4..00000000000
--- a/TAO/tao/IOPC.h
+++ /dev/null
@@ -1,669 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   IOPC.h
-//
-// = DESCRIPTION
-//   Generated from IOP.pidl, that contains the OMG standarized IOP
-//   module.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#ifndef TAO_IOPC_H
-#define TAO_IOPC_H
-
-#include "tao/CDR.h"
-#include "tao/Sequence.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-TAO_NAMESPACE  IOP
-{
-  typedef CORBA::ULong ProfileId;
-  typedef CORBA::ULong_out ProfileId_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ProfileId;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_INTERNET_IOP;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_MULTIPLE_COMPONENTS;
-
-  struct TAO_Export TaggedProfile
-  {
-    ProfileId tag;
-
-    class TAO_Export _tao_seq_Octet : public TAO_Unbounded_Sequence<CORBA::Octet>
-    {
-    public:
-      _tao_seq_Octet (void); // default ctor
-      _tao_seq_Octet (CORBA::ULong max); // uses max size
-      _tao_seq_Octet (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::Octet *buffer,
-        CORBA::Boolean release=0
-      );
-      _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor
-      ~_tao_seq_Octet (void); // dtor
-
-#if defined(TAO_NO_COPY_OCTET_SEQUENCES)
-      _tao_seq_Octet (
-          CORBA::ULong length,
-          const ACE_Message_Block* mb
-        )
-        : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
-#endif /* TAO_NO_COPY_OCTET_SEQUENCE */
-
-    };
-
-    _tao_seq_Octet profile_data;
-  };
-
-  class TAO_Export TaggedProfile_var
-  {
-  public:
-    TaggedProfile_var (void); // default constructor
-    TaggedProfile_var (TaggedProfile *);
-    TaggedProfile_var (const TaggedProfile_var &); // copy constructor
-    ~TaggedProfile_var (void); // destructor
-
-    TaggedProfile_var &operator= (TaggedProfile *);
-    TaggedProfile_var &operator= (const TaggedProfile_var &);
-    TaggedProfile *operator-> (void);
-    const TaggedProfile *operator-> (void) const;
-
-    operator const TaggedProfile &() const;
-    operator TaggedProfile &();
-    operator TaggedProfile &() const;
-    // in, inout, out, _retn
-    const TaggedProfile &in (void) const;
-    TaggedProfile &inout (void);
-    TaggedProfile *&out (void);
-    TaggedProfile *_retn (void);
-    TaggedProfile *ptr (void) const;
-
-  private:
-    TaggedProfile *ptr_;
-  };
-
-  class TAO_Export TaggedProfile_out
-  {
-  public:
-    TaggedProfile_out (TaggedProfile *&);
-    TaggedProfile_out (TaggedProfile_var &);
-    TaggedProfile_out (const TaggedProfile_out &);
-    TaggedProfile_out &operator= (const TaggedProfile_out &);
-    TaggedProfile_out &operator= (TaggedProfile *);
-    operator TaggedProfile *&();
-    TaggedProfile *&ptr (void);
-    TaggedProfile *operator-> (void);
-
-  private:
-    TaggedProfile *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const TaggedProfile_var &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TaggedProfile;
-
-  struct TAO_Export IOR
-  {
-    TAO_String_Manager type_id;
-
-
-    // *************************************************************
-    // _tao_seq_TaggedProfile
-    // *************************************************************
-
-    class TAO_Export _tao_seq_TaggedProfile : public TAO_Unbounded_Sequence<TaggedProfile>
-    {
-    public:
-      _tao_seq_TaggedProfile (void); // default ctor
-      _tao_seq_TaggedProfile (CORBA::ULong max); // uses max size
-      _tao_seq_TaggedProfile (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        TaggedProfile *buffer,
-        CORBA::Boolean release=0
-      );
-      _tao_seq_TaggedProfile (const _tao_seq_TaggedProfile &); // copy ctor
-      ~_tao_seq_TaggedProfile (void); // dtor
-    };
-    typedef _tao_seq_TaggedProfile *_tao_seq_TaggedProfile_ptr;
-
-    _tao_seq_TaggedProfile profiles;
-  };
-
-  class TAO_Export IOR_var
-  {
-  public:
-    IOR_var (void); // default constructor
-    IOR_var (IOR *);
-    IOR_var (const IOR_var &); // copy constructor
-    ~IOR_var (void); // destructor
-
-    IOR_var &operator= (IOR *);
-    IOR_var &operator= (const IOR_var &);
-    IOR *operator-> (void);
-    const IOR *operator-> (void) const;
-
-    operator const IOR &() const;
-    operator IOR &();
-    operator IOR &() const;
-    // in, inout, out, _retn
-    const IOR &in (void) const;
-    IOR &inout (void);
-    IOR *&out (void);
-    IOR *_retn (void);
-    IOR *ptr (void) const;
-
-  private:
-    IOR *ptr_;
-  };
-
-  class TAO_Export IOR_out
-  {
-  public:
-    IOR_out (IOR *&);
-    IOR_out (IOR_var &);
-    IOR_out (const IOR_out &);
-    IOR_out &operator= (const IOR_out &);
-    IOR_out &operator= (IOR *);
-    operator IOR *&();
-    IOR *&ptr (void);
-    IOR *operator-> (void);
-
-  private:
-    IOR *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const IOR_var &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IOR;
-
-  typedef CORBA::ULong ComponentId;
-  typedef CORBA::ULong_out ComponentId_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ComponentId;
-
-  struct TAO_Export TaggedComponent
-  {
-    ComponentId tag;
-
-    class TAO_Export _tao_seq_Octet : public TAO_Unbounded_Sequence<CORBA::Octet>
-    {
-    public:
-      _tao_seq_Octet (void); // default ctor
-      _tao_seq_Octet (CORBA::ULong max); // uses max size
-      _tao_seq_Octet (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::Octet *buffer,
-        CORBA::Boolean release=0
-      );
-      _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor
-      ~_tao_seq_Octet (void); // dtor
-
-#if defined(TAO_NO_COPY_OCTET_SEQUENCES)
-      _tao_seq_Octet (
-          CORBA::ULong length,
-          const ACE_Message_Block* mb
-        )
-        : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
-#endif /* TAO_NO_COPY_OCTET_SEQUENCE */
-
-    };
-    typedef _tao_seq_Octet *_tao_seq_Octet_ptr;
-
-    _tao_seq_Octet component_data;
-  };
-
-  class TAO_Export TaggedComponent_var
-  {
-  public:
-    TaggedComponent_var (void); // default constructor
-    TaggedComponent_var (TaggedComponent *);
-    TaggedComponent_var (const TaggedComponent_var &); // copy constructor
-    ~TaggedComponent_var (void); // destructor
-
-    TaggedComponent_var &operator= (TaggedComponent *);
-    TaggedComponent_var &operator= (const TaggedComponent_var &);
-    TaggedComponent *operator-> (void);
-    const TaggedComponent *operator-> (void) const;
-
-    operator const TaggedComponent &() const;
-    operator TaggedComponent &();
-    operator TaggedComponent &() const;
-    // in, inout, out, _retn
-    const TaggedComponent &in (void) const;
-    TaggedComponent &inout (void);
-    TaggedComponent *&out (void);
-    TaggedComponent *_retn (void);
-    TaggedComponent *ptr (void) const;
-
-  private:
-    TaggedComponent *ptr_;
-  };
-
-  class TAO_Export TaggedComponent_out
-  {
-  public:
-    TaggedComponent_out (TaggedComponent *&);
-    TaggedComponent_out (TaggedComponent_var &);
-    TaggedComponent_out (const TaggedComponent_out &);
-    TaggedComponent_out &operator= (const TaggedComponent_out &);
-    TaggedComponent_out &operator= (TaggedComponent *);
-    operator TaggedComponent *&();
-    TaggedComponent *&ptr (void);
-    TaggedComponent *operator-> (void);
-
-  private:
-    TaggedComponent *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const TaggedComponent_var &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TaggedComponent;
-
-  class TAO_Export MultipleComponentProfile : public TAO_Unbounded_Sequence<TaggedComponent>
-  {
-  public:
-    MultipleComponentProfile (void); // default ctor
-    MultipleComponentProfile (CORBA::ULong max); // uses max size
-    MultipleComponentProfile (
-      CORBA::ULong max,
-      CORBA::ULong length,
-      TaggedComponent *buffer,
-      CORBA::Boolean release=0
-    );
-    MultipleComponentProfile (const MultipleComponentProfile &); // copy ctor
-    ~MultipleComponentProfile (void); // dtor
-  };
-  typedef MultipleComponentProfile *MultipleComponentProfile_ptr;
-
-  // *************************************************************
-  // class IOP::MultipleComponentProfile_var
-  // *************************************************************
-
-  class TAO_Export MultipleComponentProfile_var
-  {
-  public:
-    MultipleComponentProfile_var (void); // default constructor
-    MultipleComponentProfile_var (MultipleComponentProfile *);
-    MultipleComponentProfile_var (const MultipleComponentProfile_var &); // copy constructor
-    ~MultipleComponentProfile_var (void); // destructor
-
-    MultipleComponentProfile_var &operator= (MultipleComponentProfile *);
-    MultipleComponentProfile_var &operator= (const MultipleComponentProfile_var &);
-    MultipleComponentProfile *operator-> (void);
-    const MultipleComponentProfile *operator-> (void) const;
-
-    operator const MultipleComponentProfile &() const;
-    operator MultipleComponentProfile &();
-    operator MultipleComponentProfile &() const;
-    TaggedComponent &operator[] (CORBA::ULong index);
-    // in, inout, out, _retn
-    const MultipleComponentProfile &in (void) const;
-    MultipleComponentProfile &inout (void);
-    MultipleComponentProfile *&out (void);
-    MultipleComponentProfile *_retn (void);
-    MultipleComponentProfile *ptr (void) const;
-
-  private:
-    MultipleComponentProfile *ptr_;
-  };
-
-  class TAO_Export MultipleComponentProfile_out
-  {
-  public:
-    MultipleComponentProfile_out (MultipleComponentProfile *&);
-    MultipleComponentProfile_out (MultipleComponentProfile_var &);
-    MultipleComponentProfile_out (const MultipleComponentProfile_out &);
-    MultipleComponentProfile_out &operator= (const MultipleComponentProfile_out &);
-    MultipleComponentProfile_out &operator= (MultipleComponentProfile *);
-    operator MultipleComponentProfile *&();
-    MultipleComponentProfile *&ptr (void);
-    MultipleComponentProfile *operator-> (void);
-    TaggedComponent &operator[] (CORBA::ULong index);
-
-  private:
-    MultipleComponentProfile *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const MultipleComponentProfile_var &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_MultipleComponentProfile;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_ORB_TYPE;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_CODE_SETS;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_POLICIES;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_ALTERNATE_IIOP_ADDRESS;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_ASSOCIATION_OPTIONS;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_SEC_NAME;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_SPKM_1_SEC_MECH;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_SPKM_2_SEC_MECH;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_KerberosV5_SEC_MECH;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_CSI_ECMA_Secret_SEC_MECH;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_CSI_ECMA_Hybrid_SEC_MECH;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_SSL_SEC_TRANS;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_CSI_ECMA_Public_SEC_MECH;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_GENERIC_SEC_MECH;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_COMPLETE_OBJECT_KEY;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_ENDPOINT_ID_POSITION;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_LOCATION_POLICY;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_DCE_STRING_BINDING;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_DCE_BINDING_NAME;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_DCE_NO_PIPES;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_DCE_SEC_MECH;
-
-  typedef CORBA::ULong ServiceId;
-  typedef CORBA::ULong_out ServiceId_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServiceId;
-
-  struct TAO_Export ServiceContext
-  {
-    ServiceId context_id;
-
-    // *************************************************************
-    // _tao_seq_Octet
-    // *************************************************************
-
-    class TAO_Export _tao_seq_Octet : public TAO_Unbounded_Sequence<CORBA::Octet>
-    {
-    public:
-      _tao_seq_Octet (void); // default ctor
-      _tao_seq_Octet (CORBA::ULong max); // uses max size
-      _tao_seq_Octet (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::Octet *buffer,
-        CORBA::Boolean release=0
-      );
-      _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor
-      ~_tao_seq_Octet (void); // dtor
-
-#if defined(TAO_NO_COPY_OCTET_SEQUENCES)
-      _tao_seq_Octet (
-          CORBA::ULong length,
-          const ACE_Message_Block* mb
-        )
-        : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
-#endif /* TAO_NO_COPY_OCTET_SEQUENCE */
-
-    };
-    typedef _tao_seq_Octet *_tao_seq_Octet_ptr;
-
-    _tao_seq_Octet context_data;
-  };
-
-  class TAO_Export ServiceContext_var
-  {
-  public:
-    ServiceContext_var (void); // default constructor
-    ServiceContext_var (ServiceContext *);
-    ServiceContext_var (const ServiceContext_var &); // copy constructor
-    ~ServiceContext_var (void); // destructor
-
-    ServiceContext_var &operator= (ServiceContext *);
-    ServiceContext_var &operator= (const ServiceContext_var &);
-    ServiceContext *operator-> (void);
-    const ServiceContext *operator-> (void) const;
-
-    operator const ServiceContext &() const;
-    operator ServiceContext &();
-    operator ServiceContext &() const;
-    // in, inout, out, _retn
-    const ServiceContext &in (void) const;
-    ServiceContext &inout (void);
-    ServiceContext *&out (void);
-    ServiceContext *_retn (void);
-    ServiceContext *ptr (void) const;
-
-  private:
-    ServiceContext *ptr_;
-  };
-
-  class TAO_Export ServiceContext_out
-  {
-  public:
-    ServiceContext_out (ServiceContext *&);
-    ServiceContext_out (ServiceContext_var &);
-    ServiceContext_out (const ServiceContext_out &);
-    ServiceContext_out &operator= (const ServiceContext_out &);
-    ServiceContext_out &operator= (ServiceContext *);
-    operator ServiceContext *&();
-    ServiceContext *&ptr (void);
-    ServiceContext *operator-> (void);
-
-  private:
-    ServiceContext *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const ServiceContext_var &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServiceContext;
-
-  class TAO_Export ServiceContextList : public TAO_Unbounded_Sequence<ServiceContext>
-  {
-  public:
-    ServiceContextList (void); // default ctor
-    ServiceContextList (CORBA::ULong max); // uses max size
-    ServiceContextList (
-      CORBA::ULong max,
-      CORBA::ULong length,
-      ServiceContext *buffer,
-      CORBA::Boolean release=0
-    );
-    ServiceContextList (const ServiceContextList &); // copy ctor
-    ~ServiceContextList (void); // dtor
-  };
-  typedef ServiceContextList *ServiceContextList_ptr;
-
-  // *************************************************************
-  // class IOP::ServiceContextList_var
-  // *************************************************************
-
-  class TAO_Export ServiceContextList_var
-  {
-  public:
-    ServiceContextList_var (void); // default constructor
-    ServiceContextList_var (ServiceContextList *);
-    ServiceContextList_var (const ServiceContextList_var &); // copy constructor
-    ~ServiceContextList_var (void); // destructor
-
-    ServiceContextList_var &operator= (ServiceContextList *);
-    ServiceContextList_var &operator= (const ServiceContextList_var &);
-    ServiceContextList *operator-> (void);
-    const ServiceContextList *operator-> (void) const;
-
-    operator const ServiceContextList &() const;
-    operator ServiceContextList &();
-    operator ServiceContextList &() const;
-    ServiceContext &operator[] (CORBA::ULong index);
-    // in, inout, out, _retn
-    const ServiceContextList &in (void) const;
-    ServiceContextList &inout (void);
-    ServiceContextList *&out (void);
-    ServiceContextList *_retn (void);
-    ServiceContextList *ptr (void) const;
-
-  private:
-    ServiceContextList *ptr_;
-  };
-
-  class TAO_Export ServiceContextList_out
-  {
-  public:
-    ServiceContextList_out (ServiceContextList *&);
-    ServiceContextList_out (ServiceContextList_var &);
-    ServiceContextList_out (const ServiceContextList_out &);
-    ServiceContextList_out &operator= (const ServiceContextList_out &);
-    ServiceContextList_out &operator= (ServiceContextList *);
-    operator ServiceContextList *&();
-    ServiceContextList *&ptr (void);
-    ServiceContextList *operator-> (void);
-    ServiceContext &operator[] (CORBA::ULong index);
-
-  private:
-    ServiceContextList *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const ServiceContextList_var &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServiceContextList;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TransactionService;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong CodeSets;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong ChainBypassCheck;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong ChainBypassInfo;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong LogicalThreadId;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong BI_DIR_IIOP;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong SendingContextRunTime;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong INVOCATION_POLICIES;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong UnknownExceptionInfo;
-
-
-}; // module IOP
-
-void TAO_Export operator<<= (CORBA::Any &, const IOP::TaggedProfile &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, IOP::TaggedProfile*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, IOP::TaggedProfile *&);
-void TAO_Export operator<<= (CORBA::Any &, const IOP::IOR &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, IOP::IOR*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, IOP::IOR *&);
-void TAO_Export operator<<= (CORBA::Any &, const IOP::TaggedComponent &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, IOP::TaggedComponent*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, IOP::TaggedComponent *&);
-void TAO_Export operator<<= (CORBA::Any &, const IOP::MultipleComponentProfile &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, IOP::MultipleComponentProfile*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, IOP::MultipleComponentProfile *&);
-void TAO_Export operator<<= (CORBA::Any &, const IOP::ServiceContext &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, IOP::ServiceContext*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, IOP::ServiceContext *&);
-void TAO_Export operator<<= (CORBA::Any &, const IOP::ServiceContextList &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, IOP::ServiceContextList*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, IOP::ServiceContextList *&);
-
-#ifndef __ACE_INLINE__
-
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const IOP::TaggedProfile &);
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, IOP::TaggedProfile &);
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const IOP::TaggedProfile::_tao_seq_Octet &
-  );
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    IOP::TaggedProfile::_tao_seq_Octet &
-  );
-
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const IOP::IOR &);
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, IOP::IOR &);
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const IOP::IOR::_tao_seq_TaggedProfile &
-  );
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    IOP::IOR::_tao_seq_TaggedProfile &
-  );
-
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const IOP::TaggedComponent &);
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, IOP::TaggedComponent &);
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const IOP::TaggedComponent::_tao_seq_Octet &
-  );
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    IOP::TaggedComponent::_tao_seq_Octet &
-  );
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const IOP::MultipleComponentProfile &
-  );
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    IOP::MultipleComponentProfile &
-  );
-
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const IOP::ServiceContext &);
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, IOP::ServiceContext &);
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const IOP::ServiceContext::_tao_seq_Octet &
-  );
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    IOP::ServiceContext::_tao_seq_Octet &
-  );
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const IOP::ServiceContextList &
-  );
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    IOP::ServiceContextList &
-  );
-
-
-#endif /* __ACE_INLINE__ */
-
-
-#if defined (__ACE_INLINE__)
-#include "tao/IOPC.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_IOPC_H */
diff --git a/TAO/tao/IOPC.i b/TAO/tao/IOPC.i
deleted file mode 100644
index 2e758adc062..00000000000
--- a/TAO/tao/IOPC.i
+++ /dev/null
@@ -1,1189 +0,0 @@
-// $Id$
-
-// *************************************************************
-// Inline operations for class IOP::TaggedProfile_var
-// *************************************************************
-
-ACE_INLINE
-IOP::TaggedProfile_var::TaggedProfile_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IOP::TaggedProfile_var::TaggedProfile_var (IOP::TaggedProfile *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IOP::TaggedProfile_var::TaggedProfile_var (const IOP::TaggedProfile_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new IOP::TaggedProfile(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::TaggedProfile_var::~TaggedProfile_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedProfile_var &
-IOP::TaggedProfile_var::operator= (IOP::TaggedProfile *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE IOP::TaggedProfile_var &
-IOP::TaggedProfile_var::operator= (const IOP::TaggedProfile_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new IOP::TaggedProfile (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const IOP::TaggedProfile *
-IOP::TaggedProfile_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedProfile *
-IOP::TaggedProfile_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IOP::TaggedProfile_var::operator const IOP::TaggedProfile &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IOP::TaggedProfile_var::operator IOP::TaggedProfile &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IOP::TaggedProfile_var::operator IOP::TaggedProfile &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const IOP::TaggedProfile &
-IOP::TaggedProfile_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedProfile &
-IOP::TaggedProfile_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE IOP::TaggedProfile *&
-IOP::TaggedProfile_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedProfile *
-IOP::TaggedProfile_var::_retn (void)
-{
-  IOP::TaggedProfile *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE IOP::TaggedProfile *
-IOP::TaggedProfile_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class IOP::TaggedProfile_out
-// *************************************************************
-
-ACE_INLINE
-IOP::TaggedProfile_out::TaggedProfile_out (IOP::TaggedProfile *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::TaggedProfile_out::TaggedProfile_out (IOP::TaggedProfile_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::TaggedProfile_out::TaggedProfile_out (const IOP::TaggedProfile_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (IOP::TaggedProfile_out&,p).ptr_)
-{}
-
-ACE_INLINE IOP::TaggedProfile_out &
-IOP::TaggedProfile_out::operator= (const IOP::TaggedProfile_out &p)
-{
-  this->ptr_ = ACE_const_cast (IOP::TaggedProfile_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE IOP::TaggedProfile_out &
-IOP::TaggedProfile_out::operator= (IOP::TaggedProfile *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-IOP::TaggedProfile_out::operator IOP::TaggedProfile *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedProfile *&
-IOP::TaggedProfile_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedProfile *
-IOP::TaggedProfile_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class IOP::IOR_var
-// *************************************************************
-
-ACE_INLINE
-IOP::IOR_var::IOR_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IOP::IOR_var::IOR_var (IOP::IOR *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IOP::IOR_var::IOR_var (const IOP::IOR_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new IOP::IOR(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::IOR_var::~IOR_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE IOP::IOR_var &
-IOP::IOR_var::operator= (IOP::IOR *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE IOP::IOR_var &
-IOP::IOR_var::operator= (const IOP::IOR_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new IOP::IOR (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const IOP::IOR *
-IOP::IOR_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::IOR *
-IOP::IOR_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IOP::IOR_var::operator const IOP::IOR &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IOP::IOR_var::operator IOP::IOR &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IOP::IOR_var::operator IOP::IOR &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const IOP::IOR &
-IOP::IOR_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE IOP::IOR &
-IOP::IOR_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE IOP::IOR *&
-IOP::IOR_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::IOR *
-IOP::IOR_var::_retn (void)
-{
-  IOP::IOR *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE IOP::IOR *
-IOP::IOR_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class IOP::IOR_out
-// *************************************************************
-
-ACE_INLINE
-IOP::IOR_out::IOR_out (IOP::IOR *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::IOR_out::IOR_out (IOP::IOR_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::IOR_out::IOR_out (const IOP::IOR_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (IOP::IOR_out&,p).ptr_)
-{}
-
-ACE_INLINE IOP::IOR_out &
-IOP::IOR_out::operator= (const IOP::IOR_out &p)
-{
-  this->ptr_ = ACE_const_cast (IOP::IOR_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE IOP::IOR_out &
-IOP::IOR_out::operator= (IOP::IOR *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-IOP::IOR_out::operator IOP::IOR *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::IOR *&
-IOP::IOR_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::IOR *
-IOP::IOR_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class IOP::TaggedComponent_var
-// *************************************************************
-
-ACE_INLINE
-IOP::TaggedComponent_var::TaggedComponent_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IOP::TaggedComponent_var::TaggedComponent_var (IOP::TaggedComponent *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IOP::TaggedComponent_var::TaggedComponent_var (const IOP::TaggedComponent_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new IOP::TaggedComponent(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::TaggedComponent_var::~TaggedComponent_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedComponent_var &
-IOP::TaggedComponent_var::operator= (IOP::TaggedComponent *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE IOP::TaggedComponent_var &
-IOP::TaggedComponent_var::operator= (const IOP::TaggedComponent_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new IOP::TaggedComponent (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const IOP::TaggedComponent *
-IOP::TaggedComponent_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedComponent *
-IOP::TaggedComponent_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IOP::TaggedComponent_var::operator const IOP::TaggedComponent &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IOP::TaggedComponent_var::operator IOP::TaggedComponent &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IOP::TaggedComponent_var::operator IOP::TaggedComponent &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const IOP::TaggedComponent &
-IOP::TaggedComponent_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedComponent &
-IOP::TaggedComponent_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE IOP::TaggedComponent *&
-IOP::TaggedComponent_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedComponent *
-IOP::TaggedComponent_var::_retn (void)
-{
-  IOP::TaggedComponent *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE IOP::TaggedComponent *
-IOP::TaggedComponent_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class IOP::TaggedComponent_out
-// *************************************************************
-
-ACE_INLINE
-IOP::TaggedComponent_out::TaggedComponent_out (IOP::TaggedComponent *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::TaggedComponent_out::TaggedComponent_out (IOP::TaggedComponent_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::TaggedComponent_out::TaggedComponent_out (const IOP::TaggedComponent_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (IOP::TaggedComponent_out&,p).ptr_)
-{}
-
-ACE_INLINE IOP::TaggedComponent_out &
-IOP::TaggedComponent_out::operator= (const IOP::TaggedComponent_out &p)
-{
-  this->ptr_ = ACE_const_cast (IOP::TaggedComponent_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE IOP::TaggedComponent_out &
-IOP::TaggedComponent_out::operator= (IOP::TaggedComponent *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-IOP::TaggedComponent_out::operator IOP::TaggedComponent *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedComponent *&
-IOP::TaggedComponent_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedComponent *
-IOP::TaggedComponent_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class IOP::MultipleComponentProfile_var
-// *************************************************************
-
-ACE_INLINE
-IOP::MultipleComponentProfile_var::MultipleComponentProfile_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IOP::MultipleComponentProfile_var::MultipleComponentProfile_var (IOP::MultipleComponentProfile *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IOP::MultipleComponentProfile_var::MultipleComponentProfile_var (const IOP::MultipleComponentProfile_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new IOP::MultipleComponentProfile(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::MultipleComponentProfile_var::~MultipleComponentProfile_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE IOP::MultipleComponentProfile_var &
-IOP::MultipleComponentProfile_var::operator= (IOP::MultipleComponentProfile *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE IOP::MultipleComponentProfile_var &
-IOP::MultipleComponentProfile_var::operator= (const IOP::MultipleComponentProfile_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new IOP::MultipleComponentProfile (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const IOP::MultipleComponentProfile *
-IOP::MultipleComponentProfile_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::MultipleComponentProfile *
-IOP::MultipleComponentProfile_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IOP::MultipleComponentProfile_var::operator const IOP::MultipleComponentProfile &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IOP::MultipleComponentProfile_var::operator IOP::MultipleComponentProfile &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IOP::MultipleComponentProfile_var::operator IOP::MultipleComponentProfile &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedComponent &
-IOP::MultipleComponentProfile_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const IOP::MultipleComponentProfile &
-IOP::MultipleComponentProfile_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE IOP::MultipleComponentProfile &
-IOP::MultipleComponentProfile_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE IOP::MultipleComponentProfile *&
-IOP::MultipleComponentProfile_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::MultipleComponentProfile *
-IOP::MultipleComponentProfile_var::_retn (void)
-{
-  IOP::MultipleComponentProfile *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE IOP::MultipleComponentProfile *
-IOP::MultipleComponentProfile_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class IOP::MultipleComponentProfile_out
-// *************************************************************
-
-ACE_INLINE
-IOP::MultipleComponentProfile_out::MultipleComponentProfile_out (IOP::MultipleComponentProfile *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::MultipleComponentProfile_out::MultipleComponentProfile_out (IOP::MultipleComponentProfile_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::MultipleComponentProfile_out::MultipleComponentProfile_out (const IOP::MultipleComponentProfile_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (IOP::MultipleComponentProfile_out&,p).ptr_)
-{}
-
-ACE_INLINE IOP::MultipleComponentProfile_out &
-IOP::MultipleComponentProfile_out::operator= (const IOP::MultipleComponentProfile_out &p)
-{
-  this->ptr_ = ACE_const_cast (IOP::MultipleComponentProfile_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE IOP::MultipleComponentProfile_out &
-IOP::MultipleComponentProfile_out::operator= (IOP::MultipleComponentProfile *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-IOP::MultipleComponentProfile_out::operator IOP::MultipleComponentProfile *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::MultipleComponentProfile *&
-IOP::MultipleComponentProfile_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::MultipleComponentProfile *
-IOP::MultipleComponentProfile_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedComponent &
-IOP::MultipleComponentProfile_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-// *************************************************************
-// Inline operations for class IOP::ServiceContext_var
-// *************************************************************
-
-ACE_INLINE
-IOP::ServiceContext_var::ServiceContext_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IOP::ServiceContext_var::ServiceContext_var (IOP::ServiceContext *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IOP::ServiceContext_var::ServiceContext_var (const IOP::ServiceContext_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new IOP::ServiceContext(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::ServiceContext_var::~ServiceContext_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE IOP::ServiceContext_var &
-IOP::ServiceContext_var::operator= (IOP::ServiceContext *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE IOP::ServiceContext_var &
-IOP::ServiceContext_var::operator= (const IOP::ServiceContext_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new IOP::ServiceContext (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const IOP::ServiceContext *
-IOP::ServiceContext_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::ServiceContext *
-IOP::ServiceContext_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IOP::ServiceContext_var::operator const IOP::ServiceContext &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IOP::ServiceContext_var::operator IOP::ServiceContext &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IOP::ServiceContext_var::operator IOP::ServiceContext &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const IOP::ServiceContext &
-IOP::ServiceContext_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE IOP::ServiceContext &
-IOP::ServiceContext_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE IOP::ServiceContext *&
-IOP::ServiceContext_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::ServiceContext *
-IOP::ServiceContext_var::_retn (void)
-{
-  IOP::ServiceContext *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE IOP::ServiceContext *
-IOP::ServiceContext_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class IOP::ServiceContext_out
-// *************************************************************
-
-ACE_INLINE
-IOP::ServiceContext_out::ServiceContext_out (IOP::ServiceContext *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::ServiceContext_out::ServiceContext_out (IOP::ServiceContext_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::ServiceContext_out::ServiceContext_out (const IOP::ServiceContext_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (IOP::ServiceContext_out&,p).ptr_)
-{}
-
-ACE_INLINE IOP::ServiceContext_out &
-IOP::ServiceContext_out::operator= (const IOP::ServiceContext_out &p)
-{
-  this->ptr_ = ACE_const_cast (IOP::ServiceContext_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE IOP::ServiceContext_out &
-IOP::ServiceContext_out::operator= (IOP::ServiceContext *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-IOP::ServiceContext_out::operator IOP::ServiceContext *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::ServiceContext *&
-IOP::ServiceContext_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::ServiceContext *
-IOP::ServiceContext_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class IOP::ServiceContextList_var
-// *************************************************************
-
-ACE_INLINE
-IOP::ServiceContextList_var::ServiceContextList_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IOP::ServiceContextList_var::ServiceContextList_var (IOP::ServiceContextList *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IOP::ServiceContextList_var::ServiceContextList_var (const IOP::ServiceContextList_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new IOP::ServiceContextList(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::ServiceContextList_var::~ServiceContextList_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE IOP::ServiceContextList_var &
-IOP::ServiceContextList_var::operator= (IOP::ServiceContextList *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE IOP::ServiceContextList_var &
-IOP::ServiceContextList_var::operator= (const IOP::ServiceContextList_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new IOP::ServiceContextList (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const IOP::ServiceContextList *
-IOP::ServiceContextList_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::ServiceContextList *
-IOP::ServiceContextList_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IOP::ServiceContextList_var::operator const IOP::ServiceContextList &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IOP::ServiceContextList_var::operator IOP::ServiceContextList &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IOP::ServiceContextList_var::operator IOP::ServiceContextList &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE IOP::ServiceContext &
-IOP::ServiceContextList_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const IOP::ServiceContextList &
-IOP::ServiceContextList_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE IOP::ServiceContextList &
-IOP::ServiceContextList_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE IOP::ServiceContextList *&
-IOP::ServiceContextList_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::ServiceContextList *
-IOP::ServiceContextList_var::_retn (void)
-{
-  IOP::ServiceContextList *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE IOP::ServiceContextList *
-IOP::ServiceContextList_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class IOP::ServiceContextList_out
-// *************************************************************
-
-ACE_INLINE
-IOP::ServiceContextList_out::ServiceContextList_out (IOP::ServiceContextList *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::ServiceContextList_out::ServiceContextList_out (IOP::ServiceContextList_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::ServiceContextList_out::ServiceContextList_out (const IOP::ServiceContextList_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (IOP::ServiceContextList_out&,p).ptr_)
-{}
-
-ACE_INLINE IOP::ServiceContextList_out &
-IOP::ServiceContextList_out::operator= (const IOP::ServiceContextList_out &p)
-{
-  this->ptr_ = ACE_const_cast (IOP::ServiceContextList_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE IOP::ServiceContextList_out &
-IOP::ServiceContextList_out::operator= (IOP::ServiceContextList *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-IOP::ServiceContextList_out::operator IOP::ServiceContextList *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::ServiceContextList *&
-IOP::ServiceContextList_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::ServiceContextList *
-IOP::ServiceContextList_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::ServiceContext &
-IOP::ServiceContextList_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const IOP::TaggedProfile::_tao_seq_Octet &
-  );
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    IOP::TaggedProfile::_tao_seq_Octet &
-  );
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IOP::TaggedProfile &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.tag) &&
-    (strm << _tao_aggregate.profile_data)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IOP::TaggedProfile &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.tag) &&
-    (strm >> _tao_aggregate.profile_data)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const IOP::IOR::_tao_seq_TaggedProfile &
-  );
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    IOP::IOR::_tao_seq_TaggedProfile &
-  );
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IOP::IOR &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.type_id.in ()) &&
-    (strm << _tao_aggregate.profiles)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IOP::IOR &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.type_id.out ()) &&
-    (strm >> _tao_aggregate.profiles)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const IOP::TaggedComponent::_tao_seq_Octet &
-  );
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    IOP::TaggedComponent::_tao_seq_Octet &
-  );
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IOP::TaggedComponent &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.tag) &&
-    (strm << _tao_aggregate.component_data)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IOP::TaggedComponent &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.tag) &&
-    (strm >> _tao_aggregate.component_data)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const IOP::MultipleComponentProfile &
-  );
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    IOP::MultipleComponentProfile &
-  );
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const IOP::ServiceContext::_tao_seq_Octet &
-  );
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    IOP::ServiceContext::_tao_seq_Octet &
-  );
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IOP::ServiceContext &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.context_id) &&
-    (strm << _tao_aggregate.context_data)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IOP::ServiceContext &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.context_id) &&
-    (strm >> _tao_aggregate.context_data)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const IOP::ServiceContextList &
-  );
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    IOP::ServiceContextList &
-  );
diff --git a/TAO/tao/IOPS.cpp b/TAO/tao/IOPS.cpp
deleted file mode 100644
index b8ad217fde6..00000000000
--- a/TAO/tao/IOPS.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   IOPS.h
-//
-// = DESCRIPTION
-//   Generated from IOP.pidl, that contains the OMG standarized IOP
-//   module.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#include "IOPS.h"
-
-#if !defined (__ACE_INLINE__)
-#include "IOPS.i"
-#endif /* !defined INLINE */
diff --git a/TAO/tao/IOPS.h b/TAO/tao/IOPS.h
deleted file mode 100644
index 6584475e3a3..00000000000
--- a/TAO/tao/IOPS.h
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   IOPS.h
-//
-// = DESCRIPTION
-//   Generated from IOP.pidl, that contains the OMG standarized IOP
-//   module.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#ifndef TAO_IOPS_H
-#define TAO_IOPS_H
-
-#include "IOPC.h"
-
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-TAO_NAMESPACE  POA_IOP
-{
-};
-
-#include "IOPS_T.h"
-
-#if defined (__ACE_INLINE__)
-#include "IOPS.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_IOPS_H */
diff --git a/TAO/tao/IOPS.i b/TAO/tao/IOPS.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/IOPS.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/IOPS_T.cpp b/TAO/tao/IOPS_T.cpp
deleted file mode 100644
index b80bcaff451..00000000000
--- a/TAO/tao/IOPS_T.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   IOPS_T.cpp
-//
-// = DESCRIPTION
-//   Generated from IOP.pidl, that contains the OMG standarized IOP
-//   module.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#ifndef TAO_IOPS_T_CPP
-#define TAO_IOPS_T_CPP
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#include "IOPS_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "IOPS_T.i"
-#endif /* !defined INLINE */
-
-
-#endif /* TAO_IOPS_T_CPP */
diff --git a/TAO/tao/IOPS_T.h b/TAO/tao/IOPS_T.h
deleted file mode 100644
index ed25a1b5035..00000000000
--- a/TAO/tao/IOPS_T.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   IOPS_T.cpp
-//
-// = DESCRIPTION
-//   Generated from IOP.pidl, that contains the OMG standarized IOP
-//   module.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#ifndef TAO_IOPS_T_H
-#define TAO_IOPS_T_H
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-#if defined (__ACE_INLINE__)
-#include "IOPS_T.i"
-#endif /* defined INLINE */
-
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "IOPS_T.cpp"
-#endif /* defined REQUIRED SOURCE */
-
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("IOPS_T.cpp")
-#endif /* defined REQUIRED PRAGMA */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_IOPS_T_H */
diff --git a/TAO/tao/IOPS_T.i b/TAO/tao/IOPS_T.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/IOPS_T.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/IOR.pidl b/TAO/tao/IOR.pidl
deleted file mode 100644
index cfc7184c8e7..00000000000
--- a/TAO/tao/IOR.pidl
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   XXX
-//
-// = DESCRIPTION
-//   This file was used to generate the code in IOR{C,S,S_T}.{h,i,cpp}
-//   The code is then hand-crafted to compile it inside the ORB, avoid
-//   cyclic dependencies and enforce the locality constraints on
-//   certain objects.
-//
-// ================================================================
-
-module TAO_IOP {
-
-  interface TAO_IOR_Manipulation {
-
-    exception EmptyProfileList {};
-    exception NotFound {};
-    exception Duplicate {};
-    exception Invalid_IOR {};
-
-    // Manipulating Object References.  While this interface does not
-    // assume the use of CORBA complient IOPs, the IOP termonology is
-    // used throughout.
-    // Object references (Object) are used since they encapsulate the
-    // notion of object references and IORs.
-    // Note, an IOR contains one or more profiles and a profile can be
-    // considered to represent the location or route to a specific instance
-    // of an object.
-    // A profile may also contain supplimentary information useful for
-    // differrent services such as security.
-    // All Object references may have multiple profiles
-
-    typedef sequence <Object> IORList;
-
-    Object merge_iors (in IORList iors)
-      raises (EmptyProfileList,Duplicate,Invalid_IOR);
-    // Create a new object reference by merging the profiles lists in the
-    // supplied list of one or more object references.
-
-    Object add_profiles (in Object ior1,
-                         in Object ior2)
-      raises (EmptyProfileList, Duplicate, Invalid_IOR);
-    // copy the profile list from "ior2" to "ior1".
-    // Note on ordering, while the current implementation will place
-    // the profiles from ior2 (which are not already in ior1) on the
-    // end of the profile list in ior1, there is no guarantee this ordering
-    // will be maintained.  For example, string_to_object or object_to_string
-    // may reorder the profile lists.  So, if it is important to use one
-    // profile before another then policies should be used along with tagged
-    // components/tagged profiles.
-
-    Object remove_profiles (in Object ior1,
-                            in Object ior2)
-      raises (Invalid_IOR, EmptyProfileList, NotFound);
-    // Any profile in ior1 which matches at least one profile in ior2
-    // will be removed.  Returns a new object reference
-
-    unsigned long is_in_ior(in Object ior1, in Object ior2)
-      raises (NotFound);
-    // returns number of profiles which are in both ior1 and ior2.
-
-    unsigned long get_profile_count (in Object ior)
-      raises (EmptyProfileList);
-    // This will return the number of profiles contained in the
-    // corresponding object reference for this object.
-
-  };
-};
diff --git a/TAO/tao/IORC.cpp b/TAO/tao/IORC.cpp
deleted file mode 100644
index 5f5f85ea73e..00000000000
--- a/TAO/tao/IORC.cpp
+++ /dev/null
@@ -1,1138 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "tao/IORC.h"
-
-#if !defined (__ACE_INLINE__)
-#include "IORC.i"
-#endif /* !defined INLINE */
-
-#include "tao/IORS.h"
-#include "tao/Stub.h"
-#include "tao/corba.h"
-
-ACE_RCSID(tao, IORC, "$Id$")
-
-TAO_IOP::TAO_IOR_Manipulation_ptr TAO_IOP::TAO_IOR_Manipulation::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return TAO_IOP::TAO_IOR_Manipulation::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:TAO_IOP/TAO_IOR_Manipulation:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (TAO_IOP::TAO_IOR_Manipulation::_nil ());
-  if (is_a == 0)
-    return TAO_IOP::TAO_IOR_Manipulation::_nil ();
-  return TAO_IOP::TAO_IOR_Manipulation::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-TAO_IOP::TAO_IOR_Manipulation_ptr TAO_IOP::TAO_IOR_Manipulation::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return TAO_IOP::TAO_IOR_Manipulation::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:TAO_IOP/TAO_IOR_Manipulation:1.0");
-  if (servant != 0)
-    {
-      // PortableServer::Servant iservant = ACE_reinterpret_cast(POA_TAO_IOP::TAO_IOR_Manipulation_ptr, servant);
-      // TAO_IOP::TAO_IOR_Manipulation_ptr retv = ACE_reinterpret_cast (
-          // TAO_IOP::TAO_IOR_Manipulation_ptr,
-          // iservant->_create_collocated_objref (TAO_ORB_Core::ORB_CONTROL, stub)
-        // );
-      // if (retv != 0)
-        // return retv;
-      return new POA_TAO_IOP::_tao_collocated_TAO_IOR_Manipulation(
-          ACE_reinterpret_cast(POA_TAO_IOP::TAO_IOR_Manipulation_ptr, servant),
-          stub
-        );
-    }
-  return new TAO_IOP::TAO_IOR_Manipulation(stub);
-}
-
-TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation::_duplicate (TAO_IOP::TAO_IOR_Manipulation_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-// default constructor
-TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::EmptyProfileList (void)
-  : CORBA_UserException (TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList)
-{
-}
-
-// destructor - all members are of self managing types
-TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::~EmptyProfileList (void)
-{
-}
-
-// copy constructor
-TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::EmptyProfileList (const TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-  }
-
-// assignment operator
-TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList&
-TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::operator= (const TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList &_tao_excp)
-{
-
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-// narrow
-TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList_ptr
-TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/TAO_IOR_Manipulation/EmptyProfileList:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList_ptr, exc);
-  else
-    return 0;
-}
-
-
-void TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::_raise ()
-{
-  TAO_RAISE(*this);
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::_alloc (void)
-{
-  return new TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList;
-}
-
-static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Manipulation_EmptyProfileList[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  54, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f525f), ACE_NTOHL (0x4d616e69), ACE_NTOHL (0x70756c61), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x2f456d70), ACE_NTOHL (0x74795072), ACE_NTOHL (0x6f66696c), ACE_NTOHL (0x654c6973), ACE_NTOHL (0x743a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:TAO_IOP/TAO_IOR_Manipulation/EmptyProfileList:1.0
-  17, ACE_NTOHL (0x456d7074), ACE_NTOHL (0x7950726f), ACE_NTOHL (0x66696c65), ACE_NTOHL (0x4c697374), ACE_NTOHL (0x0),  // name = EmptyProfileList
-  0, // member count
-};
-static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_EmptyProfileList (CORBA::tk_except, sizeof (_oc_TAO_IOP_TAO_IOR_Manipulation_EmptyProfileList), (char *) &_oc_TAO_IOP_TAO_IOR_Manipulation_EmptyProfileList, 0, sizeof (TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList));
-CORBA::TypeCode_ptr TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList = &_tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_EmptyProfileList;
-
-// default constructor
-TAO_IOP::TAO_IOR_Manipulation::NotFound::NotFound (void)
-  : CORBA_UserException (TAO_IOP::TAO_IOR_Manipulation::_tc_NotFound)
-{
-}
-
-// destructor - all members are of self managing types
-TAO_IOP::TAO_IOR_Manipulation::NotFound::~NotFound (void)
-{
-}
-
-// copy constructor
-TAO_IOP::TAO_IOR_Manipulation::NotFound::NotFound (const TAO_IOP::TAO_IOR_Manipulation::NotFound &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-  }
-
-// assignment operator
-TAO_IOP::TAO_IOR_Manipulation::NotFound&
-TAO_IOP::TAO_IOR_Manipulation::NotFound::operator= (const TAO_IOP::TAO_IOR_Manipulation::NotFound &_tao_excp)
-{
-
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-// narrow
-TAO_IOP::TAO_IOR_Manipulation::NotFound_ptr
-TAO_IOP::TAO_IOR_Manipulation::NotFound::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/TAO_IOR_Manipulation/NotFound:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (TAO_IOP::TAO_IOR_Manipulation::NotFound_ptr, exc);
-  else
-    return 0;
-}
-
-
-void TAO_IOP::TAO_IOR_Manipulation::NotFound::_raise ()
-{
-  TAO_RAISE(*this);
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *TAO_IOP::TAO_IOR_Manipulation::NotFound::_alloc (void)
-{
-  return new TAO_IOP::TAO_IOR_Manipulation::NotFound;
-}
-
-static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Manipulation_NotFound[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  46, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f525f), ACE_NTOHL (0x4d616e69), ACE_NTOHL (0x70756c61), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x2f4e6f74), ACE_NTOHL (0x466f756e), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:TAO_IOP/TAO_IOR_Manipulation/NotFound:1.0
-  9, ACE_NTOHL (0x4e6f7446), ACE_NTOHL (0x6f756e64), ACE_NTOHL (0x0),  // name = NotFound
-  0, // member count
-};
-static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_NotFound (CORBA::tk_except, sizeof (_oc_TAO_IOP_TAO_IOR_Manipulation_NotFound), (char *) &_oc_TAO_IOP_TAO_IOR_Manipulation_NotFound, 0, sizeof (TAO_IOP::TAO_IOR_Manipulation::NotFound));
-CORBA::TypeCode_ptr TAO_IOP::TAO_IOR_Manipulation::_tc_NotFound = &_tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_NotFound;
-
-// default constructor
-TAO_IOP::TAO_IOR_Manipulation::Duplicate::Duplicate (void)
-  : CORBA_UserException (TAO_IOP::TAO_IOR_Manipulation::_tc_Duplicate)
-{
-}
-
-// destructor - all members are of self managing types
-TAO_IOP::TAO_IOR_Manipulation::Duplicate::~Duplicate (void)
-{
-}
-
-// copy constructor
-TAO_IOP::TAO_IOR_Manipulation::Duplicate::Duplicate (const TAO_IOP::TAO_IOR_Manipulation::Duplicate &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-  }
-
-// assignment operator
-TAO_IOP::TAO_IOR_Manipulation::Duplicate&
-TAO_IOP::TAO_IOR_Manipulation::Duplicate::operator= (const TAO_IOP::TAO_IOR_Manipulation::Duplicate &_tao_excp)
-{
-
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-// narrow
-TAO_IOP::TAO_IOR_Manipulation::Duplicate_ptr
-TAO_IOP::TAO_IOR_Manipulation::Duplicate::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/TAO_IOR_Manipulation/Duplicate:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (TAO_IOP::TAO_IOR_Manipulation::Duplicate_ptr, exc);
-  else
-    return 0;
-}
-
-
-void TAO_IOP::TAO_IOR_Manipulation::Duplicate::_raise ()
-{
-  TAO_RAISE(*this);
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *TAO_IOP::TAO_IOR_Manipulation::Duplicate::_alloc (void)
-{
-  return new TAO_IOP::TAO_IOR_Manipulation::Duplicate;
-}
-
-static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Manipulation_Duplicate[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  47, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f525f), ACE_NTOHL (0x4d616e69), ACE_NTOHL (0x70756c61), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x2f447570), ACE_NTOHL (0x6c696361), ACE_NTOHL (0x74653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:TAO_IOP/TAO_IOR_Manipulation/Duplicate:1.0
-  10, ACE_NTOHL (0x4475706c), ACE_NTOHL (0x69636174), ACE_NTOHL (0x65000000),  // name = Duplicate
-  0, // member count
-};
-static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_Duplicate (CORBA::tk_except, sizeof (_oc_TAO_IOP_TAO_IOR_Manipulation_Duplicate), (char *) &_oc_TAO_IOP_TAO_IOR_Manipulation_Duplicate, 0, sizeof (TAO_IOP::TAO_IOR_Manipulation::Duplicate));
-CORBA::TypeCode_ptr TAO_IOP::TAO_IOR_Manipulation::_tc_Duplicate = &_tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_Duplicate;
-
-// default constructor
-TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::Invalid_IOR (void)
-  : CORBA_UserException (TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR)
-{
-}
-
-// destructor - all members are of self managing types
-TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::~Invalid_IOR (void)
-{
-}
-
-// copy constructor
-TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::Invalid_IOR (const TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-  }
-
-// assignment operator
-TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR&
-TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::operator= (const TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR &_tao_excp)
-{
-
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-// narrow
-TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR_ptr
-TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/TAO_IOR_Manipulation/Invalid_IOR:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR_ptr, exc);
-  else
-    return 0;
-}
-
-
-void TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::_raise ()
-{
-  TAO_RAISE(*this);
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::_alloc (void)
-{
-  return new TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR;
-}
-
-static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Manipulation_Invalid_IOR[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  49, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f525f), ACE_NTOHL (0x4d616e69), ACE_NTOHL (0x70756c61), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x2f496e76), ACE_NTOHL (0x616c6964), ACE_NTOHL (0x5f494f52), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/TAO_IOR_Manipulation/Invalid_IOR:1.0
-  12, ACE_NTOHL (0x496e7661), ACE_NTOHL (0x6c69645f), ACE_NTOHL (0x494f5200),  // name = Invalid_IOR
-  0, // member count
-};
-static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_Invalid_IOR (CORBA::tk_except, sizeof (_oc_TAO_IOP_TAO_IOR_Manipulation_Invalid_IOR), (char *) &_oc_TAO_IOP_TAO_IOR_Manipulation_Invalid_IOR, 0, sizeof (TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR));
-CORBA::TypeCode_ptr TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR = &_tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_Invalid_IOR;
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_
-
-// *************************************************************
-// TAO_IOP::TAO_IOR_Manipulation::IORList
-// *************************************************************
-
-TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (void)
-{}
-TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (CORBA::ULong max) // uses max size
-  :
-  TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var> (max)
-{}
-TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (CORBA::ULong max, CORBA::ULong length, CORBA::Object_ptr *buffer, CORBA::Boolean release)
-  :
-  TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var> (max, length, buffer, release)
-{}
-TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (const IORList &seq) // copy ctor
-  :
-  TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var> (seq)
-{}
-TAO_IOP::TAO_IOR_Manipulation::IORList::~IORList (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Manipulation_IORList[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  45, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f525f), ACE_NTOHL (0x4d616e69), ACE_NTOHL (0x70756c61), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x2f494f52), ACE_NTOHL (0x4c697374), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/TAO_IOR_Manipulation/IORList:1.0
-  8, ACE_NTOHL (0x494f524c), ACE_NTOHL (0x69737400),  // name = IORList
-  CORBA::tk_sequence, // typecode kind
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref,
-    52, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Object:1.0
-      7, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63740000),  // name = Object
-
-    0,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_IORList (CORBA::tk_alias, sizeof (_oc_TAO_IOP_TAO_IOR_Manipulation_IORList), (char *) &_oc_TAO_IOP_TAO_IOR_Manipulation_IORList, 0, sizeof (TAO_IOP::TAO_IOR_Manipulation::IORList));
-CORBA::TypeCode_ptr TAO_IOP::TAO_IOR_Manipulation::_tc_IORList = &_tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_IORList;
-
-CORBA::Object_ptr TAO_IOP::TAO_IOR_Manipulation::merge_iors (
-    const TAO_IOP::TAO_IOR_Manipulation::IORList & iors,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-    TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-    TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-  ))
-{
-
-  static TAO_Exception_Data _tao_TAO_IOP_TAO_IOR_Manipulation_merge_iors_exceptiondata [] =
-  {
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList, TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::_alloc},
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_Duplicate, TAO_IOP::TAO_IOR_Manipulation::Duplicate::_alloc},
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR, TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::_alloc}
-  };
-
-  CORBA::Object_ptr _tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "merge_iors",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << iors)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (_tao_TAO_IOP_TAO_IOR_Manipulation_merge_iors_exceptiondata, 3, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::Object_ptr TAO_IOP::TAO_IOR_Manipulation::add_profiles (
-    CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-    TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-    TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-  ))
-{
-
-  static TAO_Exception_Data _tao_TAO_IOP_TAO_IOR_Manipulation_add_profiles_exceptiondata [] =
-  {
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList, TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::_alloc},
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_Duplicate, TAO_IOP::TAO_IOR_Manipulation::Duplicate::_alloc},
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR, TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::_alloc}
-  };
-
-  CORBA::Object_ptr _tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "add_profiles",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << ior1) &&
-          (_tao_out << ior2)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (_tao_TAO_IOP_TAO_IOR_Manipulation_add_profiles_exceptiondata, 3, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::Object_ptr TAO_IOP::TAO_IOR_Manipulation::remove_profiles (
-    CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR,
-    TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-    TAO_IOP::TAO_IOR_Manipulation::NotFound
-  ))
-{
-
-  static TAO_Exception_Data _tao_TAO_IOP_TAO_IOR_Manipulation_remove_profiles_exceptiondata [] =
-  {
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR, TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::_alloc},
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList, TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::_alloc},
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_NotFound, TAO_IOP::TAO_IOR_Manipulation::NotFound::_alloc}
-  };
-
-  CORBA::Object_ptr _tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "remove_profiles",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << ior1) &&
-          (_tao_out << ior2)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (_tao_TAO_IOP_TAO_IOR_Manipulation_remove_profiles_exceptiondata, 3, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::ULong TAO_IOP::TAO_IOR_Manipulation::is_in_ior (
-    CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    TAO_IOP::TAO_IOR_Manipulation::NotFound
-  ))
-{
-
-  static TAO_Exception_Data _tao_TAO_IOP_TAO_IOR_Manipulation_is_in_ior_exceptiondata [] =
-  {
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_NotFound, TAO_IOP::TAO_IOR_Manipulation::NotFound::_alloc}
-  };
-
-  CORBA::ULong _tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "is_in_ior",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << ior1) &&
-          (_tao_out << ior2)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (_tao_TAO_IOP_TAO_IOR_Manipulation_is_in_ior_exceptiondata, 1, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::ULong TAO_IOP::TAO_IOR_Manipulation::get_profile_count (
-    CORBA::Object_ptr ior,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList
-  ))
-{
-
-  static TAO_Exception_Data _tao_TAO_IOP_TAO_IOR_Manipulation_get_profile_count_exceptiondata [] =
-  {
-    {TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList, TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::_alloc}
-  };
-
-  CORBA::ULong _tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "get_profile_count",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << ior)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (_tao_TAO_IOP_TAO_IOR_Manipulation_get_profile_count_exceptiondata, 1, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::Boolean TAO_IOP::TAO_IOR_Manipulation::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:TAO_IOP/TAO_IOR_Manipulation:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
-}
-
-const char* TAO_IOP::TAO_IOR_Manipulation::_interface_repository_id (void) const
-{
-  return "IDL:TAO_IOP/TAO_IOR_Manipulation:1.0";
-}
-
-static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Manipulation[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  41, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f525f), ACE_NTOHL (0x6d616e69), ACE_NTOHL (0x70756c61), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/TAO_IOR_Manipulation:1.0
-  21, ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f525f), ACE_NTOHL (0x6d616e69), ACE_NTOHL (0x70756c61), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0),  // name = TAO_IOR_Manipulation
-};
-static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation (CORBA::tk_objref, sizeof (_oc_TAO_IOP_TAO_IOR_Manipulation), (char *) &_oc_TAO_IOP_TAO_IOR_Manipulation, 0, sizeof (TAO_IOP::TAO_IOR_Manipulation));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (TAO_IOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TAO_IOR_Manipulation, &_tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation)
-TAO_NAMESPACE_END
-void operator<<= (CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = TAO_IOP::TAO_IOR_Manipulation::_duplicate (_tao_elem);
-    _tao_any.replace (TAO_IOP::_tc_TAO_IOR_Manipulation, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = TAO_IOP::TAO_IOR_Manipulation::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (TAO_IOP::_tc_TAO_IOR_Manipulation, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (TAO_IOP::_tc_TAO_IOR_Manipulation, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = TAO_IOP::TAO_IOR_Manipulation::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (TAO_IOP::_tc_TAO_IOR_Manipulation, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<TAO_IOP::TAO_IOR_Manipulation,TAO_IOP::TAO_IOR_Manipulation_var>;
-  template class TAO_Object_Manager<TAO_IOP::TAO_IOR_Manipulation,TAO_IOP::TAO_IOR_Manipulation_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<TAO_IOP::TAO_IOR_Manipulation,TAO_IOP::TAO_IOR_Manipulation_var>
-#  pragma instantiate TAO_Object_Manager<TAO_IOP::TAO_IOR_Manipulation,TAO_IOP::TAO_IOR_Manipulation_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-void operator<<= (CORBA::Any &_tao_any, const TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList &_tao_elem) // copying
-{
-  TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList *_tao_any_val = new TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const TAO_IOP::TAO_IOR_Manipulation::NotFound &_tao_elem) // copying
-{
-  TAO_IOP::TAO_IOR_Manipulation::NotFound *_tao_any_val = new TAO_IOP::TAO_IOR_Manipulation::NotFound (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (TAO_IOP::TAO_IOR_Manipulation::_tc_NotFound, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation::NotFound *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (TAO_IOP::TAO_IOR_Manipulation::_tc_NotFound, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation::NotFound *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (TAO_IOP::TAO_IOR_Manipulation::_tc_NotFound, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (TAO_IOP::TAO_IOR_Manipulation::NotFound *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, TAO_IOP::TAO_IOR_Manipulation::NotFound, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (TAO_IOP::TAO_IOR_Manipulation::_tc_NotFound, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (TAO_IOP::TAO_IOR_Manipulation::_tc_NotFound, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const TAO_IOP::TAO_IOR_Manipulation::Duplicate &_tao_elem) // copying
-{
-  TAO_IOP::TAO_IOR_Manipulation::Duplicate *_tao_any_val = new TAO_IOP::TAO_IOR_Manipulation::Duplicate (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (TAO_IOP::TAO_IOR_Manipulation::_tc_Duplicate, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation::Duplicate *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (TAO_IOP::TAO_IOR_Manipulation::_tc_Duplicate, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation::Duplicate *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (TAO_IOP::TAO_IOR_Manipulation::_tc_Duplicate, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (TAO_IOP::TAO_IOR_Manipulation::Duplicate *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, TAO_IOP::TAO_IOR_Manipulation::Duplicate, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (TAO_IOP::TAO_IOR_Manipulation::_tc_Duplicate, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (TAO_IOP::TAO_IOR_Manipulation::_tc_Duplicate, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR &_tao_elem) // copying
-{
-  TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR *_tao_any_val = new TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const TAO_IOP::TAO_IOR_Manipulation::IORList &_tao_elem
-  ) // copying
-{
-  TAO_IOP::TAO_IOR_Manipulation::IORList *_tao_any_val;
-  ACE_NEW (_tao_any_val, TAO_IOP::TAO_IOR_Manipulation::IORList (_tao_elem));
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (TAO_IOP::TAO_IOR_Manipulation::_tc_IORList, _tao_any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation::IORList *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (TAO_IOP::TAO_IOR_Manipulation::_tc_IORList, _tao_elem, 0, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipulation::IORList *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (TAO_IOP::TAO_IOR_Manipulation::_tc_IORList, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (TAO_IOP::TAO_IOR_Manipulation::IORList *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, TAO_IOP::TAO_IOR_Manipulation::IORList, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (TAO_IOP::TAO_IOR_Manipulation::_tc_IORList, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (TAO_IOP::TAO_IOR_Manipulation::_tc_IORList, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const TAO_IOP::TAO_IOR_Manipulation::IORList &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    TAO_IOP::TAO_IOR_Manipulation::IORList &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
diff --git a/TAO/tao/IORC.h b/TAO/tao/IORC.h
deleted file mode 100644
index fd5488bef8d..00000000000
--- a/TAO/tao/IORC.h
+++ /dev/null
@@ -1,525 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#ifndef _TAO_IDL_IORC_H_
-#define _TAO_IDL_IORC_H_
-
-#include "ace/OS.h"
-#include "tao/corbafwd.h"
-#include "tao/Environment.h"
-#include "tao/CDR.h"
-#include "tao/Object.h"
-#include "tao/Sequence.h"
-#include "tao/Sequence_T.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-TAO_NAMESPACE  TAO_IOP
-{
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___PTR_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION___PTR_CH_
-
-  class TAO_IOR_Manipulation;
-  typedef TAO_IOR_Manipulation *TAO_IOR_Manipulation_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___VAR_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION___VAR_CH_
-
-  class TAO_Export TAO_IOR_Manipulation_var
-  {
-  public:
-    TAO_IOR_Manipulation_var (void); // default constructor
-    TAO_IOR_Manipulation_var (TAO_IOR_Manipulation_ptr);
-    TAO_IOR_Manipulation_var (const TAO_IOR_Manipulation_var &); // copy constructor
-    ~TAO_IOR_Manipulation_var (void); // destructor
-
-    TAO_IOR_Manipulation_var &operator= (TAO_IOR_Manipulation_ptr);
-    TAO_IOR_Manipulation_var &operator= (const TAO_IOR_Manipulation_var &);
-    TAO_IOR_Manipulation_ptr operator-> (void) const;
-
-    operator const TAO_IOR_Manipulation_ptr &() const;
-    operator TAO_IOR_Manipulation_ptr &();
-    // in, inout, out, _retn
-    TAO_IOR_Manipulation_ptr in (void) const;
-    TAO_IOR_Manipulation_ptr &inout (void);
-    TAO_IOR_Manipulation_ptr &out (void);
-    TAO_IOR_Manipulation_ptr _retn (void);
-    TAO_IOR_Manipulation_ptr ptr (void) const;
-
-  private:
-    TAO_IOR_Manipulation_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___OUT_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION___OUT_CH_
-
-  class TAO_Export TAO_IOR_Manipulation_out
-  {
-  public:
-    TAO_IOR_Manipulation_out (TAO_IOR_Manipulation_ptr &);
-    TAO_IOR_Manipulation_out (TAO_IOR_Manipulation_var &);
-    TAO_IOR_Manipulation_out (const TAO_IOR_Manipulation_out &);
-    TAO_IOR_Manipulation_out &operator= (const TAO_IOR_Manipulation_out &);
-    TAO_IOR_Manipulation_out &operator= (const TAO_IOR_Manipulation_var &);
-    TAO_IOR_Manipulation_out &operator= (TAO_IOR_Manipulation_ptr);
-    operator TAO_IOR_Manipulation_ptr &();
-    TAO_IOR_Manipulation_ptr &ptr (void);
-    TAO_IOR_Manipulation_ptr operator-> (void);
-
-  private:
-    TAO_IOR_Manipulation_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_CH_
-
-  class TAO_Export TAO_IOR_Manipulation : public virtual ACE_CORBA_1 (Object)
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef TAO_IOR_Manipulation_ptr _ptr_type;
-    typedef TAO_IOR_Manipulation_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static TAO_IOR_Manipulation_ptr _duplicate (TAO_IOR_Manipulation_ptr obj);
-    static TAO_IOR_Manipulation_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    static TAO_IOR_Manipulation_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    static TAO_IOR_Manipulation_ptr _nil (void);
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_EMPTYPROFILELIST___PTR_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_EMPTYPROFILELIST___PTR_CH_
-
-    class TAO_Export EmptyProfileList;
-    typedef EmptyProfileList *EmptyProfileList_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_EMPTYPROFILELIST_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_EMPTYPROFILELIST_CH_
-
-    class TAO_Export EmptyProfileList : public CORBA::UserException
-    {
-    public:
-
-      EmptyProfileList (void); // default ctor
-      EmptyProfileList (const EmptyProfileList &); // copy ctor
-      ~EmptyProfileList (void); // dtor
-            EmptyProfileList &operator= (const EmptyProfileList &);
-
-
-      virtual void _raise (void);
-
-      static EmptyProfileList *_narrow (CORBA::Exception *);
-
-
-      // = TAO extension
-      static CORBA::Exception *_alloc (void);
-
-    }; // exception TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList
-
-        static CORBA::TypeCode_ptr _tc_EmptyProfileList;
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_NOTFOUND___PTR_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_NOTFOUND___PTR_CH_
-
-    class NotFound;
-    typedef NotFound *NotFound_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_NOTFOUND_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_NOTFOUND_CH_
-
-    class TAO_Export NotFound : public CORBA::UserException
-    {
-    public:
-
-      NotFound (void); // default ctor
-      NotFound (const NotFound &); // copy ctor
-      ~NotFound (void); // dtor
-            NotFound &operator= (const NotFound &);
-
-
-      virtual void _raise (void);
-
-      static NotFound *_narrow (CORBA::Exception *);
-
-
-      // = TAO extension
-      static CORBA::Exception *_alloc (void);
-
-    }; // exception TAO_IOP::TAO_IOR_Manipulation::NotFound
-
-        static CORBA::TypeCode_ptr _tc_NotFound;
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_DUPLICATE___PTR_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_DUPLICATE___PTR_CH_
-
-    class Duplicate;
-    typedef Duplicate *Duplicate_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_DUPLICATE_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_DUPLICATE_CH_
-
-    class TAO_Export  Duplicate : public CORBA::UserException
-    {
-    public:
-
-      Duplicate (void); // default ctor
-      Duplicate (const Duplicate &); // copy ctor
-      ~Duplicate (void); // dtor
-            Duplicate &operator= (const Duplicate &);
-
-
-      virtual void _raise (void);
-
-      static Duplicate *_narrow (CORBA::Exception *);
-
-
-      // = TAO extension
-      static CORBA::Exception *_alloc (void);
-
-    }; // exception TAO_IOP::TAO_IOR_Manipulation::Duplicate
-
-        static CORBA::TypeCode_ptr _tc_Duplicate;
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_INVALID_IOR___PTR_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_INVALID_IOR___PTR_CH_
-
-    class Invalid_IOR;
-    typedef Invalid_IOR *Invalid_IOR_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_INVALID_IOR_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_INVALID_IOR_CH_
-
-    class TAO_Export  Invalid_IOR : public CORBA::UserException
-    {
-    public:
-
-      Invalid_IOR (void); // default ctor
-      Invalid_IOR (const Invalid_IOR &); // copy ctor
-      ~Invalid_IOR (void); // dtor
-            Invalid_IOR &operator= (const Invalid_IOR &);
-
-
-      virtual void _raise (void);
-
-      static Invalid_IOR *_narrow (CORBA::Exception *);
-
-
-      // = TAO extension
-      static CORBA::Exception *_alloc (void);
-
-    }; // exception TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-
-        static CORBA::TypeCode_ptr _tc_Invalid_IOR;
-
-
-#endif /* end #if !defined */
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_
-
-    // *************************************************************
-    // IORList
-    // *************************************************************
-
-    class TAO_Export IORList : public
-      TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var>
-    {
-    public:
-      IORList (void); // default ctor
-      IORList (CORBA::ULong max); // uses max size
-      IORList (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::Object_ptr *buffer,
-        CORBA::Boolean release=0
-      );
-      IORList (const IORList &); // copy ctor
-      ~IORList (void); // dtor
-    };
-    typedef IORList *IORList_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST___VAR_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST___VAR_CH_
-
-// *************************************************************
-    // class TAO_IOP::TAO_IOR_Manipulation::IORList_var
-    // *************************************************************
-
-    class TAO_Export IORList_var
-    {
-    public:
-      IORList_var (void); // default constructor
-      IORList_var (IORList *);
-      IORList_var (const IORList_var &); // copy constructor
-      ~IORList_var (void); // destructor
-
-      IORList_var &operator= (IORList *);
-      IORList_var &operator= (const IORList_var &);
-      IORList *operator-> (void);
-      const IORList *operator-> (void) const;
-
-      operator const IORList &() const;
-      operator IORList &();
-      operator IORList &() const;
-
-      TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index);
-      // in, inout, out, _retn
-      const IORList &in (void) const;
-      IORList &inout (void);
-      IORList *&out (void);
-      IORList *_retn (void);
-      IORList *ptr (void) const;
-
-    private:
-      IORList *ptr_;
-    };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST___OUT_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST___OUT_CH_
-
-    class TAO_Export IORList_out
-    {
-    public:
-      IORList_out (IORList *&);
-      IORList_out (IORList_var &);
-      IORList_out (const IORList_out &);
-      IORList_out &operator= (const IORList_out &);
-      IORList_out &operator= (IORList *);
-      operator IORList *&();
-      IORList *&ptr (void);
-      IORList *operator-> (void);
-
-      TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index);
-
-    private:
-      IORList *&ptr_;
-      // assignment from T_var not allowed
-      void operator= (const IORList_var &);
-    };
-
-
-#endif /* end #if !defined */
-
-    static CORBA::TypeCode_ptr _tc_IORList;
-
-    virtual CORBA::Object_ptr merge_iors (
-        const IORList & iors,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-      ));
-
-    virtual CORBA::Object_ptr add_profiles (
-        CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-      ));
-
-    virtual CORBA::Object_ptr remove_profiles (
-        CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::NotFound
-      ));
-
-    virtual CORBA::ULong is_in_ior (
-        CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::NotFound
-      ));
-
-    virtual CORBA::ULong get_profile_count (
-        CORBA::Object_ptr ior,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList
-      ));
-
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-
-  protected:
-    TAO_IOR_Manipulation (void);
-    TAO_IOR_Manipulation (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~TAO_IOR_Manipulation (void);
-  private:
-    TAO_IOR_Manipulation (const TAO_IOR_Manipulation &);
-    void operator= (const TAO_IOR_Manipulation &);
-  };
-
-
-#endif /* end #if !defined */
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TAO_IOR_Manipulation;
-
-
-}; // module TAO_IOP
-
-// Any operators for interface TAO_IOP::TAO_IOR_Manipulation
-void TAO_Export operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation_ptr);
-CORBA::Boolean  operator>>= (const CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation *&);
-void TAO_Export operator<<= (CORBA::Any &, const TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList *&);
-void TAO_Export operator<<= (CORBA::Any &, const TAO_IOP::TAO_IOR_Manipulation::NotFound &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation::NotFound*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation::NotFound *&);
-void TAO_Export operator<<= (CORBA::Any &, const TAO_IOP::TAO_IOR_Manipulation::Duplicate &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation::Duplicate*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation::Duplicate *&);
-void TAO_Export operator<<= (CORBA::Any &, const TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR *&);
-void TAO_Export operator<<= (CORBA::Any &, const TAO_IOP::TAO_IOR_Manipulation::IORList &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation::IORList*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation::IORList *&);
-
-#ifndef __ACE_INLINE__
-
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const TAO_IOP::TAO_IOR_Manipulation_ptr );
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, TAO_IOP::TAO_IOR_Manipulation_ptr &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList &);
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const TAO_IOP::TAO_IOR_Manipulation::NotFound &);
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, TAO_IOP::TAO_IOR_Manipulation::NotFound &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const TAO_IOP::TAO_IOR_Manipulation::Duplicate &); //
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, TAO_IOP::TAO_IOR_Manipulation::Duplicate &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR &); //
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR &);
-CORBA::Boolean TAO_Export
-operator<< (
-    TAO_OutputCDR &,
-    const TAO_IOP::TAO_IOR_Manipulation::IORList &
-  );
-CORBA::Boolean TAO_Export
-operator>> (
-    TAO_InputCDR &,
-    TAO_IOP::TAO_IOR_Manipulation::IORList &
-  );
-
-
-#endif /* __ACE_INLINE__ */
-
-
-#if defined (__ACE_INLINE__)
-#include "IORC.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* ifndef */
diff --git a/TAO/tao/IORC.i b/TAO/tao/IORC.i
deleted file mode 100644
index 74f2ebace5e..00000000000
--- a/TAO/tao/IORC.i
+++ /dev/null
@@ -1,552 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation (void) // default constructor
-{}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::~TAO_IOR_Manipulation (void) // destructor
-{}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation::_nil (void)
-{
-  return (TAO_IOP::TAO_IOR_Manipulation_ptr)0;
-}
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___VAR_CI_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION___VAR_CI_
-
-// *************************************************************
-// Inline operations for class TAO_IOP::TAO_IOR_Manipulation_var
-// *************************************************************
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation_var::TAO_IOR_Manipulation_var (void) // default constructor
-  : ptr_ (TAO_IOP::TAO_IOR_Manipulation::_nil ())
-{}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation_var::TAO_IOR_Manipulation_var (TAO_IOP::TAO_IOR_Manipulation_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation_var::TAO_IOR_Manipulation_var (const TAO_IOP::TAO_IOR_Manipulation_var &p) // copy constructor
-  : ptr_ (TAO_IOP::TAO_IOR_Manipulation::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation_var::~TAO_IOR_Manipulation_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_var &
-TAO_IOP::TAO_IOR_Manipulation_var::operator= (TAO_IOP::TAO_IOR_Manipulation_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_var &
-TAO_IOP::TAO_IOR_Manipulation_var::operator= (const TAO_IOP::TAO_IOR_Manipulation_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = TAO_IOP::TAO_IOR_Manipulation::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation_var::operator const TAO_IOP::TAO_IOR_Manipulation_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation_var::operator TAO_IOP::TAO_IOR_Manipulation_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_ptr &
-TAO_IOP::TAO_IOR_Manipulation_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_ptr &
-TAO_IOP::TAO_IOR_Manipulation_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = TAO_IOP::TAO_IOR_Manipulation::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  TAO_IOP::TAO_IOR_Manipulation_ptr val = this->ptr_;
-  this->ptr_ = TAO_IOP::TAO_IOR_Manipulation::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___OUT_CI_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION___OUT_CI_
-
-// *************************************************************
-// Inline operations for class TAO_IOP::TAO_IOR_Manipulation_out
-// *************************************************************
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation_out::TAO_IOR_Manipulation_out (TAO_IOP::TAO_IOR_Manipulation_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = TAO_IOP::TAO_IOR_Manipulation::_nil ();
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation_out::TAO_IOR_Manipulation_out (TAO_IOP::TAO_IOR_Manipulation_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = TAO_IOP::TAO_IOR_Manipulation::_nil ();
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation_out::TAO_IOR_Manipulation_out (const TAO_IOP::TAO_IOR_Manipulation_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (TAO_IOP::TAO_IOR_Manipulation_out&,p).ptr_)
-{}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_out &
-TAO_IOP::TAO_IOR_Manipulation_out::operator= (const TAO_IOP::TAO_IOR_Manipulation_out &p)
-{
-  this->ptr_ = ACE_const_cast (TAO_IOP::TAO_IOR_Manipulation_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_out &
-TAO_IOP::TAO_IOR_Manipulation_out::operator= (const TAO_IOP::TAO_IOR_Manipulation_var &p)
-{
-  this->ptr_ = TAO_IOP::TAO_IOR_Manipulation::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_out &
-TAO_IOP::TAO_IOR_Manipulation_out::operator= (TAO_IOP::TAO_IOR_Manipulation_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation_out::operator TAO_IOP::TAO_IOR_Manipulation_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_ptr &
-TAO_IOP::TAO_IOR_Manipulation_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-// *************************************************************
-// Inline operations for exception TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception TAO_IOP::TAO_IOR_Manipulation::NotFound
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception TAO_IOP::TAO_IOR_Manipulation::Duplicate
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-// *************************************************************
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CI_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CI_
-
-// *************************************************************
-// Inline operations for class TAO_IOP::TAO_IOR_Manipulation::IORList_var
-// *************************************************************
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::IORList_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::IORList_var (TAO_IOP::TAO_IOR_Manipulation::IORList *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::IORList_var (const TAO_IOP::TAO_IOR_Manipulation::IORList_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new TAO_IOP::TAO_IOR_Manipulation::IORList(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::~IORList_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::IORList_var &
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator= (TAO_IOP::TAO_IOR_Manipulation::IORList *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::IORList_var &
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator= (const TAO_IOP::TAO_IOR_Manipulation::IORList_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new TAO_IOP::TAO_IOR_Manipulation::IORList (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const TAO_IOP::TAO_IOR_Manipulation::IORList *
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::IORList *
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator const TAO_IOP::TAO_IOR_Manipulation::IORList &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator TAO_IOP::TAO_IOR_Manipulation::IORList &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator TAO_IOP::TAO_IOR_Manipulation::IORList &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TAO_Object_Manager<CORBA::Object,CORBA::Object_var>
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const TAO_IOP::TAO_IOR_Manipulation::IORList &
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::IORList &
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::IORList *&
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::IORList *
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::_retn (void)
-{
-  TAO_IOP::TAO_IOR_Manipulation::IORList *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::IORList *
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class TAO_IOP::TAO_IOR_Manipulation::IORList_out
-// *************************************************************
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::IORList_out (TAO_IOP::TAO_IOR_Manipulation::IORList *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::IORList_out (TAO_IOP::TAO_IOR_Manipulation::IORList_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::IORList_out (const TAO_IOP::TAO_IOR_Manipulation::IORList_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (TAO_IOP::TAO_IOR_Manipulation::IORList_out&,p).ptr_)
-{}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::IORList_out &
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator= (const TAO_IOP::TAO_IOR_Manipulation::IORList_out &p)
-{
-  this->ptr_ = ACE_const_cast (TAO_IOP::TAO_IOR_Manipulation::IORList_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::IORList_out &
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator= (TAO_IOP::TAO_IOR_Manipulation::IORList *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator TAO_IOP::TAO_IOR_Manipulation::IORList *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::IORList *&
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::IORList *
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_Object_Manager<CORBA::Object,CORBA::Object_var>
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const TAO_IOP::TAO_IOR_Manipulation_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    TAO_IOP::TAO_IOR_Manipulation_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::TAO_IOR_Manipulation::NotFound &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TAO_IOP::TAO_IOR_Manipulation::NotFound &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::TAO_IOR_Manipulation::Duplicate &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TAO_IOP::TAO_IOR_Manipulation::Duplicate &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const TAO_IOP::TAO_IOR_Manipulation::IORList &
-  );
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    TAO_IOP::TAO_IOR_Manipulation::IORList &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const TAO_IOP::TAO_IOR_Manipulation_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    TAO_IOP::TAO_IOR_Manipulation_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      TAO_IOP::TAO_IOR_Manipulation::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tao/IORManipulation.cpp b/TAO/tao/IORManipulation.cpp
deleted file mode 100644
index 623c06e2808..00000000000
--- a/TAO/tao/IORManipulation.cpp
+++ /dev/null
@@ -1,297 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     IORManipulation.cpp
-//
-// = DESCRIPTION
-//
-// = AUTHOR
-//     Fred Kuhns <fredk@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "tao/IORManipulation.h"
-#include "tao/corba.h"
-#include "ace/Auto_Ptr.h"
-#include "tao/MProfile.h"
-
-ACE_RCSID(tao, IORManipulation, "$Id$")
-
-TAO_IOR_Manipulation_impl::TAO_IOR_Manipulation_impl (void)
-{
-}
-
-TAO_IOR_Manipulation_impl::~TAO_IOR_Manipulation_impl (void)
-{
-}
-
-CORBA::Object_ptr
-TAO_IOR_Manipulation_impl::merge_iors (
-    const TAO_IOP::TAO_IOR_Manipulation::IORList & iors,
-    CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-                       TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-                       TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR))
-{
-  // we need to create a new CORBA::Object which has the union of the
-  // two profile lists.  However, if any profiles are duplicates (i.e. in
-  // bott lisis) then an exception is raised.
-
-  // Deterinine how many profiles we have
-  // Get an estimate of the size - pfile count could change since we
-  // neither lock nor get a copy in this loop.
-  CORBA::ULong i, count=0;
-  for (i = 0; i < iors.length (); i++)
-    {
-      count += iors[i]->_stubobj ()->get_base_profiles ().profile_count ();
-    }
-
-  // make sure we have some profiles
-  if (count == 0)
-    ACE_THROW_RETURN (TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList (),
-                      CORBA::Object::_nil ());
-
-  // initialize with estimated pfile count.
-  TAO_MProfile Merged_Profiles (count);
-
-  // get the profile lists, start by initialize the composite reference
-  // by using the first Object.  Then for each subsequent Object verify
-  // they are the same type and they do not have duplicate profiles.
-  auto_ptr<TAO_MProfile> tmp_pfiles (iors[0]->_stubobj ()->get_profiles ());
-  if (Merged_Profiles.add_profiles (tmp_pfiles.get ())< 0)
-    ACE_THROW_RETURN (TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR (),
-                      CORBA::Object::_nil ());
-  CORBA::String_var type_id = iors[0]->_stubobj ()->type_id;
-
-  for (i = 1; i < iors.length () ; i++)
-    {
-      // this gets a copy of the MProfile, hense ther auto_ptr;
-
-      // @@ This is ugly, it is a work around MS C++ auto_ptr which
-      // does not implement reset ()!!
-      auto_ptr<TAO_MProfile> XXtemp (iors[i]->_stubobj ()->get_profiles ());
-      // tmp_pfiles.reset (iors[i]->_stubobj ()->get_profiles ());
-      tmp_pfiles = XXtemp;
-
-      // check to see if any of the profile in tmp_pfiles are already
-      // in Merged_Profiles.  If so raise exception.
-      if (Merged_Profiles.is_equivalent (tmp_pfiles.get ()))
-        ACE_THROW_RETURN (TAO_IOP::TAO_IOR_Manipulation::Duplicate (),
-                          CORBA::Object::_nil ());
-
-      // If the object type_is's differ then raise an exception.
-      if (type_id.in () && iors[i]->_stubobj ()->type_id.in () &&
-          ACE_OS::strcmp (type_id, iors[i]->_stubobj ()->type_id))
-        ACE_THROW_RETURN (TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR (),
-                          CORBA::Object::_nil ());
-
-      // append profiles
-      if (Merged_Profiles.add_profiles (tmp_pfiles.get ()) < 0)
-        ACE_THROW_RETURN (TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR (),
-                          CORBA::Object::_nil ());
-
-    }
-
-  // MS C++ knows nothing abouyt reset!
-  // tmp_pfiles.reset (0); // get rid of last MProfile
-
-  TAO_ORB_Core *orb_core = TAO_ORB_Core_instance ();
-  // @@ need some sort of auto_ptr here
-  TAO_Stub *stub;
-  ACE_NEW_THROW_EX (stub,
-                    TAO_Stub (type_id,
-                              Merged_Profiles,
-                              orb_core),
-                    CORBA::NO_MEMORY ());
-
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  // Create the CORBA level proxy
-  CORBA_Object *new_obj;
-  ACE_NEW_THROW_EX (new_obj,
-                    CORBA_Object (stub),
-                    CORBA::NO_MEMORY ());
-
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  // Clean up in case of errors.
-  if (CORBA::is_nil (new_obj))
-    {
-      stub->_decr_refcnt ();
-      ACE_THROW_RETURN (TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR (),
-                        CORBA::Object::_nil ());
-    }
-
-  return new_obj;
-}
-
-CORBA::Object_ptr
-TAO_IOR_Manipulation_impl::add_profiles (
-    CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-      ))
-{
-
-  // Get an estimate of the number of profiles
-  CORBA::Object_ptr buffer [2];
-  buffer [0] = ior1;
-  buffer [1] = ior2;
-  TAO_IOP::TAO_IOR_Manipulation::IORList iors (2, 2, buffer, 0);
-  return this->merge_iors (iors, ACE_TRY_ENV);
-}
-
-CORBA::Object_ptr
-TAO_IOR_Manipulation_impl::remove_profiles (
-    CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::NotFound
-      ))
-{
-  // First verify they are the same type!
-  CORBA::String_var type_id = ior1->_stubobj ()->type_id;
-  if (type_id.in () && ior2->_stubobj ()->type_id.in () &&
-      ACE_OS::strcmp (type_id, ior2->_stubobj ()->type_id))
-    ACE_THROW_RETURN (TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR (),
-                      CORBA::Object::_nil ());
-
-  // Since we are removing from ior1 ...
-  CORBA::ULong count = ior1->_stubobj ()->get_base_profiles ().profile_count ();
-
-  // make sure we have some profiles
-  if (count == 0 ||
-      ior2->_stubobj ()->get_base_profiles ().profile_count () == 0)
-    ACE_THROW_RETURN (TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList (),
-                      CORBA::Object::_nil ());
-
-  // initialize with estimated pfile count.
-  TAO_MProfile Diff_Profiles (count);
-
-  auto_ptr<TAO_MProfile> tmp_pfiles (ior1->_stubobj ()->get_profiles ());
-  if (Diff_Profiles.add_profiles (tmp_pfiles.get ()) < 0)
-    ACE_THROW_RETURN (TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR (),
-                      CORBA::Object::_nil ());
-
-  // @@ This is ugly, it is a work around MS C++ auto_ptr which
-  // does not implement reset ()!!
-  auto_ptr<TAO_MProfile> XXtemp (ior2->_stubobj ()->get_profiles ());
-  tmp_pfiles = XXtemp;
-  // tmp_pfiles.reset (ior2->_stubobj ()->get_profiles ());
-
-  if (Diff_Profiles.remove_profiles (tmp_pfiles.get ()) < 0)
-    ACE_THROW_RETURN (TAO_IOP::TAO_IOR_Manipulation::NotFound (),
-                      CORBA::Object::_nil ());
-
-  // MS C++ knows nothing abouyt reset!
-  // tmp_pfiles.reset (0); // get rid of last MProfile
-
-  TAO_ORB_Core *orb_core = TAO_ORB_Core_instance ();
-  TAO_Stub *stub;
-  ACE_NEW_THROW_EX (stub,
-                    TAO_Stub (type_id,
-                              Diff_Profiles,
-                              orb_core),
-                    CORBA::NO_MEMORY ());
-
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  // Create the CORBA level proxy
-  CORBA_Object *new_obj;
-  ACE_NEW_THROW_EX (new_obj,
-                    CORBA_Object (stub),
-                    CORBA::NO_MEMORY ());
-
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-
-  // Clean up in case of errors.
-  if (CORBA::is_nil (new_obj))
-    {
-      stub->_decr_refcnt ();
-      ACE_THROW_RETURN (TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR (),
-                        CORBA::Object::_nil ());
-    }
-
-  return new_obj;
-}
-
-CORBA::ULong
-TAO_IOR_Manipulation_impl::is_in_ior (
-    CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::NotFound
-      ))
-{
-  CORBA::ULong count=0;
-  TAO_Profile *pfile1, *pfile2;
-  auto_ptr<TAO_MProfile> tmp_pfiles1 (ior1->_stubobj ()->get_profiles ());
-  auto_ptr<TAO_MProfile> tmp_pfiles2 (ior2->_stubobj ()->get_profiles ());
-
-  tmp_pfiles1->rewind ();
-  while ((pfile1 = tmp_pfiles1->get_next ()) > 0)
-    {
-      tmp_pfiles2->rewind ();
-      while ((pfile2 = tmp_pfiles2->get_next ()) > 0)
-        {
-          if (pfile1->is_equivalent (pfile2))
-            count++;
-        }
-    }
-
-  if (count == 0)
-    ACE_THROW_RETURN (TAO_IOP::TAO_IOR_Manipulation::NotFound (),
-                      0);
-
-  return count;
-}
-
-CORBA::ULong
-TAO_IOR_Manipulation_impl::get_profile_count (
-    CORBA::Object_ptr ior,
-    CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList
-      ))
-{
-  CORBA::ULong count;
-  count = ior->_stubobj ()->get_base_profiles ().profile_count ();
-
-  if (count == 0)
-    ACE_THROW_RETURN (TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList (),
-                      0);
-
-  return count;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO_Object_Manager<CORBA_Object,CORBA_Object_var>;
-template class TAO_Unbounded_Object_Sequence<CORBA_Object,CORBA_Object_var>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_Object_Manager<CORBA_Object,CORBA_Object_var>
-#pragma instantiate TAO_Unbounded_Object_Sequence<CORBA_Object,CORBA_Object_var>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/IORManipulation.h b/TAO/tao/IORManipulation.h
deleted file mode 100644
index ddaa5152995..00000000000
--- a/TAO/tao/IORManipulation.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    IORManipulation.h
-//
-// = DESCRIPTION
-//    This class implements IOR interface to the ORB
-//
-// = AUTHOR
-//     Fred Kuhns <fredk@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_IOR_MANIPULATION_H
-#define TAO_IOR_MANIPULATION_H
-
-#include "tao/Object.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/IORS.h"
-
-class TAO_IOR_Manipulation_impl : public POA_TAO_IOP::TAO_IOR_Manipulation
-{
-// = TITLE
-  //     IOR Manipulation class
-  //
-  // = DESCRIPTION
-  //
-  //
-public:
-
-  TAO_IOR_Manipulation_impl (void);
-  // constructor
-
-  ~TAO_IOR_Manipulation_impl (void);
-  // destructor
-
-  virtual CORBA::Object_ptr merge_iors (
-    const TAO_IOP::TAO_IOR_Manipulation::IORList & iors,
-    CORBA::Environment &ACE_TRY_ENV = CORBA::default_environment ())
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-      ));
-
-  virtual CORBA::Object_ptr add_profiles (
-      CORBA::Object_ptr ior1,
-      CORBA::Object_ptr ior2,
-      CORBA::Environment &ACE_TRY_ENV = CORBA::default_environment ())
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-      ));
-
-  virtual CORBA::Object_ptr remove_profiles (
-    CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV = CORBA::default_environment ())
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::NotFound
-      ));
-
-  virtual CORBA::ULong is_in_ior (
-    CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV = CORBA::default_environment ())
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::NotFound
-      ));
-
-  virtual CORBA::ULong get_profile_count (
-    CORBA::Object_ptr ior,
-    CORBA::Environment &ACE_TRY_ENV = CORBA::default_environment ())
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList
-      ));
-};
-
-#endif /* TAO_IOR_MANIPULATION_H */
diff --git a/TAO/tao/IORS.cpp b/TAO/tao/IORS.cpp
deleted file mode 100644
index 0e1b486e7d8..00000000000
--- a/TAO/tao/IORS.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "IORS.h"
-
-ACE_RCSID(tao, IORS, "$Id$")
-
-#if !defined (__ACE_INLINE__)
-#include "IORS.i"
-#endif /* !defined INLINE */
-
-POA_TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation (void)
-{
-}
-
-// copy ctor
-// POA_TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation (const TAO_IOR_Manipulation& rhs)
-//   :   TAO_Local_ServantBase (rhs)
-// {}
-//
-// skeleton destructor
-POA_TAO_IOP::TAO_IOR_Manipulation::~TAO_IOR_Manipulation (void)
-{
-}
-
-CORBA::Boolean POA_TAO_IOP::TAO_IOR_Manipulation::_is_a (
-    const char* value,
-    CORBA::Environment &
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:TAO_IOP/TAO_IOR_Manipulation:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_TAO_IOP::TAO_IOR_Manipulation::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:TAO_IOP/TAO_IOR_Manipulation:1.0") == 0)
-    return ACE_static_cast (POA_TAO_IOP::TAO_IOR_Manipulation_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-const char* POA_TAO_IOP::TAO_IOR_Manipulation::_interface_repository_id (void) const
-{
-  return "IDL:TAO_IOP/TAO_IOR_Manipulation:1.0";
-}
-
-
-TAO_IOP::TAO_IOR_Manipulation*
-POA_TAO_IOP::TAO_IOR_Manipulation::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_TAO_IOP::_tao_collocated_TAO_IOR_Manipulation (this, stub);
-}
-
-void*
-POA_TAO_IOP::TAO_IOR_Manipulation::_create_collocated_objref (
-    const char* repository_id,
-    CORBA::ULong type,
-    TAO_Stub *stub)
-{
-  ACE_UNUSED_ARG (type);
-  if (!strcmp ("IDL:TAO_IOP/TAO_IOR_Manipulation:1.0",repository_id))
-    return ACE_static_cast (
-        TAO_IOP::TAO_IOR_Manipulation_ptr,
-        new POA_TAO_IOP::_tao_collocated_TAO_IOR_Manipulation (this, stub)
-      );
-  return 0;
-}
-
-POA_TAO_IOP::_tao_collocated_TAO_IOR_Manipulation::_tao_collocated_TAO_IOR_Manipulation (
-    POA_TAO_IOP::TAO_IOR_Manipulation_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (TAO_IOP,TAO_IOR_Manipulation) (),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_TAO_IOP::TAO_IOR_Manipulation_ptr POA_TAO_IOP::_tao_collocated_TAO_IOR_Manipulation::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Object_ptr POA_TAO_IOP::_tao_collocated_TAO_IOR_Manipulation::merge_iors  (
-    const TAO_IOP::TAO_IOR_Manipulation::IORList & iors,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-    TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-    TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-  ))
-{
-  return this->servant_->merge_iors (
-      iors,
-      ACE_TRY_ENV
-    );
-
-}
-
-CORBA::Object_ptr POA_TAO_IOP::_tao_collocated_TAO_IOR_Manipulation::add_profiles  (
-    CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-    TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-    TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-  ))
-{
-  return this->servant_->add_profiles (
-      ior1,
-      ior2,
-      ACE_TRY_ENV
-    );
-
-}
-
-CORBA::Object_ptr POA_TAO_IOP::_tao_collocated_TAO_IOR_Manipulation::remove_profiles  (
-    CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR,
-    TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-    TAO_IOP::TAO_IOR_Manipulation::NotFound
-  ))
-{
-  return this->servant_->remove_profiles (
-      ior1,
-      ior2,
-      ACE_TRY_ENV
-    );
-
-}
-
-CORBA::ULong POA_TAO_IOP::_tao_collocated_TAO_IOR_Manipulation::is_in_ior  (
-    CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    TAO_IOP::TAO_IOR_Manipulation::NotFound
-  ))
-{
-  return this->servant_->is_in_ior (
-      ior1,
-      ior2,
-      ACE_TRY_ENV
-    );
-
-}
-
-CORBA::ULong POA_TAO_IOP::_tao_collocated_TAO_IOR_Manipulation::get_profile_count  (
-    CORBA::Object_ptr ior,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList
-  ))
-{
-  return this->servant_->get_profile_count (
-      ior,
-      ACE_TRY_ENV
-    );
-
-}
diff --git a/TAO/tao/IORS.h b/TAO/tao/IORS.h
deleted file mode 100644
index 121b00547a2..00000000000
--- a/TAO/tao/IORS.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#ifndef _TAO_IDL_IORS_H_
-#define _TAO_IDL_IORS_H_
-
-#include "tao/IORC.h"
-#include "tao/Servant_Base.h"
-
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-TAO_NAMESPACE  POA_TAO_IOP
-{
-  class TAO_IOR_Manipulation;
-  typedef TAO_IOR_Manipulation *TAO_IOR_Manipulation_ptr;
-  class  TAO_IOR_Manipulation :  public virtual TAO_Local_ServantBase
-  {
-  protected:
-    TAO_IOR_Manipulation (void);
-
-  public:
-    TAO_IOR_Manipulation (const TAO_IOR_Manipulation& rhs);
-    virtual ~TAO_IOR_Manipulation (void);
-
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    TAO_IOP::TAO_IOR_Manipulation *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-
-    virtual void* _create_collocated_objref(const char *repository_id,
-                                            CORBA::ULong type,
-                                            TAO_Stub *sobj);
-
-        virtual CORBA::Object_ptr merge_iors (
-        const TAO_IOP::TAO_IOR_Manipulation::IORList & iors,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-      )) = 0;
-
-    virtual CORBA::Object_ptr add_profiles (
-        CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-      )) = 0;
-
-    virtual CORBA::Object_ptr remove_profiles (
-        CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::NotFound
-      )) = 0;
-
-    virtual CORBA::ULong is_in_ior (
-        CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::NotFound
-      )) = 0;
-
-    virtual CORBA::ULong get_profile_count (
-        CORBA::Object_ptr ior,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList
-      )) = 0;
-
-  };
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___COLLOCATED_SH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION___COLLOCATED_SH_
-
-  class  _tao_collocated_TAO_IOR_Manipulation     : public virtual TAO_IOP::TAO_IOR_Manipulation
-  {
-  public:
-    _tao_collocated_TAO_IOR_Manipulation (
-        TAO_IOR_Manipulation_ptr  servant,
-        TAO_Stub *stub
-      );
-    TAO_IOR_Manipulation_ptr _get_servant (void) const;
-        virtual CORBA::Object_ptr merge_iors (
-        const TAO_IOP::TAO_IOR_Manipulation::IORList & iors,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-      ));
-
-    virtual CORBA::Object_ptr add_profiles (
-        CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::Duplicate,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-      ));
-
-    virtual CORBA::Object_ptr remove_profiles (
-        CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
-        TAO_IOP::TAO_IOR_Manipulation::NotFound
-      ));
-
-    virtual CORBA::ULong is_in_ior (
-        CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::NotFound
-      ));
-
-    virtual CORBA::ULong get_profile_count (
-        CORBA::Object_ptr ior,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList
-      ));
-
-
-  private:
-    TAO_IOR_Manipulation_ptr servant_;
-  };
-
-};
-
-#endif /* end #if !defined */
-
-
-#if defined (__ACE_INLINE__)
-#include "IORS.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* ifndef */
diff --git a/TAO/tao/IORS.i b/TAO/tao/IORS.i
deleted file mode 100644
index afa59bb09dc..00000000000
--- a/TAO/tao/IORS.i
+++ /dev/null
@@ -1,10 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
diff --git a/TAO/tao/IOR_LookupTable.cpp b/TAO/tao/IOR_LookupTable.cpp
deleted file mode 100644
index 1fb3bbe9296..00000000000
--- a/TAO/tao/IOR_LookupTable.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-// $Id$
-
-#include "tao/IOR_LookupTable.h"
-#include "tao/debug.h"
-
-ACE_RCSID(tao, IOR_TableLookup, "$Id$")
-
-  // = Initialization and termination methods.
-TAO_IOR_LookupTable::TAO_IOR_LookupTable (void)
-{
-}
-
-TAO_IOR_LookupTable::~TAO_IOR_LookupTable (void)
-{
-}
-
-int
-TAO_IOR_LookupTable::init (void)
-{
-  // This creates and initialises the table.
-  // Currently works on the hash map manager.
-
-return 0;
-}
-
-int
-TAO_IOR_LookupTable::add_ior (const ACE_CString &object_name,
-                              const ACE_CString &ior)
-{
-  // Make an entry in the table.
-  switch (this->hash_map_.bind (object_name, ior))
-    {
-    case 1 : // object name already exists in the table.
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) Object Name already exists in the IOR table\n"));
-      return 1;
-    case -1 : // Failure.
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) Unable to bind in IOR tao\n"));
-      return -1;
-    }
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO (%P|%t) IOR Table: <%s> -> <%s>\n",
-                object_name.c_str (),
-                ior.c_str ()));
-
-  return 0;
-}
-
-int
-TAO_IOR_LookupTable::find_ior (const ACE_CString &object_name,
-                               ACE_CString &ior)
-{
-  // Find the IOR corresponding to the object name.
-  // returns 0 on success.
-  //        -1 on failure.
-
-  // @@ This debugging output should *NOT* be used since the
-  //    object key string is not null terminated, nor can it
-  //    be null terminated without copying.  No copying should 
-  //    be done since performance is somewhat important here.
-  //    So, just remove the debugging output entirely.
-  //
-  //   if (TAO_debug_level > 0)
-  //     ACE_DEBUG ((LM_DEBUG,
-  //                 "TAO (%P|%t) IOR Table find <%s>\n",
-  //                 object_name.c_str ()));
-
-  return this->hash_map_.find (object_name, ior);
-
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Hash_Map_Manager<ACE_CString, ACE_CString, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator<ACE_CString,ACE_CString,ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<ACE_CString, ACE_CString>;
-template class ACE_Hash_Map_Reverse_Iterator<ACE_CString, ACE_CString, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Manager<ACE_CString,ACE_CString,ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString,ACE_CString,ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, ACE_CString>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString, ACE_CString, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/IOR_LookupTable.h b/TAO/tao/IOR_LookupTable.h
deleted file mode 100644
index 73da0738ada..00000000000
--- a/TAO/tao/IOR_LookupTable.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs
-//
-// = FILENAME
-//   IOR_LookupTable.h
-//
-// = DESCRIPTION
-//   Contains the class that defines the IOR lookup table.
-//
-// = AUTHOR
-//   Vishal Kachroo.
-//
-// ============================================================================
-
-#ifndef TAO_IOR_LOOKUPTABLE_H
-#define TAO_IOR_LOOKUPTABLE_H
-
-#include "ace/Synch_T.h"
-#include "ace/Hash_Map_Manager.h"
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_Export TAO_IOR_LookupTable
-{
-  
-  //   Represents a table for the IOR lookups, given the object keys. A
-  //   Hash_Map_Manager is being used currently for the table. This
-  //   could be changed/added-on-to by other data structures like a file
-  //   etc. This class is going to be used as a backing store by the
-  //   resolve initial references. IOR_Multicast will be responsible for
-  //   initialising this class.
-
-public:
-  // = Initialization and termination methods.
-  TAO_IOR_LookupTable (void);
-  // Constructor.
-
-  ~TAO_IOR_LookupTable (void);
-  // Destructor.
-
-  int init (void);
-  // This creates and initialises the table.
-  // Currently, the hash map manager.
-
-  int add_ior (const ACE_CString &object_name,
-               const ACE_CString &ior);
-  // Associate <object_name> with <ior>.  If <object_name> is already in the
-  // map then the <ACE_Hash_Map_Entry> is not changed.  Returns 0 if a
-  // new IOR is bound successfully, returns 1 if an attempt is made
-  // to bind an existing object_name, and returns -1 if failures occur.
-
-  int find_ior (const ACE_CString &object_name,
-                ACE_CString &ior);
-  // Locate <object_name> and pass out parameter via <ior>.  If the IOR is
-  // found, return 0. Return -1 if not found.
-
-private:
-
-  ACE_Hash_Map_Manager<ACE_CString,
-    ACE_CString,
-    ACE_Null_Mutex> hash_map_;
-  // Maintains the table of object_names -> IORs.
-};
-
-#endif /* TAO_IOR_LOOKUPTABLE_H */
-
diff --git a/TAO/tao/InconsistentTypeCode.pidl b/TAO/tao/InconsistentTypeCode.pidl
deleted file mode 100644
index d4ae99d1619..00000000000
--- a/TAO/tao/InconsistentTypeCode.pidl
+++ /dev/null
@@ -1,27 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    InconsistentTypeCode.pidl
-//
-// = DESCRIPTION
-//    ORB exception thrown by the ORB Dynamic Any factory functions
-//
-// = AUTHOR
-//    OMG 
-//
-// ============================================================================
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  interface ORB {
-    // The exception thrown by the ORB Dynamic Any factory functions
-    exception InconsistentTypeCode {};
-  };
-};
diff --git a/TAO/tao/InconsistentTypeCodeC.cpp b/TAO/tao/InconsistentTypeCodeC.cpp
deleted file mode 100644
index a876b606ba3..00000000000
--- a/TAO/tao/InconsistentTypeCodeC.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ======================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    InconsistentTypeCode.cpp
-//
-// = AUTHOR
-//
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-//
-//
-// Modified by Jeff Parsons <jp4@cs.wustl.edu>
-//
-// ======================================================================
-
-#include "tao/InconsistentTypeCodeC.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#include "tao/ORB.h"
-
-ACE_RCSID(tao, InconsistentTypeCodeC, "$Id$")
-
-// default constructor
-CORBA_ORB_InconsistentTypeCode::CORBA_ORB_InconsistentTypeCode (void)
-  : CORBA_UserException (CORBA::ORB::_tc_InconsistentTypeCode)
-{
-}
-
-// destructor - all members are of self managing types
-CORBA_ORB_InconsistentTypeCode::~CORBA_ORB_InconsistentTypeCode (void)
-{
-}
-
-// copy constructor
-CORBA_ORB_InconsistentTypeCode::CORBA_ORB_InconsistentTypeCode (
-    const CORBA_ORB_InconsistentTypeCode &_tao_excp
-  )
-  : CORBA_UserException (_tao_excp._type ())
-{
-}
-
-// assignment operator
-CORBA_ORB_InconsistentTypeCode&
-CORBA_ORB_InconsistentTypeCode::operator= (
-    const CORBA_ORB_InconsistentTypeCode &_tao_excp
-  )
-{
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-// narrow
-CORBA_ORB_InconsistentTypeCode*
-CORBA_ORB_InconsistentTypeCode::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/ORB/InconsistentTypeCode:1.0",
-                       exc->_id ())) // same type
-    return ACE_dynamic_cast (CORBA_ORB_InconsistentTypeCode*,
-                             exc);
-  else
-    return 0;
-}
-
-
-void CORBA_ORB_InconsistentTypeCode::_raise ()
-{
-  TAO_RAISE(*this);
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *CORBA_ORB_InconsistentTypeCode::_alloc (void)
-{
-  return new CORBA_ORB_InconsistentTypeCode;
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/InconsistentTypeCodeC.h b/TAO/tao/InconsistentTypeCodeC.h
deleted file mode 100644
index dcdcf0b9865..00000000000
--- a/TAO/tao/InconsistentTypeCodeC.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    InconsistentTypeCode.h
-//
-// = AUTHOR
-//
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-//
-// Modified by Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_IDL_INCONSISTENTTYPECODEC_H
-#define TAO_IDL_INCONSISTENTTYPECODEC_H
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#include "tao/Exception.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if !defined (_CORBA_ORB_INCONSISTENTTYPECODE_CH_)
-#define _CORBA_ORB_INCONSISTENTTYPECODE_CH_
-
-class TAO_Export CORBA_ORB_InconsistentTypeCode : public CORBA::UserException
-{
-  // = TITLE
-  //   Exception class generated by the TAO IDL compiler.
-  //
-  // = DESCRIPTION
-  //   This exception is thrown in the ORB create_dyn_any(TypeCode) factory
-  //   function if the typecode argument is neither a basic type nor a
-  //   sequence, enum, array, struct or union.
-public:
-  CORBA_ORB_InconsistentTypeCode (void);
-  // default ctor
-  CORBA_ORB_InconsistentTypeCode (const CORBA_ORB_InconsistentTypeCode &);
-  // copy ctor
-  ~CORBA_ORB_InconsistentTypeCode (void);
-  // dtor
-
-  CORBA_ORB_InconsistentTypeCode &operator= (const CORBA_ORB_InconsistentTypeCode &);
-
-  virtual void _raise (void);
-
-  static CORBA_ORB_InconsistentTypeCode *_narrow (CORBA::Exception *);
-
-  // = TAO extension
-  static CORBA::Exception *_alloc (void);
-
-};
-
-#endif /* end #if !defined */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#endif /* TAO_IDL_INCONSISTENTTYPECODEC_H */
diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp
deleted file mode 100644
index 7b1e280ed0e..00000000000
--- a/TAO/tao/Invocation.cpp
+++ /dev/null
@@ -1,917 +0,0 @@
-// $Id$
-
-#include "tao/Invocation.h"
-#include "tao/Stub.h"
-#include "tao/Principal.h"
-
-#include "tao/Timeprobe.h"
-#include "tao/Object_KeyC.h"
-#include "tao/debug.h"
-#include "tao/Pluggable.h"
-#include "tao/Connector_Registry.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Invocation.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, Invocation, "$Id$")
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-
-static const char *TAO_Invocation_Timeprobe_Description[] =
-  {
-    "GIOP_Invocation::invoke - start",
-    "GIOP_Invocation::invoke - end",
-
-    "GIOP_Invocation::start - enter",
-    "GIOP_Invocation::start - leave",
-    "GIOP_Invocation::start - connect",
-    "GIOP_Invocation::start - start_msg"
-  };
-
-enum
-  {
-    TAO_GIOP_INVOCATION_INVOKE_START = 1000,
-    TAO_GIOP_INVOCATION_INVOKE_END,
-
-    TAO_GIOP_INVOCATION_START_ENTER,
-    TAO_GIOP_INVOCATION_START_LEAVE,
-    TAO_GIOP_INVOCATION_START_CONNECT,
-    TAO_GIOP_INVOCATION_START_START_MSG
-  };
-
-
-// Setup Timeprobes
-ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Invocation_Timeprobe_Description,
-                                  TAO_GIOP_INVOCATION_INVOKE_START);
-
-#endif /* ACE_ENABLE_TIMEPROBES */
-
-// Normal invocations don't involve any heap al; messages are
-// constructed into stack-based buffers and are read into those
-// buffers too.  Larger buffers are heap-allocated as needed.
-//
-// The constraint on request IDs is that no two requests from the same
-// client with the same ID are outstanding at the same time.  In
-// single threaded environments, this is met by any number whatever.
-// When multiple threads are used, we eliminate the need for any
-// locked state by using the thread ID as the request ID, since any
-// given thread has at most one request outstanding at a time.
-//
-// NOTE: this means that if "deferred synchronous" calls get
-// supported, it's done by creating a thread internally to make the
-// call.  That is less disruptive (and error prone) in general than
-// restructuring an ORB core in terms of asynchrony.
-
-TAO_GIOP_Invocation::TAO_GIOP_Invocation (TAO_Stub *stub,
-                                          const char *operation,
-                                          TAO_ORB_Core* orb_core)
-  : stub_ (stub),
-    opname_ (operation),
-    request_id_ (0),
-    out_stream_ (buffer, sizeof buffer, /* ACE_CDR::DEFAULT_BUFSIZE */
-                 TAO_ENCAP_BYTE_ORDER,
-                 orb_core->output_cdr_buffer_allocator (),
-                 orb_core->output_cdr_dblock_allocator (),
-                 orb_core->orb_params ()->cdr_memcpy_tradeoff (),
-                 orb_core->to_iso8859 (),
-                 orb_core->to_unicode ()),
-    orb_core_ (orb_core),
-    transport_ (0),
-    max_wait_time_ (0)
-{
-}
-
-TAO_GIOP_Invocation::~TAO_GIOP_Invocation (void)
-{
-  if (this->transport_ != 0)
-    this->transport_->idle_after_reply ();
-}
-
-// The public API involves creating an invocation, starting it, filling
-// in request parameters, actually performing the invocation, getting
-// response parameters, and then cleaning up.  Sometimes they must be
-// restarted (e.g. request forwarding).  This is the start/restart entry.
-
-void
-TAO_GIOP_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_FUNCTION_TIMEPROBE (TAO_GIOP_INVOCATION_START_ENTER);
-  TAO_MINIMAL_TIMEPROBE (TAO_GIOP_INVOCATION_START_ENTER);
-
-  // First try to bind to the appropriate address.  We do that here
-  // since we may get forwarded to a different objref in the course of
-  // any given call, with new start () call each time.  It's not
-  // cached in the objref data since the connections change
-  // asynchronously from objref invocations and this simplifies
-  // connection management.
-  // We also need to bind *before* marshalling, because different
-  // Profiles have different ObjectKeys, thus a change of Profile can
-  // result in different alignment for the buffer.
-  //
-  // THREADING NOTE: this connection is reserved to this call.  Also,
-  // starting at this point in the call, new forwarding information
-  // will not be used until/unless the call is reissued.  Correctness
-  // is not affected, the call will just be forwarded later than it
-  // might be in a more complex implementation.
-
-  // @@ assert is evil, it crashes the program, changed to an
-  // exception (coryan)
-  // assert (this->stub_ != 0);
-
-  if (this->stub_ == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  // Get a pointer to the connector registry, which might be in
-  // thread-specific storage, depending on the concurrency model.
-  TAO_Connector_Registry *conn_reg =
-    this->orb_core_->connector_registry ();
-
-  if (conn_reg == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  // @@ It seems like this is the right spot to re-order the profiles
-  // based on the policies in the ORB.
-  // IMHO the connector registry only finds one
-  // connector for the given policies, if the connector is not
-  // available (say the user wants an ATM connection, but we don't
-  // have the protocol) then we give it another profile to try.
-  // So the invocation Object should handle policy decisions.
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-  POA_Messaging::RelativeRoundtripTimeoutPolicy* timeout =
-    this->stub_->relative_roundtrip_timeout ();
-  // If max_wait_time is not zero then this is not the first attempt
-  // to send the request, the timeout value includes *all* those
-  // attempts.
-  if (this->max_wait_time_ == 0
-      && timeout != 0)
-    {
-      TimeBase::TimeT t =
-        timeout->relative_expiry (ACE_TRY_ENV);
-      ACE_CHECK;
-      TimeBase::TimeT seconds = t / 10000000u;
-      TimeBase::TimeT microseconds = t % 10000000u;
-      this->max_wait_time_value_.set (ACE_U64_TO_U32(seconds),
-                                      ACE_U64_TO_U32(microseconds));
-      this->max_wait_time_ = &this->max_wait_time_value_;
-      if (TAO_debug_level > 0)
-        {
-          CORBA::ULong msecs =
-            ACE_static_cast(CORBA::ULong, microseconds / 1000);
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) Timeout is <%u>\n",
-                      msecs));
-        }
-    }
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
-  ACE_Countdown_Time countdown (this->max_wait_time_);
-  // Loop until a connection is established or there aren't any more
-  // profiles to try.
-  for (;;)
-    {
-      // Get the current profile.
-      this->profile_ = this->stub_->profile_in_use ();
-
-      // Get the transport object.
-
-      if (this->transport_ != 0)
-        this->transport_->idle ();
-
-      countdown.update ();
-      int result = conn_reg->connect (this->profile_,
-                                      this->transport_,
-                                      this->max_wait_time_);
-      countdown.update ();
-      if (result == 0)
-        break;
-
-      if (errno == ETIME)
-        {
-          ACE_THROW (CORBA::TIMEOUT (
-              CORBA_SystemException::_tao_minor_code (
-                  TAO_TIMEOUT_CONNECT_MINOR_CODE,
-                  errno),
-              CORBA::COMPLETED_NO));
-        }
-
-      // Try moving to the next profile and starting over, if that
-      // fails then we must raise the TRANSIENT exception.
-      if (this->stub_->next_profile_retry () == 0)
-        ACE_THROW (CORBA::TRANSIENT (
-          CORBA_SystemException::_tao_minor_code (
-            TAO_INVOCATION_CONNECT_MINOR_CODE,
-            errno),
-          CORBA::COMPLETED_NO));
-    }
-
-  // Obtain unique request id from the RMS.
-  this->request_id_ = this->transport_->request_id ();
-
-  countdown.update ();
-}
-
-// Send request.
-int
-TAO_GIOP_Invocation::invoke (CORBA::Boolean is_roundtrip,
-                             CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_Countdown_Time countdown (this->max_wait_time_);
-
-  if (this->transport_ == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (),
-                      TAO_INVOKE_EXCEPTION);
-
-  // @@ Alex: the <is_roundtrip> flag will be tricky when we move to
-  //    AMI: now it is used both to indicate the the CORBA request in
-  //    a twoway and that the send_request() operation should block.
-  //    Even for oneways: with AMI it is possible to wait for a
-  //    response (empty) for oneways, just to make sure that they
-  //    arrive, there are policies to control that.
-  countdown.update ();
-  int result =
-    this->transport_->send_request (this->orb_core_,
-                                    this->out_stream_,
-                                    is_roundtrip,
-                                    this->max_wait_time_);
-  countdown.update ();
-
-  //
-  // @@ highly desirable to know whether we wrote _any_ data; if
-  // we wrote none, then there's no chance the call completed and
-  // applications don't have to deal with those nasty
-  // indeterminate states where they can't immediatly tell if
-  // what's safe to do.
-  //
-  // @@ also, there might have been a GIOP::CloseConnection
-  // message in the input queue.  If so, this request should be
-  // treated as a (full) "rebind" case.  Can't do that from this
-  // point in the code however!  Some minor restructuring needs to
-  // happen.
-  //
-
-  if (result == -1)
-    {
-      if (errno == ETIME)
-        {
-          ACE_THROW_RETURN (CORBA::TIMEOUT (
-              CORBA_SystemException::_tao_minor_code (
-                  TAO_TIMEOUT_SEND_MINOR_CODE,
-                  errno),
-              CORBA::COMPLETED_NO),
-            TAO_INVOKE_EXCEPTION);
-        }
-      this->transport_->close_connection ();
-      this->transport_ = 0;
-
-      this->profile_->reset_hint ();
-
-      return TAO_INVOKE_RESTART;
-    }
-
-  // @@ Maybe the right place to do this is once the reply is
-  //    received? But what about oneways?
-  this->stub_->set_valid_profile ();
-
-  return TAO_INVOKE_OK;
-}
-
-int
-TAO_GIOP_Invocation::close_connection (void)
-{
-  // Special case of forwarding -- server was closing the
-  // connection, which just indicates resource constraints, not an
-  // error.  The client is effectively "forwarded" to the same
-  // server!
-  //
-  // However, we must reinitialize the forwarding chain, since the
-  // resource being reclaimed might also have been the process,
-  // not just the connection.  Without reinitializing, we'd give
-  // false error reports to applications.
-
-  this->transport_->close_connection ();
-  this->transport_->idle ();
-  this->transport_ = 0;
-
-  this->profile_->reset_hint ();
-  this->profile_ = 0;
-
-  // @@ Get rid of any forwarding profiles and reset
-  //    the profile list to point to the first profile!
-  // FRED For now we will not deal with recursive forwards!
-
-  this->stub_->reset_profiles ();
-  // sets the forwarding profile to 0 and deletes the old one;
-  // rewinds the profiles list back to the first one.
-
-  return TAO_INVOKE_RESTART;
-}
-
-// Handle the GIOP Reply with status = LOCATION_FORWARD
-// Replace the IIOP Profile. The call is then automatically
-// reinvoked by the TAO_Stub::do_static_call method.
-
-int
-TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream,
-                                       CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // It can be assumed that the GIOP header and the reply header
-  // are already handled. Further it can be assumed that the
-  // reply body contains an object reference to the new object.
-  // This object pointer will be now extracted.
-
-  CORBA::Object_var object = 0;
-
-  if ( (inp_stream >> object.inout ()) == 0)
-    {
-      // @@ Why whould we want to close this connection?
-      //    this->transport_->close_connection ();
-
-      // @@ If a forward exception or a LOCATION_FORWARD reply is sent
-      //    then the request couldn't have completed. But we need to
-      //    re-validate this to ensure "at most once" semantics.
-      ACE_THROW_RETURN (CORBA::MARSHAL (),
-                        TAO_INVOKE_EXCEPTION);
-    }
-
-  // The object pointer has to be changed to a TAO_Stub pointer
-  // in order to extract the profile.
-
-  TAO_Stub *stubobj = object->_stubobj ();
-
-  if (stubobj == 0)
-    {
-      // @@ Why whould we want to close this connection?
-      //    this->transport_->close_connection ();
-
-      // @@ If a forward exception or a LOCATION_FORWARD reply is sent
-      //    then the request couldn't have completed. But we need to
-      //    re-validate this to ensure "at most once" semantics.
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        TAO_INVOKE_EXCEPTION);
-    }
-
-  // Make a copy of the IIOP profile in the forwarded objref,
-  // reusing memory where practical.  Then delete the forwarded
-  // objref, retaining only its profile list (mprofiles).
-  //
-  // @@ add and use a "forward count", to prevent loss of data
-  // in forwarding chains during concurrent calls -- only a
-  // forward that's a response to the current forward_profile should
-  // be recorded here. (This is just an optimization, and is not
-  // related to correctness.)
-
-  // New for Multiple profile.  Get the MProfile list from the
-  // forwarded object refererence
-
-  this->stub_->add_forward_profiles (*stubobj->get_profiles ());
-  // store the new profile list and set the first forwarding profile
-  // note: this has to be and is thread safe.  Also get_profiles returns
-  // a pointer to a new MProfile object which we give to our
-  // TAO_Stub.
-
-  // @@ Why do we clear the environment?
-  // ACE_TRY_ENV.clear ();
-
-  // We may not need to do this since TAO_GIOP_Invocations
-  // get created on a per-call basis. For now we'll play it safe.
-
-  if (this->stub_->next_profile () == 0)
-    ACE_THROW_RETURN (CORBA::TRANSIENT (
-      CORBA_SystemException::_tao_minor_code (
-        TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE,
-        errno),
-      CORBA::COMPLETED_NO),
-      TAO_INVOKE_EXCEPTION);
-
-  return TAO_INVOKE_RESTART;
-}
-
-// ****************************************************************
-
-void
-TAO_GIOP_Twoway_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->TAO_GIOP_Invocation::start (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->transport_->start_request (this->orb_core_,
-                                   this->profile_,
-                                   this->opname_,
-                                   this->request_id_,
-                                   1,
-                                   this->out_stream_,
-                                   ACE_TRY_ENV);
-}
-
-int
-TAO_GIOP_Twoway_Invocation::invoke (CORBA::ExceptionList &exceptions,
-                                    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,CORBA::UnknownUserException))
-{
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_GIOP_INVOCATION_INVOKE_START);
-
-  int retval = this->invoke_i (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  // A TAO_INVOKE_EXCEPTION status, but no exception raised means that
-  // we have a user exception.
-  // @@ This is a bit brittle, think about a better implementation.
-  if (retval == TAO_INVOKE_EXCEPTION)
-    {
-      // Match the exception interface repository id with the
-      // exception in the exception list.
-      // This is important to decode the exception.
-
-      CORBA::String_var buf;
-
-      // Pull the exception ID out of the marshaling buffer.
-      if (this->inp_stream ().read_string (buf.inout ()) == 0)
-        {
-          // @@ Why do we close the connection. Only the request
-          //    failed, but the connection seems to be still
-          //    valid!
-          // this->transport_->close_connection ();
-          ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                            CORBA::COMPLETED_YES),
-                            TAO_INVOKE_EXCEPTION);
-        }
-
-      for (CORBA::ULong i = 0;
-           i < exceptions.count ();
-           i++)
-        {
-          CORBA::TypeCode_ptr tcp = exceptions.item (i, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION);
-
-          const char *xid = tcp->id (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION);
-
-          if (ACE_OS::strcmp (buf.in (), xid) != 0)
-            continue;
-
-          // @@ In the old days the exceptions where catched and the
-          // connection was closed, that doesn't make any sense:
-          // this is a client side problem, for one particular
-          // request.
-          // this->transport_->close_connection ();
-          // ACE_RETHROW;
-
-          const ACE_Message_Block* cdr =
-            this->inp_stream ().start ();
-          CORBA_Any any (tcp, 0, cdr);
-          CORBA_Exception *exception;
-          ACE_NEW_THROW_EX (exception,
-                            CORBA_UnknownUserException (any),
-                            CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
-                                              CORBA::COMPLETED_YES));
-          ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION);
-
-          // @@ Think about a better way to raise the exception here,
-          //    maybe we need some more macros?
-          ACE_TRY_ENV.exception (exception);  // We can not use ACE_THROW here.
-          return TAO_INVOKE_EXCEPTION;
-        }
-
-      // If we couldn't find the right exception, report it as
-      // CORBA::UNKNOWN.
-
-      // @@ It would seem like if the remote exception is a
-      //    UserException we can assume that the request was
-      //    completed.
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE,
-                                        CORBA::COMPLETED_YES),
-                        TAO_INVOKE_EXCEPTION);
-    }
-
-  return retval;
-}
-
-// Send request, block until any reply comes back, and unmarshal reply
-// parameters as appropriate.
-//
-// This is used by the generated stubs.
-
-int
-TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts,
-                                    CORBA::ULong except_count,
-                                    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::Exception))
-{
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_GIOP_INVOCATION_INVOKE_START);
-
-  int retval = this->invoke_i (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  // A TAO_INVOKE_EXCEPTION status, but no exception raised means that
-  // we have a user exception.
-  // @@ This is a bit brittle, think about a better implementation.
-  if (retval == TAO_INVOKE_EXCEPTION)
-    {
-      // Match the exception interface repository id with the
-      // exception in the exception list.
-      // This is important to decode the exception.
-
-      CORBA::String_var buf;
-
-      // Pull the exception ID out of the marshaling buffer.
-      if (this->inp_stream ().read_string (buf.inout ()) == 0)
-        {
-          // @@ Why do we close the connection. Only the request
-          //    failed, but the connection seems to be still
-          //    valid!
-          // this->transport_->close_connection ();
-          ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                            CORBA::COMPLETED_YES),
-                            TAO_INVOKE_EXCEPTION);
-        }
-
-      for (CORBA::ULong i = 0;
-           i < except_count;
-           i++)
-        {
-          CORBA::TypeCode_ptr tcp = excepts[i].tc;
-          const char *xid = tcp->id (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION);
-
-          if (ACE_OS::strcmp (buf.in (), xid) != 0)
-            continue;
-
-          // match
-          CORBA::Exception_ptr exception = excepts[i].alloc ();
-
-          if (exception == 0)
-            ACE_THROW_RETURN (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
-                                                CORBA::COMPLETED_YES),
-                              TAO_INVOKE_EXCEPTION);
-
-          this->inp_stream ().decode (exception->_type (),
-                                      exception, 0,
-                                      ACE_TRY_ENV);
-          ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION);
-
-          if (TAO_debug_level > 5)
-            ACE_DEBUG ((LM_DEBUG,
-                        "TAO: (%P|%t) Raising exception %s\n",
-                        buf.in ()));
-
-          // @@ Think about a better way to raise the exception here,
-          //    maybe we need some more macros?
-          ACE_TRY_ENV.exception (exception); // We can not use ACE_THROW here.
-          return TAO_INVOKE_EXCEPTION;
-        }
-
-      // If we couldn't find the right exception, report it as
-      // CORBA::UNKNOWN.
-
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE,
-                                        CORBA::COMPLETED_YES),
-                        TAO_INVOKE_EXCEPTION);
-    }
-
-  return retval;
-}
-
-int
-TAO_GIOP_Twoway_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Register a reply dispatcher for this invocation. Use the
-  // preallocated reply dispatcher.
-
-  // Bind.
-  int retval = this->transport_->bind_reply_dispatcher (this->request_id_,
-                                                        &this->rd_);
-  if (retval == -1)
-    {
-      // @@ What is the right way to handle this error?
-      this->close_connection ();
-      ACE_THROW_RETURN (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE,
-                                         CORBA::COMPLETED_NO),
-                        TAO_INVOKE_EXCEPTION);
-    }
-
-  // Just send the request, without trying to wait for the reply.
-  retval = TAO_GIOP_Invocation::invoke (1, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (retval != TAO_INVOKE_OK)
-    return retval;
-
-  // This blocks until the response is read.  In the current version,
-  // there is only one client thread that ever uses this connection,
-  // so most response messages are illegal.
-  //
-  // @@ In all MT environments, there's a cancellation point lurking
-  // here; need to investigate.  Client threads would frequently be
-  // canceled sometime during recv_request ... the correct action to
-  // take on being canceled is to issue a CancelRequest message to the
-  // server and then imediately let other client-side cancellation
-  // handlers do their jobs.
-  //
-  // In C++, that basically means to unwind the stack using almost
-  // normal procedures: all destructors should fire, and some "catch"
-  // blocks should probably be able to handle things like releasing
-  // pointers. (Without unwinding the C++ stack, resources that must
-  // be freed by thread cancellation won't be freed, and the process
-  // won't continue to function correctly.)  The tricky part is that
-  // according to POSIX, all C stack frames must also have their
-  // (explicitly coded) handlers called.  We assume a POSIX.1c/C/C++
-  // environment.
-
-  // Get the reply status.
-
-  // Wait for the reply.
-
-  if (TAO_debug_level > 0 && this->max_wait_time_ != 0)
-    {
-      CORBA::ULong msecs =
-        this->max_wait_time_->msec ();
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) Timeout on recv is <%u>\n",
-                  msecs));
-    }
-
-  int reply_error =
-    this->transport_->wait_for_reply (this->max_wait_time_);
-
-  // Do the wait loop till we receive the reply for this invocation.
-  // while (reply_error != -1 && 
-  //        this->transport_->reply_received (this->request_id_) != 1)
-  //   {
-  //     // @@ Hack to init the Leader-Follower state, so that we can
-  //     //    wait again. (Alex).
-  //     // this->transport_->wait_strategy ()->sending_request (this->orb_core_,
-  //     //                                                  1);
-  //     
-  //     // Wait for reply.
-  //     reply_error = this->transport_->wait_for_reply ();
-  //   }
-
-  if (TAO_debug_level > 0 && this->max_wait_time_ != 0)
-    {
-      CORBA::ULong msecs =
-        this->max_wait_time_->msec ();
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) Timeout after recv is <%u> status <%d>\n",
-                  msecs, reply_error));
-    }
-
-  // Check the reply error.
-
-  if (reply_error == -1)
-    {
-      if (errno == ETIME)
-        {
-          // Just a timeout, don't close the connection or
-          // anything...
-          ACE_THROW_RETURN (CORBA::TIMEOUT (
-              CORBA_SystemException::_tao_minor_code (
-                  TAO_TIMEOUT_SEND_MINOR_CODE,
-                  errno),
-              CORBA::COMPLETED_NO),
-            TAO_INVOKE_EXCEPTION);
-        }
-
-      this->close_connection ();
-      ACE_THROW_RETURN (CORBA::COMM_FAILURE (
-          CORBA_SystemException::_tao_minor_code (
-            TAO_INVOCATION_RECV_REQUEST_MINOR_CODE,
-            errno),
-          CORBA::COMPLETED_MAYBE),
-        TAO_INVOKE_EXCEPTION);
-    }
-
-  // @@ Alex: the old version of this had some error handling code,
-  //    like:  this->profile_->reset_hint ()
-  //    Can you make sure we don't forget to do that on exceptions
-  //    and/or errors.
-  //    BTW, think about native exceptions where if the exception is
-  //    raised in the wait_for_reply() method you won't get a chance
-  //    to do that kind of error handling.  Do you really need
-  //    exceptions in the transport objects?
-
-  CORBA::ULong reply_status = this->rd_.reply_status ();
-
-  switch (reply_status)
-    {
-    case TAO_GIOP_NO_EXCEPTION:
-      // Return so that the STUB can demarshal the reply.
-      return TAO_INVOKE_OK;
-      // NOT REACHED.
-
-    case TAO_GIOP_USER_EXCEPTION:
-      // Return so that the STUB can demarshal the user exception.
-      return TAO_INVOKE_EXCEPTION;
-      // NOTREACHED.
-
-    case TAO_GIOP_SYSTEM_EXCEPTION:
-      {
-        // @@ Add the location macros for this exceptions...
-
-        CORBA::String_var type_id;
-        if ((this->inp_stream () >> type_id.inout ()) == 0)
-          {
-            // Could not demarshal the exception id, raise an local
-            // CORBA::MARSHAL
-            ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                              CORBA::COMPLETED_MAYBE),
-                              TAO_INVOKE_OK);
-          }
-        CORBA::ULong minor = 0;
-        CORBA::ULong completion = 0;
-        if ((this->inp_stream () >> minor) == 0
-            || (this->inp_stream () >> completion) == 0)
-          ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                            CORBA::COMPLETED_MAYBE),
-                            TAO_INVOKE_OK);
-
-        CORBA::SystemException* ex =
-          TAO_Exceptions::create_system_exception (type_id.in (),
-                                                   ACE_TRY_ENV);
-        ACE_CHECK_RETURN (TAO_INVOKE_OK);
-
-        if (ex == 0)
-          {
-            // @@ We should raise a CORBA::NO_MEMORY, but we ran out
-            //    of memory already. We need a pre-allocated, TSS,
-            //    CORBA::NO_MEMORY instance
-            ACE_NEW_RETURN (ex, CORBA::UNKNOWN, TAO_INVOKE_EXCEPTION);
-          }
-        ex->minor (minor);
-        ex->completed (CORBA::CompletionStatus (completion));
-
-
-        // @@ There should be a better way to raise this exception!
-        //    This code works for both native and emulated exceptions,
-        //    but it is ugly.
-        ACE_TRY_ENV.exception (ex); // We can not use ACE_THROW here.
-        return TAO_INVOKE_OK;
-      }
-      // NOTREACHED.
-
-    case TAO_GIOP_LOCATION_FORWARD:
-      // Handle the forwarding and return so the stub restarts the
-      // request!
-      return this->location_forward (this->inp_stream (), ACE_TRY_ENV);
-      // NOT REACHED.
-    }
-
-  return TAO_INVOKE_OK;
-}
-
-// ****************************************************************
-
-void
-TAO_GIOP_Oneway_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->TAO_GIOP_Invocation::start (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->transport_->start_request (this->orb_core_,
-                                   this->profile_,
-                                   this->opname_,
-                                   this->request_id_,
-                                   0,
-                                   this->out_stream_,
-                                   ACE_TRY_ENV);
-}
-
-// ****************************************************************
-
-// Send request, block until any reply comes back. 
-void
-TAO_GIOP_Locate_Request_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->TAO_GIOP_Invocation::start (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->transport_->start_locate (this->orb_core_,
-                                  this->profile_,
-                                  this->request_id_,
-                                  this->out_stream_,
-                                  ACE_TRY_ENV);
-}
-
-int
-TAO_GIOP_Locate_Request_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // @@ TODO This method is very similar to invoke_i(), we should try
-  //    to refactor them.
-
-  if (this->transport_ == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (),
-                      TAO_INVOKE_EXCEPTION);
-
-  // Register a reply dispatcher for this invocation. Use the
-  // preallocated reply dispatcher.
-
-  // Bind.
-  int retval = this->transport_->bind_reply_dispatcher (this->request_id_,
-                                                        &this->rd_);
-  if (retval == -1)
-    {
-      // @@ What is the right way to handle this error?
-      this->close_connection ();
-      ACE_THROW_RETURN (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE,
-                                         CORBA::COMPLETED_NO),
-                        TAO_INVOKE_EXCEPTION);
-    }
-
-  int result =
-    this->transport_->send_request (this->orb_core_,
-                                    this->out_stream_,
-                                    1,
-                                    this->max_wait_time_);
-
-
-  if (result == -1)
-    {
-      this->transport_->close_connection ();
-      this->transport_ = 0;
-
-      this->profile_->reset_hint ();
-
-      // @@ This code abort if the connection for the currenct profile
-      //    fails.  Should we transparently try new profiles until one
-      //    works? Or is that something that a higher level component
-      //    should decide?  Remember that LocateRequests are part of
-      //    the strategy to establish a connection.
-      ACE_THROW_RETURN (CORBA::TRANSIENT (
-        CORBA_SystemException::_tao_minor_code (
-          TAO_INVOCATION_SEND_REQUEST_MINOR_CODE,
-          errno),
-        CORBA::COMPLETED_MAYBE),
-        TAO_INVOKE_EXCEPTION);
-    }
-
-  // @@ Maybe the right place to do this is once the reply is
-  //    received? But what about oneways?
-  this->stub_->set_valid_profile ();
-
-  // Wait for the reply.
-
-  int reply_error =
-    this->transport_->wait_for_reply (this->max_wait_time_);
-
-  //   // Do the wait loop, till we receive the reply for this invocation. 
-  //   while (reply_error != -1 && 
-  //          this->transport_->reply_received (this->request_id_) != 1)
-  //     {
-  //       reply_error = this->transport_->wait_for_reply ();
-  //     }
-  
-  // Check the reply error.
-  if (reply_error == -1)
-    {
-      if (errno == ETIME)
-        {
-          // Just a timeout, don't close the connection or
-          // anything...
-          ACE_THROW_RETURN (CORBA::TIMEOUT (
-              CORBA_SystemException::_tao_minor_code (
-                  TAO_TIMEOUT_SEND_MINOR_CODE,
-                  errno),
-              CORBA::COMPLETED_NO),
-            TAO_INVOKE_EXCEPTION);
-        }
-
-      this->close_connection ();
-      ACE_THROW_RETURN (CORBA::COMM_FAILURE (TAO_DEFAULT_MINOR_CODE,
-                                             CORBA::COMPLETED_MAYBE),
-                        TAO_INVOKE_EXCEPTION);
-    }
-
-  CORBA::ULong locate_status = this->rd_.reply_status ();
-  switch (locate_status)
-    {
-    case TAO_GIOP_OBJECT_HERE:
-      break;
-
-    case TAO_GIOP_UNKNOWN_OBJECT:
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (TAO_DEFAULT_MINOR_CODE,
-                                                 CORBA::COMPLETED_YES),
-                        TAO_INVOKE_EXCEPTION);
-      // NOTREACHED
-
-    case TAO_GIOP_OBJECT_FORWARD:
-      return this->location_forward (this->inp_stream (), ACE_TRY_ENV);
-      // NOTREACHED
-    }
-
-  return TAO_INVOKE_OK;
-}
-
-// ****************************************************************
-
-#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/Invocation.h b/TAO/tao/Invocation.h
deleted file mode 100644
index 5ea132a7bd4..00000000000
--- a/TAO/tao/Invocation.h
+++ /dev/null
@@ -1,286 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Invocation.h
-//
-// = DESCRIPTION
-//    Encapsulate the logic for remote invocations, oneways or
-//    twoways.
-//
-//   THREADING NOTE: Threads should never manipulate another
-//   thread's invocations.  In this implementation, all data
-//   structures used to represent invocations (and parts of them)
-//   are owned by the thread which created them.  Multiple threads
-//   may make of course concurrent invocations safely, since the
-//   GIOP code is reentrant.
-//
-// = AUTHOR
-//    Carlos O'Ryan <coryan@cs.wustl.edu> and Alexander Babu Arulanthu
-//    <alex@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_INVOCATION_H
-#define TAO_INVOCATION_H
-
-#include "tao/CDR.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/ORB_Core.h"
-#include "tao/GIOP.h"
-#include "tao/Any.h"
-#include "tao/Reply_Dispatcher.h"
-
-struct TAO_Exception_Data;
-class TAO_Profile;
-class TAO_Transport;
-
-enum TAO_Invoke_Status
-{
-  TAO_INVOKE_OK,
-  // invoke() call successful.
-
-  TAO_INVOKE_RESTART,
-  // The request must be restarted, a temporary failure has ocurred.
-
-  TAO_INVOKE_EXCEPTION
-  // An exception was raised.
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_GIOP_Invocation
-{
-  // = TITLE
-  //     Encapsulates common behavior for both oneway and twoway
-  //     invocations.
-  //
-  // = DESCRIPTION
-  //     This class connects (or lookups a connection from the cache)
-  //     to the remote server, builds the CDR stream for the Request,
-  //     send the CDR stream and expects the response and interprets
-  //     the incoming CDR stream.
-
-public:
-  TAO_GIOP_Invocation (TAO_Stub *data,
-                       const char *operation,
-                       TAO_ORB_Core* orb_core);
-  // Constructor.
-
-  ~TAO_GIOP_Invocation (void);
-  // Destructor.
-
-  void put_param (CORBA::TypeCode_ptr tc,
-                  void *value,
-                  CORBA_Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
-  // Encodes the value into the undelying CDR stream based on the
-  // TypeCode parameter.
-
-  TAO_OutputCDR &out_stream (void);
-  // Return the underlying output stream.
-
-protected:
-  void start (CORBA_Environment &ACE_TRY_ENV =
-                    TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Establishes a connection to the remote server, initializes
-  // the GIOP and Request headers in the output CDR.
-  // The <message_size> field of the GIOP header is left blank and
-  // must be filled later.
-  // The function only returns once a connection has been succesfully
-  // established *OR* all profiles have been tried.  In that case it
-  // raises the CORBA::TRANSIENT exception.
-
-  int invoke (CORBA::Boolean is_roundtrip,
-              CORBA_Environment &ACE_TRY_ENV =
-                    TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Sends the request, does not wait for the response.
-  // Returns TAO_INVOKE_RESTART if the write call failed and the
-  // request must be re-attempted.
-  // Notice that the same profile is tried again because it may be
-  // that the server closed the connection simply to release
-  // resources.
-
-  int close_connection (void);
-  // resets the forwarding profile and behaves like we are fowarded
-  // (to the same server)
-
-  int location_forward (TAO_InputCDR &inp_stream,
-                        CORBA_Environment &ACE_TRY_ENV =
-                              TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Helper method, the response for a Request or LocateRequest was a
-  // LOCATION_FORWARD or TAO_GIOP_OBJECT_FORWARD.
-  // In any case we must demarshal the object reference and setup the
-  // profiles.
-  // It returns TAO_INVOKE_RESTART unless an exception is raised.
-
-protected:
-  TAO_Stub *stub_;
-  // The object on which this invocation is going.
-
-  const char *opname_;
-  // Name of the operation being invoked.
-
-  CORBA::ULong request_id_;
-  // Request ID of this operation.
-
-  char buffer [ACE_CDR::DEFAULT_BUFSIZE];
-  // Buffer used for both the output and input CDR streams, this is
-  // "safe" because we only one of the streams at a time.
-
-  TAO_OutputCDR out_stream_;
-  // Stream into which the response is placed.
-
-  TAO_ORB_Core* orb_core_;
-  // The orb_core context where we make this invocation.
-
-  TAO_Transport *transport_;
-  // This invocation is using this transport, may change...
-
-  TAO_Profile *profile_;
-  // This invocation is using this transport, may change...
-
-  ACE_Time_Value max_wait_time_value_;
-  ACE_Time_Value *max_wait_time_;
-  // The timeout remaining for this request, it is initialized in
-  // start() and updated as required.
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_GIOP_Twoway_Invocation : public TAO_GIOP_Invocation
-{
-  // = TITLE
-  //   Sends a two-way request, and expects the reply.
-  //
-  // = DESCRIPTION
-  //   This class connects (or lookups a connection from the cache) to
-  //   the remote server, builds the CDR stream for the Request, send
-  //   the CDR stream and expects the response and interprets the
-  //   incoming CDR stream.
-  //
-public:
-  TAO_GIOP_Twoway_Invocation (TAO_Stub *data,
-                              const char *operation,
-                              TAO_ORB_Core* orb_core);
-  // Constructor.
-
-  void start (CORBA_Environment &TAO_IN_ENV =
-                    TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Calls TAO_GIOP_Invocation::start.
-
-  int invoke (CORBA::ExceptionList &exceptions,
-              CORBA_Environment &ACE_TRY_ENV =
-                    TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,CORBA::UnknownUserException));
-  // Send request, block until any reply comes back, and unmarshal
-  // reply parameters as appropriate.
-
-  int invoke (TAO_Exception_Data *excepts,
-              CORBA::ULong except_count,
-              CORBA_Environment &ACE_TRY_ENV =
-                    TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::Exception));
-  // Special purpose invoke method used by the interpretive stubs. This
-  // accomplishes the same task as the normal invoke except that
-  // Exceptions are allocated and decoded here. This reduces the
-  // footprint of the generated stubs.
-
-  void get_value (CORBA::TypeCode_ptr tc,
-                  void *value,
-                  CORBA_Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
-  // No CORBA::Context support (deprecated).
-
-  TAO_InputCDR &inp_stream (void);
-  // return the underlying input stream
-
-private:
-  int invoke_i (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Implementation of the invoke() methods, handles the basic
-  // send/reply code and the system exceptions.
-
-private:
-  // TAO_GIOP_Message_State message_state_;
-  // Stream into which the reply is placed.
-
-  TAO_Synch_Reply_Dispatcher rd_;
-  // Reply dispatcher for the current synchronous invocation.
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_GIOP_Oneway_Invocation : public TAO_GIOP_Invocation
-{
-  // = TITLE
-  //   Sends a oneway request.
-  //
-public:
-  TAO_GIOP_Oneway_Invocation (TAO_Stub *data,
-                              const char *operation,
-                              TAO_ORB_Core* orb_core);
-  // Constructor.
-
-  void start (CORBA_Environment &TAO_IN_ENV =
-                    TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Call TAO_GIOP_Invocation::start()
-
-  int invoke (CORBA_Environment &ACE_TRY_ENV =
-                    TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Send request, without blocking for any response.
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_GIOP_Locate_Request_Invocation : public TAO_GIOP_Invocation
-{
-  // = TITLE
-  //   Sends a locate request.
-  //
-public:
-  TAO_GIOP_Locate_Request_Invocation (TAO_Stub *data,
-                                      TAO_ORB_Core* orb_core);
-  // Constructor.
-
-  void start (CORBA_Environment &TAO_IN_ENV =
-                    TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Calls TAO_GIOP_Invocation::start.
-
-  int invoke (CORBA_Environment &ACE_TRY_ENV =
-                    TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Send request, without blocking for any response.
-
-  TAO_InputCDR &inp_stream (void);
-  // return the underlying input stream
-
-private:
-  // TAO_GIOP_Message_State message_state_;
-  // Stream into which the request is placed.
-
-  TAO_Synch_Reply_Dispatcher rd_;
-  // Reply dispatcher for the current synchronous invocation.
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Invocation.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_INVOCATION_H */
diff --git a/TAO/tao/Invocation.i b/TAO/tao/Invocation.i
deleted file mode 100644
index e832e474c27..00000000000
--- a/TAO/tao/Invocation.i
+++ /dev/null
@@ -1,79 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-//
-// $Id$
-//
-
-ACE_INLINE void
-TAO_GIOP_Invocation::put_param (CORBA::TypeCode_ptr tc,
-                                void *value,
-                                CORBA::Environment &ACE_TRY_ENV)
-{
-  (void) this->out_stream_.encode (tc, value, 0, ACE_TRY_ENV);
-}
-
-ACE_INLINE TAO_OutputCDR &
-TAO_GIOP_Invocation::out_stream (void)
-{
-  return this->out_stream_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_GIOP_Twoway_Invocation::
-TAO_GIOP_Twoway_Invocation (TAO_Stub *stub,
-                            const char *operation,
-                            TAO_ORB_Core *orb_core)
-  : TAO_GIOP_Invocation (stub, operation, orb_core),
-    rd_ (orb_core)
-{
-}
-
-ACE_INLINE TAO_InputCDR &
-TAO_GIOP_Twoway_Invocation::inp_stream (void)
-{
-  return this->rd_.reply_cdr ();
-}
-
-ACE_INLINE void
-TAO_GIOP_Twoway_Invocation::get_value (CORBA::TypeCode_ptr tc,
-                                       void *value,
-                                       CORBA::Environment &ACE_TRY_ENV)
-{
-  (void) this->inp_stream ().decode (tc, value, 0, ACE_TRY_ENV);
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_GIOP_Oneway_Invocation::
-TAO_GIOP_Oneway_Invocation (TAO_Stub *stub,
-                            const char *operation,
-                            TAO_ORB_Core *orb_core)
-  : TAO_GIOP_Invocation (stub, operation, orb_core)
-{
-}
-
-ACE_INLINE int
-TAO_GIOP_Oneway_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return TAO_GIOP_Invocation::invoke (0, ACE_TRY_ENV);
-}
-
-// *********************************************************************
-
-ACE_INLINE
-TAO_GIOP_Locate_Request_Invocation::
-TAO_GIOP_Locate_Request_Invocation (TAO_Stub *stub,
-                                    TAO_ORB_Core *orb_core)
-  : TAO_GIOP_Invocation (stub, 0, orb_core),
-    rd_ (orb_core)
-{
-}
-
-ACE_INLINE TAO_InputCDR &
-TAO_GIOP_Locate_Request_Invocation::inp_stream (void)
-{
-  return this->rd_. reply_cdr ();
-}
diff --git a/TAO/tao/Key_Adapters.cpp b/TAO/tao/Key_Adapters.cpp
deleted file mode 100644
index e8afbeb534a..00000000000
--- a/TAO/tao/Key_Adapters.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// $Id$
-
-#include "tao/Key_Adapters.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Key_Adapters.i"
-#endif /* __ACE_INLINE__ */
-
-////////////////////////////////////////////////////////////////////////////////
-
-TAO_Incremental_Key_Generator::TAO_Incremental_Key_Generator (void)
-  : counter_ (0)
-{
-}
-
-int
-TAO_Incremental_Key_Generator::operator() (PortableServer::ObjectId &id)
-{
-  // Resize to accommodate the counter.
-  id.length (sizeof this->counter_);
-
-  // Add new key data.
-  ACE_OS::memcpy (id.get_buffer (),
-                  &++this->counter_,
-                  sizeof this->counter_);
-
-  // Success.
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-u_long
-TAO_ObjectId_Hash::operator () (const PortableServer::ObjectId &id) const
-{
-  return ACE::hash_pjw ((const char *) id.get_buffer (),
-                        id.length ());
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-int
-TAO_Ignore_Original_Key_Adapter::encode (const PortableServer::ObjectId &original_key,
-                                         const ACE_Active_Map_Manager_Key &active_key,
-                                         PortableServer::ObjectId &modified_key)
-{
-  ACE_UNUSED_ARG (original_key);
-
-  // Size of active key.
-  size_t active_key_size = active_key.size ();
-
-  // Resize to accommodate both the original data and the new active key.
-  modified_key.length (active_key_size);
-
-  // Copy active key data into user key.
-  active_key.encode (modified_key.get_buffer ());
-
-  // Success.
-  return 0;
-}
-
-int
-TAO_Ignore_Original_Key_Adapter::decode (const PortableServer::ObjectId &modified_key,
-                                         ACE_Active_Map_Manager_Key &active_key)
-{
-  // Read off value of index and generation.
-  active_key.decode (modified_key.get_buffer ());
-
-  // Success.
-  return 0;
-}
-
-int
-TAO_Ignore_Original_Key_Adapter::decode (const PortableServer::ObjectId &modified_key,
-                                         PortableServer::ObjectId &original_key)
-{
-  // Smartly copy all the data; <original_key does not own the data>.
-  original_key.replace (modified_key.maximum (),
-                        modified_key.length (),
-                        ACE_const_cast (CORBA::Octet *,
-                                        modified_key.get_buffer ()),
-                        0);
-
-  // Success.
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-int
-TAO_Preserve_Original_Key_Adapter::encode (const PortableServer::ObjectId &original_key,
-                                           const ACE_Active_Map_Manager_Key &active_key,
-                                           PortableServer::ObjectId &modified_key)
-{
-  // Size of active key.
-  size_t active_key_size = active_key.size ();
-
-  // Resize to accommodate both the original data and the new active key.
-  modified_key.length (active_key_size + original_key.length ());
-
-  // Copy active key data into user key.
-  active_key.encode (modified_key.get_buffer ());
-
-  // Copy the original key after the active key.
-  ACE_OS::memcpy (modified_key.get_buffer () + active_key_size,
-                  original_key.get_buffer (),
-                  original_key.length ());
-
-  // Success.
-  return 0;
-}
-
-int
-TAO_Preserve_Original_Key_Adapter::decode (const PortableServer::ObjectId &modified_key,
-                                           ACE_Active_Map_Manager_Key &active_key)
-{
-  // Read off value of index and generation.
-  active_key.decode (modified_key.get_buffer ());
-
-  // Success.
-  return 0;
-}
-
-int
-TAO_Preserve_Original_Key_Adapter::decode (const PortableServer::ObjectId &modified_key,
-                                           PortableServer::ObjectId &original_key)
-{
-  // Size of active key.
-  size_t active_key_size = ACE_Active_Map_Manager_Key::size ();
-
-  // Smartly copy all the data; <original_key does not own the data>.
-  original_key.replace (modified_key.maximum () - active_key_size,
-                        modified_key.length () - active_key_size,
-                        ACE_const_cast (CORBA::Octet *,
-                                        modified_key.get_buffer ()) + active_key_size,
-                        0);
-
-  // Success.
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
diff --git a/TAO/tao/Key_Adapters.h b/TAO/tao/Key_Adapters.h
deleted file mode 100644
index 793dad8976a..00000000000
--- a/TAO/tao/Key_Adapters.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Key_Adapters.h
-//
-// = AUTHOR
-//    Irfan Pyarali
-//
-// ============================================================================
-
-#ifndef TAO_KEY_ADAPTERS_H
-#define TAO_KEY_ADAPTERS_H
-
-#include "tao/corbafwd.h"
-#include "ace/Map.h"
-#include "tao/POAC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-////////////////////////////////////////////////////////////////////////////////
-
-class TAO_Incremental_Key_Generator
-{
-  // = TITLE
-  //     Defines a key generator.
-  //
-  // = DESCRIPTION
-  //     This class is used in adapters of maps that do not produce keys.
-public:
-
-  TAO_Incremental_Key_Generator (void);
-
-  int operator() (PortableServer::ObjectId &id);
-
-protected:
-
-  CORBA::ULong counter_;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-class TAO_Export TAO_ObjectId_Hash
-{
-  // = TITLE
-  //     Hashing class for Object Ids.
-  //
-  // = DESCRIPTION
-  //     Define the hash() method for Object Ids.
-public:
-
-  u_long operator () (const PortableServer::ObjectId &id) const;
-  // Returns hash value.
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-class TAO_Ignore_Original_Key_Adapter
-{
-  // = TITLE
-  //     A key adapter (encode/decode) class.
-  //
-  // = DESCRIPTION
-  //     Define the encoding and decoding methods for converting
-  //     between Object Ids and active keys.  This class ignores the
-  //     <original_key> passed to it.
-public:
-
-  int encode (const PortableServer::ObjectId &original_key,
-              const ACE_Active_Map_Manager_Key &active_key,
-              PortableServer::ObjectId &modified_key);
-
-  int decode (const PortableServer::ObjectId &modified_key,
-              ACE_Active_Map_Manager_Key &active_key);
-
-  int decode (const PortableServer::ObjectId &modified_key,
-              PortableServer::ObjectId &original_key);
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-class TAO_Preserve_Original_Key_Adapter
-{
-  // = TITLE
-  //     A key adapter (encode/decode) class.
-  //
-  // = DESCRIPTION
-  //     Define the encoding and decoding methods for converting
-  //     between Object Ids and active keys.  This class remembers the
-  //     <original_key> passed to it.
-public:
-
-  int encode (const PortableServer::ObjectId &original_key,
-              const ACE_Active_Map_Manager_Key &active_key,
-              PortableServer::ObjectId &modified_key);
-
-  int decode (const PortableServer::ObjectId &modified_key,
-              ACE_Active_Map_Manager_Key &active_key);
-
-  int decode (const PortableServer::ObjectId &modified_key,
-              PortableServer::ObjectId &original_key);
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-#if defined (__ACE_INLINE__)
-# include "tao/Key_Adapters.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_KEY_ADAPTERS_H */
diff --git a/TAO/tao/Key_Adapters.i b/TAO/tao/Key_Adapters.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/Key_Adapters.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/MProfile.cpp b/TAO/tao/MProfile.cpp
deleted file mode 100644
index 6ceeeeb928d..00000000000
--- a/TAO/tao/MProfile.cpp
+++ /dev/null
@@ -1,220 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-#include "tao/MProfile.h"
-#include "tao/Pluggable.h"
-#include "tao/Environment.h"
-
-ACE_RCSID(tao, MProfile, "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "tao/MProfile.i"
-#endif /* __ACE_INLINE__ */
-
-void
-TAO_MProfile::cleanup (void)
-{
-  if (this->pfiles_ != 0)
-    {
-      for (TAO_PHandle i = 0; i < this->last_; ++i)
-        if (this->pfiles_[i])
-          this->pfiles_[i]->_decr_refcnt ();
-      delete [] this->pfiles_;
-      this->pfiles_ = 0;
-    }
-
-  this->current_ = 0;
-  this->size_ = 0;
-  this->last_ = 0;
-}
-
-int
-TAO_MProfile::set (CORBA::ULong sz)
-{
-  if (sz == 0)
-    {
-      this->cleanup ();
-      return 0;
-    }
-
-  // See if we already have an existing profile list or if we need to
-  // get ridof what we have.
-  if (this->size_ != 0)
-    {
-      // Release all of our profiles.
-
-      for (TAO_PHandle h = 0;
-           h < this->size_;
-           h++)
-        if (this->pfiles_[h])
-          {
-            this->pfiles_[h]->_decr_refcnt ();
-            this->pfiles_[h] = 0;
-          }
-
-      // Next see if we can reuse our profile list memory
-      if (this->size_ < sz)
-        {
-          // we cant reuse memory since the current array is too small!
-          delete [] this->pfiles_;
-
-          ACE_NEW_RETURN (this->pfiles_,
-                          TAO_Profile *[sz],
-                          -1);
-          this->size_ = sz;
-        }
-      // else , leave this->size and this->pfiles alone!
-    }
-  else
-    {
-      // first time, initialize!
-      ACE_NEW_RETURN (this->pfiles_,
-                      TAO_Profile *[sz],
-                      -1);
-      this->size_ = sz;
-    }
-
-  this->last_ = 0;
-  this->current_ = 0;
-
-  for (TAO_PHandle i = 0; i != this->size_; ++i)
-    this->pfiles_[i] = 0;
-
-  return this->size_;
-}
-
-int
-TAO_MProfile::set (const TAO_MProfile &mprofile)
-{
-  // NOTE: We use mprofile->last_ instead of mprofile->size_ to set
-  // this->size_.  This is so we can use set () to trim a profile
-  // list!!
-
-  this->set (mprofile.last_);
-
-  // set indexes ...
-  this->last_ = mprofile.last_;
-
-  // These are set in set (ULong);
-  // this->current_ = 0;
-  // this->forward_from_ = 0;
-
-  // Now reference all profiles.
-
-  for (TAO_PHandle h = 0; h < this->size_; h++)
-    {
-      this->pfiles_[h] = mprofile.pfiles_[h];
-      if (this->pfiles_[h] != 0)
-        this->pfiles_[h]->_incr_refcnt ();
-    }
-
-  return 1;
-}
-
-int
-TAO_MProfile::add_profiles (TAO_MProfile *pfiles)
-{
-  // this->size_ == total number of profiles we can hold
-  // this->last_ == the index of the last profile
-  CORBA::ULong space = this->size_ - this->last_;
-
-  if (space < pfiles->last_)
-    {
-      // we need to grow!
-     if (this->grow (this->last_ + pfiles->last_) < 0)
-       return -1;
-    }
-
-  // copy over profiles
-  for (TAO_PHandle h = 0;h < pfiles->last_;h++)
-    {
-      if (this->add_profile (pfiles->pfiles_[h]) < 0)
-        return -1;
-    }
-  return 0;
-}
-
-
-// the layout for a full list of 7 Profiles.
-//
-// last_ == one past the last valid entry, so if the list has 2
-//          profiles then last_ equals 2.
-// current_ == index of the next profile to be returned (or one past
-//             the last returned.
-//
-// this->size_ = 7; current_ = 3; last_ = 7
-//   0, 1, 2, 3, 4, 5, 6}
-// { _, _, _, _, ..., _}
-//
-int
-TAO_MProfile::remove_profile (const TAO_Profile *pfile)
-{
-  TAO_PHandle h;
-  int found=0;
-  for (h = 0;h < this->last_;h++)
-    {
-      if (this->pfiles_[h]->is_equivalent (pfile))
-        { // remove it!
-          TAO_Profile *old = this->pfiles_[h];
-          this->pfiles_[h] = 0;
-          old->_decr_refcnt ();
-          // shift other profiles up one
-          // note, if h == last_ - 1 then do nothing.
-          for (TAO_PHandle inner = h;inner < this->last_ - 1;inner++)
-            {
-              this->pfiles_[inner] = this->pfiles_[inner + 1];
-            }
-          // subtract 1 from last_ to indicate we have one fewer profiles
-          this->last_--;
-          found = 1;
-          break;
-        }
-    }
-  if ( found == 0)
-    return -1; // profile not found.
-  return 0;
-}
-
-int
-TAO_MProfile::remove_profiles (const TAO_MProfile *pfiles)
-{
-  for (TAO_PHandle h = 0;h < pfiles->last_;h++)
-    {
-      if (this->remove_profile (pfiles->pfiles_[h]) < 0)
-        return -1;
-    }
-  return 0;
-}
-
-CORBA::Boolean
-TAO_MProfile::is_equivalent (const TAO_MProfile *rhs)
-{
-  // Two profile lists are equivalent iff at least one of the profiles
-  // form the first list is_equivalent to at least one of the profiles
-  // from the second list!!
-  for (TAO_PHandle h1 = 0; h1 < this->last_;h1++)
-    for (TAO_PHandle h2 = 0; h2 < rhs->last_; h2++ )
-      if (this->pfiles_[h1]->is_equivalent (rhs->pfiles_[h2]))
-        return 1;
-
-  return 0;
-}
-
-CORBA::ULong
-TAO_MProfile::hash (CORBA::ULong max, CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::ULong hashval = 0;
-
-  if (last_ == 0)
-    return 0;
-
-  for (TAO_PHandle h=0; h < last_ ; h++)
-    {
-      hashval += pfiles_[h]->hash (max, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-    }
-
-  // The above hash function return an ULong between 0 and max here we
-  // simply take the average value and round.
-  return hashval / last_;
-}
diff --git a/TAO/tao/MProfile.h b/TAO/tao/MProfile.h
deleted file mode 100644
index a464c4e0b9b..00000000000
--- a/TAO/tao/MProfile.h
+++ /dev/null
@@ -1,191 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     MProfile.h
-//
-// = DESCRIPTION
-//     Keep track of profile lists
-//
-// = AUTHOR
-//     Fred Kuhns <fredk@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_MPROFILE_H
-#define TAO_MPROFILE_H
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Pluggable.h"
-
-typedef CORBA::ULong TAO_PHandle;
-
-class TAO_Export TAO_MProfile
-{
-  // = TITLE
-  //   This class implements the basic interface for supporting
-  //   multiple profiles.
-  //
-  // = DESCRIPTION
-  //   Multiple profiles can be treated either as a circular queue or
-  //   a linear array of profiles.
-  //
-  //   It is assumed that locking will only be required when a profile
-  //   list is associated with a TAO_Stub.  Thus when the
-  //   TAO_Stub accepts ownership of an MProfile it also assumes
-  //   responsibility for controling access (i.e. locking).
-public:
-  // = Initialization and termination methods.
-  TAO_MProfile (CORBA::ULong sz = 0);
-
-  TAO_MProfile (const TAO_MProfile &mprofiles);
-  // **NOTE:  IF mprofiles->last_ > 0, THEN this->size_ will be set to
-  //          mprofiles->last_.  Otherwise this->size_ - mprofiles->size_.
-  //          Furthermore, current_ is set back to 0!  i.e. rewound.
-  // The reference count on any profiles in mprofiles is increment
-  // when their references (i.e. pointers) are copied.
-
-  TAO_MProfile& operator= (const TAO_MProfile& mprofiles);
-  // Assigment operator.
-
-  ~TAO_MProfile (void);
-  // Destructor: decrements reference count on all references
-  // profiles!
-
-  int set (CORBA::ULong sz);
-  // Inits MProfile to hold sz TAO_Profiles.
-  // NOT THREAD SAFE
-
-  int set (const TAO_MProfile &mprofile);
-  // Inits this to the values of mprofile.  NOTE: We use
-  // mprofile->last_ instead of mprofile->size_ to set this->size_.
-  // This is so we can use set () to trim a profile list!!
-  // NOT THREAD SAFE
-
-  int grow (CORBA::ULong sz);
-  // increase the number of profiles this object can hold.
-  // NOT THREAD SAFE
-
-  TAO_Profile *get_cnext (void);
-  // Treat as a circular list.
-
-  TAO_Profile *get_next (void);
-  // Get next profile in list, return 0 at end of list.
-
-  TAO_Profile *get_cprev (void);
-  // Assume a circular list of profiles.
-
-  TAO_Profile *get_prev (void);
-  // Get previous profile, stop at beginning of list and return 0.
-
-  TAO_Profile *get_current_profile (void);
-  // Return a pointer to the current profile, will not increment
-  // reference pointer.
-
-  TAO_Profile *get_profile (TAO_PHandle handle);
-  // Return a pointer to the profile referenced by handle void.
-
-  // rem_profile (TAO_PHandle handle); let's wait.
-
-  TAO_PHandle get_current_handle (void);
-  // Returns the index for the current profile.
-
-  CORBA::ULong profile_count (void) const;
-  // Returns the number of profiles stored in the list (last_+1).
-
-  CORBA::ULong size (void) const;
-  // return the maximum number of profiles that can be stored in this
-  // container, (size_+1)
-
-  const TAO_Profile* get_profile (CORBA::ULong slot) const;
-  // Return the profile at position <slot>.  If <slot> is out of range
-  // it returns 0.
-
-  void rewind (void);
-  // Sets the current slot back to 0.
-
-  int add_profile (TAO_Profile *pfile);
-  // Return the index of this entry or -1 if it can not be added.
-  // reference count on profile in incremented!
-
-  int give_profile (TAO_Profile *pfile);
-  // Return the index of this entry or -1 if it can not be added.
-  // this object assumes ownership of this profile!!
-
-  int add_profiles (TAO_MProfile *pfiles);
-  // append the profiles in pfiles to this object.  The count
-  // will be incremented on the individual profile objects.
-
-  int remove_profile (const TAO_Profile *pfile);
-  // remove from this MProfile any profiles which also appear in pfiles.
-
-  int remove_profiles (const TAO_MProfile *pfiles);
-  // remove from this MProfile any profiles which also appear in pfiles.
-
-  void forward_from (TAO_MProfile *mprofiles);
-  // Set a pointer to the MProfile whose 'current' TAO_Profile was
-  // forwarded This object is the set of forwarding profiles.
-
-  TAO_MProfile *forward_from (void);
-  // Returns a pointer to the profile which was forwarded.
-
-  CORBA::Boolean is_equivalent (const TAO_MProfile *rhs);
-  // Returns true of there is at least one profile in first which
-  // is_equivalent with at least one profile in second.
-  // NON-THREAD SAFE, relies on some other entity to guarentee
-  // the profiles will not change during the call.
-
-  CORBA::ULong hash (CORBA::ULong max,
-                     CORBA::Environment &ACE_TRY_ENV);
-  // use all registered profiles.  The hash() method is called on each
-  // profile and the results are averaged together.
-  // NON-THREAD SAFE.
-
-protected:
-  TAO_Profile **pfiles (void) const;
-  // return the complete list of profiles, this object retains
-  // ownership!
-
-
-private:
-  void cleanup (void);
-  // Helper method to implement the destructor
-
-private:
-
-  TAO_MProfile  *forward_from_;
-  // Used for chaning references when the current profile is
-  // forwarded.  Note, this will only be valid for an MProfile which
-  // contains a list of forward_profiles for some initial or base
-  // profile.  This is a backward reference to the profile list which
-  // received the relocate message.  The actual profile what was
-  // forwarded will be forward_from_->get_current_profile ()
-
-  TAO_Profile **pfiles_;
-  // Actual list of profiles.
-
-  TAO_PHandle current_;
-  // Points to the next profile to be used.  0 ... size_
-
-  TAO_PHandle size_;
-  // Max size of array
-
-  TAO_PHandle last_;
-  // Index plus 1 of last valid entry!  May be < size_.
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/MProfile.i"
-#endif /*__ACE_INLINE__ */
-
-#endif /*TAO_MPROFILE_H */
diff --git a/TAO/tao/MProfile.i b/TAO/tao/MProfile.i
deleted file mode 100644
index 54c46dc744d..00000000000
--- a/TAO/tao/MProfile.i
+++ /dev/null
@@ -1,233 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-ACE_INLINE
-TAO_MProfile::TAO_MProfile (CORBA::ULong sz)
-  :  forward_from_(0),
-     pfiles_ (0),
-     current_ (0),
-     size_ (0),
-     last_ (0)
-{
-  this->set (sz);
-}
-
-ACE_INLINE
-TAO_MProfile::TAO_MProfile (const TAO_MProfile &mprofiles)
-  :  forward_from_(0),
-     pfiles_ (0),
-     current_ (0),
-     size_ (0),
-     last_ (0)
-{
-  this->set (mprofiles);
-}
-
-ACE_INLINE TAO_MProfile&
-TAO_MProfile::operator= (const TAO_MProfile& rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  this->set (rhs);
-  return *this;
-}
-
-ACE_INLINE
-TAO_MProfile::~TAO_MProfile (void)
-{
-  this->cleanup ();
-}
-
-// Cyclic get next.  It will simply cycle through the complete list.
-
-ACE_INLINE TAO_Profile *
-TAO_MProfile::get_cnext (void)
-{
-  if (last_ == 0)
-      return 0;
-
-  if (current_ == last_)
-      current_ = 0;
-
-  return pfiles_[current_++];
-}
-
-// This will return the next element until either null is found or the
-// end of list.  It then continues to return NULL until rewind.
-
-ACE_INLINE TAO_Profile *
-TAO_MProfile::get_next (void)
-{
-  // Nolist or EndOfList
-  if (last_ == 0 || current_ == last_)
-    return 0;
-  else
-    return pfiles_[current_++];
-}
-
-ACE_INLINE TAO_Profile *
-TAO_MProfile::get_cprev (void)
-{
-  if (last_ == 0)
-    return 0;
-  else if (last_ == 1)
-    current_=1;
-  else if (current_ > 1)
-    current_--;
-  else // current_ == 0 or 1, 0 => list never read before and == 1
-    current_ = last_;
-
-  return pfiles_[current_ - 1];
-}
-
-ACE_INLINE TAO_Profile *
-TAO_MProfile::get_prev (void)
-{
-  if (last_ == 0 || current_ <= 1)
-    // No List of BeginningOfList
-    return 0;
-  if (current_ > 1)
-    current_--;
-
-  return pfiles_[current_ - 1];
-}
-
-// does not affect the current_ setting!
-
-ACE_INLINE TAO_Profile *
-TAO_MProfile::get_profile (TAO_PHandle handle)
-{
-  if (handle < last_)
-    return pfiles_[handle];
-  else
-    return 0;
-}
-
-ACE_INLINE TAO_Profile *
-TAO_MProfile::get_current_profile (void)
-{
-  if (last_ == 0)
-    return 0;
-  if (current_ == 0)
-    // means list has not been read before.
-    current_ = 1;
-
-  return pfiles_[current_ - 1];
-}
-
-ACE_INLINE TAO_PHandle
-TAO_MProfile::get_current_handle (void)
-{
-  if (current_ > 0)
-    return current_ - 1;
-  else
-    return 0;
-}
-
-ACE_INLINE void
-TAO_MProfile::rewind (void)
-{
-  current_ = 0;
-}
-
-ACE_INLINE int
-TAO_MProfile::give_profile (TAO_Profile *pfile)
-{
-  // skip by the used slots
-  if (last_ == size_) // full!
-    return -1;
-
-  pfiles_[last_++] = pfile;
-
-  return last_ - 1;
-}
-
-ACE_INLINE
-void
-TAO_MProfile::forward_from (TAO_MProfile *from)
-{
-  this->forward_from_ = from;
-}
-
-ACE_INLINE
-TAO_MProfile *
-TAO_MProfile::forward_from (void)
-{
-  return this->forward_from_;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_MProfile::profile_count (void) const
-{
-  return this->last_;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_MProfile::size (void) const
-{
-  return this->size_;
-}
-
-ACE_INLINE const TAO_Profile*
-TAO_MProfile::get_profile (CORBA::ULong slot) const
-{
-  if (slot >= this->last_)
-    return 0;
-  return this->pfiles_[slot];
-}
-
-ACE_INLINE TAO_Profile **
-TAO_MProfile::pfiles (void) const
-{
-  return this->pfiles_;
-}
-
-
-// Not thread safe!
-ACE_INLINE int
-TAO_MProfile::grow (CORBA::ULong sz)
-{
-  if (sz <= this->size_)
-    return 0;
-
-  // get the additional space
-  TAO_Profile **new_pfiles, **old_pfiles;
-  ACE_NEW_RETURN (new_pfiles,
-                  TAO_Profile *[sz],
-                  -1);
-
-  old_pfiles = this->pfiles_;
-
-  // got it, now copy profiles
-  for (TAO_PHandle h = 0; h < this->size_; ++h)
-    {
-      new_pfiles[h] = old_pfiles[h];
-      old_pfiles[h] = 0;
-    }
-
-  this->pfiles_ = new_pfiles;
-  this->size_ = sz;
-  delete [] old_pfiles;
-
-  return 0;
-}
-
-ACE_INLINE int
-TAO_MProfile::add_profile (TAO_Profile *pfile)
-{
-  // skip by the used slots
-  if (last_ == size_) // full!
-    {
-      if (this->grow (this->size_ + 1) < 0)
-        return -1;
-    }
-
-  pfiles_[last_++] = pfile;
-
-  if (pfile && pfile->_incr_refcnt () == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) Unable to increment reference count in add_profile!\n"),
-                      -1);
-  return last_ - 1;
-}
diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile
deleted file mode 100644
index 20f9efc8efe..00000000000
--- a/TAO/tao/Makefile
+++ /dev/null
@@ -1,18454 +0,0 @@
-#----------------------------------------------------------------------------
-#       $Id$
-#
-#       Makefile for TAO
-#----------------------------------------------------------------------------
-
-MAKEFILE = Makefile
-LIBNAME  = libTAO
-LIB      = $(LIBNAME).a
-SHLIB    = $(LIBNAME).$(SOEXT)
-
-# These are headers for things which are exported and must be
-# installed.  (Currently not used).
-PUB_HDRS = \
-  Pluggable \
-  MProfile \
-  IIOP_Profile \
-  IIOP_Transport \
-  IIOP_Connector \
-  IIOP_Acceptor \
-  IIOP_Connect \
-  UIOP_Profile \
-  UIOP_Transport \
-  UIOP_Connector \
-  UIOP_Acceptor \
-  UIOP_Connect \
-  GIOP \
-  Invocation \
-  Asynch_Invocation \
-  Params \
-  Marshal \
-  Debug \
-  Default_Client \
-  Default_Server \
-  Server_Strategy_Factory \
-  Client_Strategy_Factory \
-  ORB_Core \
-  Wait_Strategy \
-  Transport_Mux_Strategy \
-  Reply_Dispatcher \
-  IORC \
-  IORS \
-  IORManipulation
-
-POA_FILES = \
-  Object_Adapter \
-  Key_Adapters \
-  POA \
-  POAC \
-  POAS \
-  POAManager \
-  Active_Object_Map \
-  Servant_Base
-
-PLUGGABLE_PROTOCOLS_FILES = \
-  Pluggable \
-  Connector_Registry \
-  Acceptor_Registry \
-  Protocol_Factory \
-  IIOP_Factory \
-  IIOP_Profile \
-  IIOP_Transport \
-  IIOP_Connector \
-  IIOP_Acceptor \
-  IIOP_Connect \
-  UIOP_Factory \
-  UIOP_Profile \
-  UIOP_Transport \
-  UIOP_Connector \
-  UIOP_Acceptor \
-  UIOP_Connect \
-  IORC \
-  IORS \
-  IORManipulation
-
-DEFAULT_RESOURCES_FILES = \
-  default_client \
-  default_server \
-  default_resource \
-  xt_resource
-
-INTERPRETIVE_MARSHALING_FILES = \
-  append \
-  decode \
-  deep_free \
-  encode \
-  CDR_Interpreter \
-  Marshal \
-  skip
-
-IDL_COMPILER_FILES = \
-  Managed_Types \
-  Union \
-  Operation_Table
-
-ORB_CORE_FILES = \
-  Any \
-  CurrentC \
-  CurrentS \
-  Exception \
-  WrongTransactionC \
-  Environment \
-  Object \
-  ORB \
-  corbafwd \
-  PolicyC \
-  PolicyS \
-  DomainC \
-  DomainS \
-  TimeBaseC \
-  TimeBaseS \
-  Principal \
-  Sequence \
-  Server_Request \
-  MProfile \
-  Stub \
-  Typecode \
-  ValueBase \
-  ValueFactory \
-  ValueFactory_Map \
-  CDR \
-  Client_Strategy_Factory \
-  debug \
-  Object_KeyC \
-  GIOP \
-  GIOP_Server_Request \
-  Invocation \
-  Asynch_Invocation \
-  ORB_Core \
-  params \
-  Resource_Factory \
-  Server_Strategy_Factory \
-  TAO_Internal \
-  Typecode_Constants \
-  IOR_LookupTable \
-  TAO \
-  Wait_Strategy \
-  Transport_Mux_Strategy \
-  Reply_Dispatcher \
-  IOPC \
-  IOPS \
-  PollableC \
-  PollableS \
-  CONV_FRAMEC \
-  CONV_FRAMES \
-  Tagged_Components
-
-DYNAMIC_ANY_FILES =
-
-ifndef minimum_corba
-  minimum_corba = 0
-endif # minimum_corba
-
-ifeq ($(minimum_corba),0)
-
-POA_FILES += \
-  Forwarding_Servant
-
-ORB_CORE_FILES += \
-  Context \
-  Request \
-  Services \
-  NVList \
-  ObjectIDList
-
-DYNAMIC_ANY_FILES += \
-  DynAnyC \
-  DynAnyS \
-  DynAny_i \
-  DynArray_i \
-  DynEnum_i \
-  DynSequence_i \
-  DynStruct_i \
-  DynUnion_i \
-  InconsistentTypeCodeC
-
-endif # minimum_corba
-
-ifndef corba_messaging
-  corba_messaging = 1
-endif # corba_messaging
-
-ifeq ($(corba_messaging),1)
-ORB_CORE_FILES += \
-  MessagingC \
-  MessagingS \
-  Policy_Manager \
-  Messaging_Policy_i
-endif # corba_messaging
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
-DEFS    = $(addsuffix .h,$(PUB_HDRS))
-
-LDLIBS = -lACE
-LIBS += $(ACELIB)
-
-#----------------------------------------------------------------------------
-#       Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-
-####
-#### Build customization.
-####
-ifndef TAO_COMPONENTS
-  TAO_COMPONENTS = \
-    POA \
-    Pluggable_Protocols \
-    Default_Resources \
-    Interpretive_Marshaling \
-    IDL_Compiler \
-    ORB_Core \
-    Dynamic_Any
-endif # TAO_COMPONENTS
-
-####
-#### TAO_COMPONENTS support.
-####
-ifneq (,$(findstring POA,$(TAO_COMPONENTS)))
-  FILES += $(POA_FILES)
-endif # POA
-
-ifneq (,$(findstring Pluggable_Protocols,$(TAO_COMPONENTS)))
-  FILES += $(PLUGGABLE_PROTOCOLS_FILES)
-endif # Pluggable_Protocols
-
-ifneq (,$(findstring Default_Resources,$(TAO_COMPONENTS)))
-  FILES += $(DEFAULT_RESOURCES_FILES)
-endif # Default_Resources
-
-ifneq (,$(findstring Interpretive_Marshaling,$(TAO_COMPONENTS)))
-  FILES += $(INTERPRETIVE_MARSHALING_FILES)
-endif # Interpretive_Marshaling
-
-ifneq (,$(findstring IDL_Compiler,$(TAO_COMPONENTS)))
-  FILES += $(IDL_COMPILER_FILES)
-endif # IDL_Compiler
-
-ifneq (,$(findstring ORB_Core,$(TAO_COMPONENTS)))
-  FILES += $(ORB_CORE_FILES)
-endif # ORB_Core
-
-ifneq (,$(findstring Dynamic_Any,$(TAO_COMPONENTS)))
-  FILES += $(DYNAMIC_ANY_FILES)
-endif # Dynamic_Any
-
-LSRC    = $(addsuffix .cpp,$(FILES))
-BUILD   += TAO_COMPONENTS
-
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
-
-#----------------------------------------------------------------------------
-#       Local targets (and local hacks)
-#----------------------------------------------------------------------------
-
-ifeq ($(fakesvcconf),1)
-  CPPFLAGS += -DTAO_PLATFORM_SVC_CONF_FILE_NOTSUP
-endif # fakesvcconf
-
-ifeq ($(LYNXTARGET),ppc)
-#### POA.cpp raises internal compiler error with LynxOS 3.0.0 g++, but
-#### only when optimization is enabled.  Disable it . . .
-$(VDIR).obj/POA.o .obj/POA.so .shobj/POA.o .shobj/POA.so: POA.cpp
-	@echo NOTE: compiling POA.cpp with -O instead of -O2, see Makefile.
-	$(subst $(OCFLAGS) ,-O ,$(COMPILE.cc)) -o $@ $<
-endif # LYNXTARGET == ppc
-
-#RLDFLAGS := $(subst -L,-Wl\,-rpath ,$(LDFLAGS))
-LDFLAGS += $(RLDFLAGS)
-
-.PRECIOUS: Object_KeyC.h Object_KeyC.i Object_KeyC.cpp
-.PRECIOUS: POAS.h POAS.i POAS.cpp POAC.h POAC.i POAC.cpp
-
-.PHONY: TAO_COMPONENTS
-TAO_COMPONENTS:
-	@sh $(ACE_ROOT)/bin/ace_components --tao --set ' $(TAO_COMPONENTS) '
-
-realclean:
-	@sh $(ACE_ROOT)/bin/ace_components --tao --remove
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/Object_Adapter.o .obj/Object_Adapter.so .shobj/Object_Adapter.o .shobj/Object_Adapter.so: Object_Adapter.cpp \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h
-.obj/Key_Adapters.o .obj/Key_Adapters.so .shobj/Key_Adapters.o .shobj/Key_Adapters.so: Key_Adapters.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Key_Adapters.i
-.obj/POA.o .obj/POA.so .shobj/POA.o .shobj/POA.so: POA.cpp $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Forwarding_Servant.h
-.obj/POAC.o .obj/POAC.so .shobj/POAC.o .shobj/POAC.so: POAC.cpp \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i
-.obj/POAS.o .obj/POAS.so .shobj/POAS.o .shobj/POAS.so: POAS.cpp \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp
-.obj/POAManager.o .obj/POAManager.so .shobj/POAManager.o .shobj/POAManager.so: POAManager.cpp \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/POA.i
-.obj/Active_Object_Map.o .obj/Active_Object_Map.so .shobj/Active_Object_Map.o .shobj/Active_Object_Map.so: Active_Object_Map.cpp \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
-.obj/Servant_Base.o .obj/Servant_Base.so .shobj/Servant_Base.o .shobj/Servant_Base.so: Servant_Base.cpp \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i
-.obj/Forwarding_Servant.o .obj/Forwarding_Servant.so .shobj/Forwarding_Servant.o .shobj/Forwarding_Servant.so: Forwarding_Servant.cpp \
- $(TAO_ROOT)/tao/Forwarding_Servant.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i
-.obj/Pluggable.o .obj/Pluggable.so .shobj/Pluggable.o .shobj/Pluggable.so: Pluggable.cpp \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i
-.obj/Connector_Registry.o .obj/Connector_Registry.so .shobj/Connector_Registry.o .shobj/Connector_Registry.so: Connector_Registry.cpp \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Connector_Registry.h \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i
-.obj/Acceptor_Registry.o .obj/Acceptor_Registry.so .shobj/Acceptor_Registry.o .shobj/Acceptor_Registry.so: Acceptor_Registry.cpp \
- $(TAO_ROOT)/tao/Acceptor_Registry.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Acceptor_Registry.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
-.obj/Protocol_Factory.o .obj/Protocol_Factory.so .shobj/Protocol_Factory.o .shobj/Protocol_Factory.so: Protocol_Factory.cpp \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp
-.obj/IIOP_Factory.o .obj/IIOP_Factory.so .shobj/IIOP_Factory.o .shobj/IIOP_Factory.so: IIOP_Factory.cpp \
- $(TAO_ROOT)/tao/IIOP_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/IIOP_Acceptor.h \
- $(TAO_ROOT)/tao/IIOP_Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/IIOP_Transport.h \
- $(TAO_ROOT)/tao/IIOP_Connect.i \
- $(TAO_ROOT)/tao/Acceptor_Impl.h \
- $(TAO_ROOT)/tao/Acceptor_Impl.i \
- $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Acceptor.i \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i
-.obj/IIOP_Profile.o .obj/IIOP_Profile.so .shobj/IIOP_Profile.o .shobj/IIOP_Profile.so: IIOP_Profile.cpp \
- $(TAO_ROOT)/tao/IIOP_Profile.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(TAO_ROOT)/tao/IIOP_Profile.i \
- $(TAO_ROOT)/tao/IIOP_Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/IIOP_Transport.h \
- $(TAO_ROOT)/tao/IIOP_Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/debug.h
-.obj/IIOP_Transport.o .obj/IIOP_Transport.so .shobj/IIOP_Transport.o .shobj/IIOP_Transport.so: IIOP_Transport.cpp \
- $(TAO_ROOT)/tao/IIOP_Transport.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/IIOP_Connect.h \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/IIOP_Connect.i \
- $(TAO_ROOT)/tao/IIOP_Profile.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/IIOP_Profile.i \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/debug.h
-.obj/IIOP_Connector.o .obj/IIOP_Connector.so .shobj/IIOP_Connector.o .shobj/IIOP_Connector.so: IIOP_Connector.cpp \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/IIOP_Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/IIOP_Transport.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/IIOP_Connect.i \
- $(TAO_ROOT)/tao/IIOP_Profile.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/IIOP_Profile.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h
-.obj/IIOP_Acceptor.o .obj/IIOP_Acceptor.so .shobj/IIOP_Acceptor.o .shobj/IIOP_Acceptor.so: IIOP_Acceptor.cpp \
- $(TAO_ROOT)/tao/IIOP_Acceptor.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/IIOP_Connect.h \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/IIOP_Transport.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/IIOP_Connect.i \
- $(TAO_ROOT)/tao/Acceptor_Impl.h \
- $(TAO_ROOT)/tao/Acceptor_Impl.i \
- $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Acceptor.i \
- $(TAO_ROOT)/tao/IIOP_Profile.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/IIOP_Profile.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/debug.h
-.obj/IIOP_Connect.o .obj/IIOP_Connect.so .shobj/IIOP_Connect.o .shobj/IIOP_Connect.so: IIOP_Connect.cpp \
- $(TAO_ROOT)/tao/IIOP_Connect.h \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/IIOP_Transport.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/IIOP_Connect.i \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp
-.obj/UIOP_Factory.o .obj/UIOP_Factory.so .shobj/UIOP_Factory.o .shobj/UIOP_Factory.so: UIOP_Factory.cpp \
- $(TAO_ROOT)/tao/UIOP_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/UIOP_Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/UNIX_Addr.h \
- $(ACE_ROOT)/ace/UNIX_Addr.i \
- $(ACE_ROOT)/ace/LSOCK_Stream.h \
- $(ACE_ROOT)/ace/LSOCK.h \
- $(ACE_ROOT)/ace/LSOCK.i \
- $(ACE_ROOT)/ace/LSOCK_Stream.i \
- $(ACE_ROOT)/ace/LSOCK_Acceptor.i \
- $(TAO_ROOT)/tao/UIOP_Connect.h \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/UIOP_Transport.h \
- $(TAO_ROOT)/tao/UIOP_Connect.i \
- $(TAO_ROOT)/tao/Acceptor_Impl.h \
- $(TAO_ROOT)/tao/Acceptor_Impl.i \
- $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/UIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/LSOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/LSOCK_Connector.i
-.obj/UIOP_Profile.o .obj/UIOP_Profile.so .shobj/UIOP_Profile.o .shobj/UIOP_Profile.so: UIOP_Profile.cpp \
- $(TAO_ROOT)/tao/UIOP_Profile.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/UIOP_Connect.h \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/UNIX_Addr.h \
- $(ACE_ROOT)/ace/UNIX_Addr.i \
- $(ACE_ROOT)/ace/LSOCK_Stream.h \
- $(ACE_ROOT)/ace/LSOCK.h \
- $(ACE_ROOT)/ace/LSOCK.i \
- $(ACE_ROOT)/ace/LSOCK_Stream.i \
- $(ACE_ROOT)/ace/LSOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/UIOP_Transport.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/UIOP_Connect.i \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/UIOP_Profile.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/debug.h
-.obj/UIOP_Transport.o .obj/UIOP_Transport.so .shobj/UIOP_Transport.o .shobj/UIOP_Transport.so: UIOP_Transport.cpp \
- $(TAO_ROOT)/tao/UIOP_Transport.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/UIOP_Connect.h \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/UNIX_Addr.h \
- $(ACE_ROOT)/ace/UNIX_Addr.i \
- $(ACE_ROOT)/ace/LSOCK_Stream.h \
- $(ACE_ROOT)/ace/LSOCK.h \
- $(ACE_ROOT)/ace/LSOCK.i \
- $(ACE_ROOT)/ace/LSOCK_Stream.i \
- $(ACE_ROOT)/ace/LSOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/UIOP_Connect.i \
- $(TAO_ROOT)/tao/UIOP_Profile.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/UIOP_Profile.i \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/debug.h
-.obj/UIOP_Connector.o .obj/UIOP_Connector.so .shobj/UIOP_Connector.o .shobj/UIOP_Connector.so: UIOP_Connector.cpp \
- $(TAO_ROOT)/tao/UIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/LSOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/LSOCK_Stream.h \
- $(ACE_ROOT)/ace/UNIX_Addr.h \
- $(ACE_ROOT)/ace/UNIX_Addr.i \
- $(ACE_ROOT)/ace/LSOCK.h \
- $(ACE_ROOT)/ace/LSOCK.i \
- $(ACE_ROOT)/ace/LSOCK_Stream.i \
- $(ACE_ROOT)/ace/LSOCK_Connector.i \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/UIOP_Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/LSOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/UIOP_Transport.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/UIOP_Connect.i \
- $(TAO_ROOT)/tao/UIOP_Profile.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/UIOP_Profile.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp
-.obj/UIOP_Acceptor.o .obj/UIOP_Acceptor.so .shobj/UIOP_Acceptor.o .shobj/UIOP_Acceptor.so: UIOP_Acceptor.cpp \
- $(TAO_ROOT)/tao/UIOP_Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/UNIX_Addr.h \
- $(ACE_ROOT)/ace/UNIX_Addr.i \
- $(ACE_ROOT)/ace/LSOCK_Stream.h \
- $(ACE_ROOT)/ace/LSOCK.h \
- $(ACE_ROOT)/ace/LSOCK.i \
- $(ACE_ROOT)/ace/LSOCK_Stream.i \
- $(ACE_ROOT)/ace/LSOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/UIOP_Connect.h \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/UIOP_Transport.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/UIOP_Connect.i \
- $(TAO_ROOT)/tao/Acceptor_Impl.h \
- $(TAO_ROOT)/tao/Acceptor_Impl.i \
- $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/UIOP_Profile.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/UIOP_Profile.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/debug.h
-.obj/UIOP_Connect.o .obj/UIOP_Connect.so .shobj/UIOP_Connect.o .shobj/UIOP_Connect.so: UIOP_Connect.cpp \
- $(TAO_ROOT)/tao/UIOP_Connect.h \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/UNIX_Addr.h \
- $(ACE_ROOT)/ace/UNIX_Addr.i \
- $(ACE_ROOT)/ace/LSOCK_Stream.h \
- $(ACE_ROOT)/ace/LSOCK.h \
- $(ACE_ROOT)/ace/LSOCK.i \
- $(ACE_ROOT)/ace/LSOCK_Stream.i \
- $(ACE_ROOT)/ace/LSOCK_Acceptor.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/UIOP_Transport.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/UIOP_Connect.i \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp
-.obj/IORC.o .obj/IORC.so .shobj/IORC.o .shobj/IORC.so: IORC.cpp \
- $(TAO_ROOT)/tao/IORC.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h
-.obj/IORS.o .obj/IORS.so .shobj/IORS.o .shobj/IORS.so: IORS.cpp IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i IORS.i
-.obj/IORManipulation.o .obj/IORManipulation.so .shobj/IORManipulation.o .shobj/IORManipulation.so: IORManipulation.cpp \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
-.obj/default_client.o .obj/default_client.so .shobj/default_client.o .shobj/default_client.so: default_client.cpp \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/Transport_Mux_Strategy.h
-.obj/default_server.o .obj/default_server.so .shobj/default_server.o .shobj/default_server.so: default_server.cpp \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp
-.obj/default_resource.o .obj/default_resource.so .shobj/default_resource.o .shobj/default_resource.so: default_resource.cpp \
- $(TAO_ROOT)/tao/default_resource.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/default_resource.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Factory.h \
- $(TAO_ROOT)/tao/UIOP_Factory.h \
- $(TAO_ROOT)/tao/Acceptor_Registry.h \
- $(TAO_ROOT)/tao/Acceptor_Registry.i \
- $(TAO_ROOT)/tao/Connector_Registry.h \
- $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor_T.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.h \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/Select_Reactor_Base.i \
- $(ACE_ROOT)/ace/Select_Reactor_T.cpp \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
- $(ACE_ROOT)/ace/Select_Reactor_T.i \
- $(ACE_ROOT)/ace/Select_Reactor.i \
- $(ACE_ROOT)/ace/FlReactor.h \
- $(ACE_ROOT)/ace/Msg_WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Msg_WFMO_Reactor.i \
- $(ACE_ROOT)/ace/TP_Reactor.h \
- $(ACE_ROOT)/ace/TP_Reactor.i \
- $(ACE_ROOT)/ace/Arg_Shifter.h
-.obj/xt_resource.o .obj/xt_resource.so .shobj/xt_resource.o .shobj/xt_resource.so: xt_resource.cpp \
- $(TAO_ROOT)/tao/xt_resource.h \
- $(TAO_ROOT)/tao/default_resource.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/default_resource.i
-.obj/append.o .obj/append.so .shobj/append.o .shobj/append.so: append.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/debug.h
-.obj/decode.o .obj/decode.so .shobj/decode.o .shobj/decode.so: decode.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp
-.obj/deep_free.o .obj/deep_free.so .shobj/deep_free.o .shobj/deep_free.so: deep_free.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Union.h
-.obj/encode.o .obj/encode.so .shobj/encode.o .shobj/encode.so: encode.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Union.h
-.obj/CDR_Interpreter.o .obj/CDR_Interpreter.so .shobj/CDR_Interpreter.o .shobj/CDR_Interpreter.so: CDR_Interpreter.cpp \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/CDR_Interpreter.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/Union.h
-.obj/Marshal.o .obj/Marshal.so .shobj/Marshal.o .shobj/Marshal.so: Marshal.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp
-.obj/skip.o .obj/skip.so .shobj/skip.o .shobj/skip.so: skip.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/debug.h
-.obj/Managed_Types.o .obj/Managed_Types.so .shobj/Managed_Types.o .shobj/Managed_Types.so: Managed_Types.cpp \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i
-.obj/Union.o .obj/Union.so .shobj/Union.o .shobj/Union.so: Union.cpp \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i
-.obj/Operation_Table.o .obj/Operation_Table.so .shobj/Operation_Table.o .shobj/Operation_Table.so: Operation_Table.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i
-.obj/Any.o .obj/Any.so .shobj/Any.o .shobj/Any.so: Any.cpp $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp
-.obj/CurrentC.o .obj/CurrentC.so .shobj/CurrentC.o .shobj/CurrentC.so: CurrentC.cpp \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i
-.obj/CurrentS.o .obj/CurrentS.so .shobj/CurrentS.o .shobj/CurrentS.so: CurrentS.cpp \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i
-.obj/Exception.o .obj/Exception.so .shobj/Exception.o .shobj/Exception.so: Exception.cpp \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i
-.obj/WrongTransactionC.o .obj/WrongTransactionC.so .shobj/WrongTransactionC.o .shobj/WrongTransactionC.so: WrongTransactionC.cpp \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i
-.obj/Environment.o .obj/Environment.so .shobj/Environment.o .shobj/Environment.so: Environment.cpp \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp
-.obj/Object.o .obj/Object.so .shobj/Object.o .shobj/Object.so: Object.cpp \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/Connector_Registry.h \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
-.obj/ORB.o .obj/ORB.so .shobj/ORB.o .shobj/ORB.so: ORB.cpp $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Acceptor_Registry.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Acceptor_Registry.i \
- $(TAO_ROOT)/tao/Connector_Registry.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- $(ACE_ROOT)/ace/Arg_Shifter.h \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/CDR_Interpreter.h \
- $(TAO_ROOT)/tao/TAO_Internal.h \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/ValueFactory_Map.h \
- $(TAO_ROOT)/tao/ValueFactory_Map.i \
- $(TAO_ROOT)/tao/Messaging_Policy_i.h \
- $(TAO_ROOT)/tao/Messaging_Policy_i.i
-.obj/corbafwd.o .obj/corbafwd.so .shobj/corbafwd.o .shobj/corbafwd.so: corbafwd.cpp \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i
-.obj/PolicyC.o .obj/PolicyC.so .shobj/PolicyC.o .shobj/PolicyC.so: PolicyC.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i
-.obj/PolicyS.o .obj/PolicyS.so .shobj/PolicyS.o .shobj/PolicyS.so: PolicyS.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i
-.obj/DomainC.o .obj/DomainC.so .shobj/DomainC.o .shobj/DomainC.so: DomainC.cpp \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i
-.obj/DomainS.o .obj/DomainS.so .shobj/DomainS.o .shobj/DomainS.so: DomainS.cpp DomainC.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i DomainC.i \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h
-.obj/TimeBaseC.o .obj/TimeBaseC.so .shobj/TimeBaseC.o .shobj/TimeBaseC.so: TimeBaseC.cpp TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i TimeBaseC.i \
- TimeBaseS.h TimeBaseS_T.h TimeBaseS_T.i TimeBaseS_T.cpp TimeBaseS.i
-.obj/TimeBaseS.o .obj/TimeBaseS.so .shobj/TimeBaseS.o .shobj/TimeBaseS.so: TimeBaseS.cpp TimeBaseS.h TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i TimeBaseC.i \
- TimeBaseS_T.h TimeBaseS_T.i TimeBaseS_T.cpp TimeBaseS.i
-.obj/Principal.o .obj/Principal.so .shobj/Principal.o .shobj/Principal.so: Principal.cpp \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i
-.obj/Sequence.o .obj/Sequence.so .shobj/Sequence.o .shobj/Sequence.so: Sequence.cpp \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp
-.obj/Server_Request.o .obj/Server_Request.so .shobj/Server_Request.o .shobj/Server_Request.so: Server_Request.cpp \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h
-.obj/MProfile.o .obj/MProfile.so .shobj/MProfile.o .shobj/MProfile.so: MProfile.cpp \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i
-.obj/Stub.o .obj/Stub.so .shobj/Stub.o .shobj/Stub.so: Stub.cpp \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h
-.obj/Typecode.o .obj/Typecode.so .shobj/Typecode.o .shobj/Typecode.so: Typecode.cpp \
- $(TAO_ROOT)/tao/Typecode.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/CDR_Interpreter.h \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/debug.h
-.obj/ValueBase.o .obj/ValueBase.so .shobj/ValueBase.o .shobj/ValueBase.so: ValueBase.cpp \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i
-.obj/ValueFactory.o .obj/ValueFactory.so .shobj/ValueFactory.o .shobj/ValueFactory.so: ValueFactory.cpp \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/ValueFactory.i
-.obj/ValueFactory_Map.o .obj/ValueFactory_Map.so .shobj/ValueFactory_Map.o .shobj/ValueFactory_Map.so: ValueFactory_Map.cpp \
- $(TAO_ROOT)/tao/ValueFactory_Map.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/ValueFactory_Map.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i
-.obj/CDR.o .obj/CDR.so .shobj/CDR.o .shobj/CDR.so: CDR.cpp \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Marshal.i
-.obj/Client_Strategy_Factory.o .obj/Client_Strategy_Factory.so .shobj/Client_Strategy_Factory.o .shobj/Client_Strategy_Factory.so: Client_Strategy_Factory.cpp \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i
-.obj/debug.o .obj/debug.so .shobj/debug.o .shobj/debug.so: debug.cpp \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i
-.obj/Object_KeyC.o .obj/Object_KeyC.so .shobj/Object_KeyC.o .shobj/Object_KeyC.so: Object_KeyC.cpp \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i
-.obj/GIOP.o .obj/GIOP.so .shobj/GIOP.o .shobj/GIOP.so: GIOP.cpp \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- $(TAO_ROOT)/tao/GIOP_Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/GIOP_Server_Request.i \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i
-.obj/GIOP_Server_Request.o .obj/GIOP_Server_Request.so .shobj/GIOP_Server_Request.o .shobj/GIOP_Server_Request.so: GIOP_Server_Request.cpp \
- $(TAO_ROOT)/tao/GIOP_Server_Request.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/GIOP_Server_Request.i \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h
-.obj/Invocation.o .obj/Invocation.so .shobj/Invocation.o .shobj/Invocation.so: Invocation.cpp \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Connector_Registry.h
-.obj/Asynch_Invocation.o .obj/Asynch_Invocation.so .shobj/Asynch_Invocation.o .shobj/Asynch_Invocation.so: Asynch_Invocation.cpp \
- $(TAO_ROOT)/tao/Asynch_Invocation.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i
-.obj/ORB_Core.o .obj/ORB_Core.so .shobj/ORB_Core.o .shobj/ORB_Core.so: ORB_Core.cpp \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(ACE_ROOT)/ace/Env_Value_T.h \
- $(ACE_ROOT)/ace/Env_Value_T.i \
- $(ACE_ROOT)/ace/Env_Value_T.cpp \
- $(ACE_ROOT)/ace/Arg_Shifter.h \
- $(TAO_ROOT)/tao/TAO_Internal.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/default_resource.h \
- $(TAO_ROOT)/tao/default_resource.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Connector_Registry.h \
- $(TAO_ROOT)/tao/Acceptor_Registry.h \
- $(TAO_ROOT)/tao/Acceptor_Registry.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/INET_Addr.i
-.obj/params.o .obj/params.so .shobj/params.o .shobj/params.so: params.cpp \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h
-.obj/Resource_Factory.o .obj/Resource_Factory.so .shobj/Resource_Factory.o .shobj/Resource_Factory.so: Resource_Factory.cpp \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h
-.obj/Server_Strategy_Factory.o .obj/Server_Strategy_Factory.so .shobj/Server_Strategy_Factory.o .shobj/Server_Strategy_Factory.so: Server_Strategy_Factory.cpp \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i
-.obj/TAO_Internal.o .obj/TAO_Internal.so .shobj/TAO_Internal.o .shobj/TAO_Internal.so: TAO_Internal.cpp \
- $(TAO_ROOT)/tao/TAO_Internal.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_resource.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/default_resource.i \
- $(TAO_ROOT)/tao/IIOP_Factory.h \
- $(TAO_ROOT)/tao/UIOP_Factory.h
-.obj/Typecode_Constants.o .obj/Typecode_Constants.so .shobj/Typecode_Constants.o .shobj/Typecode_Constants.so: Typecode_Constants.cpp \
- $(TAO_ROOT)/tao/Typecode.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i
-.obj/IOR_LookupTable.o .obj/IOR_LookupTable.so .shobj/IOR_LookupTable.o .shobj/IOR_LookupTable.so: IOR_LookupTable.cpp \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/debug.h
-.obj/TAO.o .obj/TAO.so .shobj/TAO.o .shobj/TAO.so: TAO.cpp $(TAO_ROOT)/tao/TAO.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i
-.obj/Wait_Strategy.o .obj/Wait_Strategy.so .shobj/Wait_Strategy.o .shobj/Wait_Strategy.so: Wait_Strategy.cpp \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/debug.h
-.obj/Transport_Mux_Strategy.o .obj/Transport_Mux_Strategy.so .shobj/Transport_Mux_Strategy.o .shobj/Transport_Mux_Strategy.so: Transport_Mux_Strategy.cpp \
- $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i
-.obj/Reply_Dispatcher.o .obj/Reply_Dispatcher.so .shobj/Reply_Dispatcher.o .shobj/Reply_Dispatcher.so: Reply_Dispatcher.cpp \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp
-.obj/IOPC.o .obj/IOPC.so .shobj/IOPC.o .shobj/IOPC.so: IOPC.cpp \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.i
-.obj/IOPS.o .obj/IOPS.so .shobj/IOPS.o .shobj/IOPS.so: IOPS.cpp IOPS.h IOPC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/IOPC.i IOPS_T.h \
- IOPS_T.i IOPS_T.cpp IOPS.i
-.obj/PollableC.o .obj/PollableC.so .shobj/PollableC.o .shobj/PollableC.so: PollableC.cpp \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i
-.obj/PollableS.o .obj/PollableS.so .shobj/PollableS.o .shobj/PollableS.so: PollableS.cpp \
- $(TAO_ROOT)/tao/PollableS.h \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i
-.obj/CONV_FRAMEC.o .obj/CONV_FRAMEC.so .shobj/CONV_FRAMEC.o .shobj/CONV_FRAMEC.so: CONV_FRAMEC.cpp CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- CONV_FRAMEC.i $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.i
-.obj/CONV_FRAMES.o .obj/CONV_FRAMES.so .shobj/CONV_FRAMES.o .shobj/CONV_FRAMES.so: CONV_FRAMES.cpp CONV_FRAMES.h CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- CONV_FRAMEC.i CONV_FRAMES_T.h CONV_FRAMES_T.i CONV_FRAMES_T.cpp \
- CONV_FRAMES.i
-.obj/Tagged_Components.o .obj/Tagged_Components.so .shobj/Tagged_Components.o .shobj/Tagged_Components.so: Tagged_Components.cpp \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i
-.obj/Context.o .obj/Context.so .shobj/Context.o .shobj/Context.so: Context.cpp \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i
-.obj/Request.o .obj/Request.so .shobj/Request.o .shobj/Request.so: Request.cpp \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i
-.obj/Services.o .obj/Services.so .shobj/Services.o .shobj/Services.so: Services.cpp \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.i
-.obj/NVList.o .obj/NVList.so .shobj/NVList.o .shobj/NVList.so: NVList.cpp \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i
-.obj/ObjectIDList.o .obj/ObjectIDList.so .shobj/ObjectIDList.o .shobj/ObjectIDList.so: ObjectIDList.cpp ObjectIDList.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair.i \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- ObjectIDList.i
-.obj/MessagingC.o .obj/MessagingC.so .shobj/MessagingC.o .shobj/MessagingC.so: MessagingC.cpp \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Invocation.i
-.obj/MessagingS.o .obj/MessagingS.so .shobj/MessagingS.o .shobj/MessagingS.so: MessagingS.cpp \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i
-.obj/Policy_Manager.o .obj/Policy_Manager.so .shobj/Policy_Manager.o .shobj/Policy_Manager.so: Policy_Manager.cpp \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp
-.obj/Messaging_Policy_i.o .obj/Messaging_Policy_i.so .shobj/Messaging_Policy_i.o .shobj/Messaging_Policy_i.so: Messaging_Policy_i.cpp Messaging_Policy_i.h \
- MessagingS.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i TimeBaseS.h \
- TimeBaseC.h $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i TimeBaseC.i \
- TimeBaseS_T.h TimeBaseS_T.i TimeBaseS_T.cpp TimeBaseS.i POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- MessagingC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- MessagingC.i MessagingS.i \
- $(TAO_ROOT)/tao/Messaging_Policy_i.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
-.obj/DynAnyC.o .obj/DynAnyC.so .shobj/DynAnyC.o .shobj/DynAnyC.so: DynAnyC.cpp \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Stub.i
-.obj/DynAnyS.o .obj/DynAnyS.so .shobj/DynAnyS.o .shobj/DynAnyS.so: DynAnyS.cpp \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i
-.obj/DynAny_i.o .obj/DynAny_i.so .shobj/DynAny_i.o .shobj/DynAny_i.so: DynAny_i.cpp \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/DynStruct_i.h \
- $(TAO_ROOT)/tao/DynSequence_i.h \
- $(TAO_ROOT)/tao/DynEnum_i.h \
- $(TAO_ROOT)/tao/DynArray_i.h \
- $(TAO_ROOT)/tao/DynUnion_i.h \
- $(TAO_ROOT)/tao/DynUnion_i_T.h \
- $(TAO_ROOT)/tao/DynUnion_i_T.cpp \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
-.obj/DynArray_i.o .obj/DynArray_i.so .shobj/DynArray_i.o .shobj/DynArray_i.so: DynArray_i.cpp \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/DynArray_i.h \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h
-.obj/DynEnum_i.o .obj/DynEnum_i.so .shobj/DynEnum_i.o .shobj/DynEnum_i.so: DynEnum_i.cpp \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/DynEnum_i.h \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h
-.obj/DynSequence_i.o .obj/DynSequence_i.so .shobj/DynSequence_i.o .shobj/DynSequence_i.so: DynSequence_i.cpp \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/DynSequence_i.h \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h
-.obj/DynStruct_i.o .obj/DynStruct_i.so .shobj/DynStruct_i.o .shobj/DynStruct_i.so: DynStruct_i.cpp \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/DynStruct_i.h \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h
-.obj/DynUnion_i.o .obj/DynUnion_i.so .shobj/DynUnion_i.o .shobj/DynUnion_i.so: DynUnion_i.cpp \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/DynUnion_i.h \
- $(TAO_ROOT)/tao/DynUnion_i_T.h \
- $(TAO_ROOT)/tao/DynUnion_i_T.cpp \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h
-.obj/InconsistentTypeCodeC.o .obj/InconsistentTypeCodeC.so .shobj/InconsistentTypeCodeC.o .shobj/InconsistentTypeCodeC.so: InconsistentTypeCodeC.cpp \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/ORB.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
deleted file mode 100644
index e114196db6c..00000000000
--- a/TAO/tao/Makefile.am
+++ /dev/null
@@ -1,415 +0,0 @@
-##----------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile.am for TAO
-##----------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-POA_FILES = \
-	Object_Adapter.cpp \
-	Key_Adapters.cpp \
-	POA.cpp \
-	POAC.cpp \
-	POAS.cpp \
-	POAManager.cpp \
-	Active_Object_Map.cpp \
-	Servant_Base.cpp \
-	Forwarding_Servant.cpp
-
-PLUGGABLE_PROTOCOLS_FILES = \
-	Pluggable.cpp \
-	Connector_Registry.cpp \
-	Acceptor_Registry.cpp \
-	Protocol_Factory.cpp \
-	IIOP_Factory.cpp \
-	IIOP_Profile.cpp \
-	IIOP_Transport.cpp \
-	IIOP_Connector.cpp \
-	IIOP_Acceptor.cpp \
-	IIOP_Connect.cpp \
-	UIOP_Factory.cpp \
-	UIOP_Profile.cpp \
-	UIOP_Transport.cpp \
-	UIOP_Connector.cpp \
-	UIOP_Acceptor.cpp \
-	UIOP_Connect.cpp \
-	IORC.cpp \
-	IORS.cpp \
-	IORManipulation.cpp
-
-DEFAULT_RESOURCES_FILES = \
-	default_client.cpp \
-	default_server.cpp \
-	default_resource
-
-INTERPRETIVE_MARSHALING_FILES = \
-	append.cpp \
-	decode.cpp \
-	deep_free.cpp \
-	encode.cpp \
-	CDR_Interpreter.cpp \
-	Marshal.cpp \
-	skip.cpp
-
-IDL_COMPILER_FILES = \
-	Managed_Types.cpp \
-	Union.cpp \
-	Operation_Table.cpp
-
-ORB_CORE_FILES = \
-	Any.cpp \
-	CurrentC.cpp \
-	CurrentS.cpp \
-	Exception.cpp \
-	WrongTransactionC.cpp \
-	Environment.cpp \
-	Object.cpp \
-	ORB.cpp \
-	corbafwd.cpp \
-	PolicyC.cpp \
-	PolicyS.cpp \
-	DomainC.cpp \
-	DomainS.cpp \
-	TimeBaseC.cpp \
-	TimeBaseS.cpp \
-	Principal.cpp \
-	Sequence.cpp \
-	Server_Request.cpp \
-	MProfile.cpp \
-	Stub.cpp \
-	Typecode.cpp \
-	ValueBase.cpp \
-	ValueFactory.cpp \
-	ValueFactory_Map.cpp \
-	CDR.cpp \
-	Client_Strategy_Factory.cpp \
-	debug.cpp \
-	Object_KeyC.cpp \
-	GIOP.cpp \
-	GIOP_Server_Request.cpp \
-	Invocation.cpp \
-	ORB_Core.cpp \
-	params.cpp \
-	Resource_Factory.cpp \
-	Server_Strategy_Factory.cpp \
-	TAO_Internal.cpp \
-	Typecode_Constants.cpp \
-	IOR_LookupTable.cpp \
-	TAO.cpp \
-	Wait_Strategy.cpp \
-	Transport_Mux_Strategy.cpp \
-	Reply_Dispatcher.cpp \
-	IOPC.cpp \
-	IOPS.cpp \
-	CONV_FRAMEC.cpp \
-	CONV_FRAMES.cpp \
-	Tagged_Components.cpp \
-	Context.cpp \
-	Request.cpp \
-	Services.cpp \
-	NVList.cpp \
-	ObjectIDList.cpp \
-	MessagingC.cpp \
-	MessagingS.cpp \
-	Policy_Manager.cpp \
-	Messaging_Policy_i.cpp
-
-DYNAMIC_ANY_FILES = \
-	DynAnyC.cpp \
-	DynAnyS.cpp \
-	DynAny_i.cpp \
-	DynArray_i.cpp \
-	DynEnum_i.cpp \
-	DynSequence_i.cpp \
-	DynStruct_i.cpp \
-	DynUnion_i.cpp \
-	InconsistentTypeCodeC.cpp
-
-# Build a libtool library, libTAO.la for installation in libdir.
-lib_LTLIBRARIES = libTAO.la
-libTAO_la_SOURCES = \
-	$(POA_FILES) \
-	$(PLUGGABLE_PROTOCOLS_FILES) \
-	$(DEFAULT_RESOURCES_FILES) \
-	$(INTERPRETIVE_MARSHALING_FILES) \
-	$(IDL_COMPILER_FILES) \
-	$(ORB_CORE_FILES) \
-	$(DYNAMIC_ANY_FILES)
-
-## The following is an excerpt from the "libtool" manual, written by
-## Gordon Matzigkeit:
-##
-## This flag accepts an argument of the form `current[:revision[:age]]'. So,
-## passing `-version-info 3:12:1' sets current to 3, revision to 12, and age
-## to 1. 
-## If either revision or age are omitted, they default to 0. Also note that
-## age must be less than or equal to the current interface number. 
-##
-## Here are a set of rules to help you update your library version
-## information: 
-##
-##     1.Start with version information of `0:0:0' for each libtool library. 
-##     2.Update the version information only immediately before a public
-##       release of your software. More frequent updates are unnecessary, and
-##       only guarantee that the current interface number gets larger faster. 
-##     3.If the library source code has changed at all since the last update,
-##       then increment revision (`c:r:a' becomes `c:r+1:a'). 
-##     4.If any interfaces have been added, removed, or changed since the last
-##       update, increment current, and set revision to 0. 
-##     5.If any interfaces have been added since the last public release, then
-##       increment age. 
-##     6.If any interfaces have been removed since the last public release,
-##       then set age to 0. 
-##
-## Never try to set the interface numbers so that they correspond to the
-## release number of your package. This is an abuse that only fosters
-## misunderstanding of the purpose of library versions. Instead, use the
-## `-release' flag (see section 6.4 Managing release information), but be
-## warned that every release of your package will not be binary compatibility
-## with any other release. 
-
-## The below "-version-info" isn't being used the way libtool intends
-## it to be used but we do it that way to make the version numbers
-## that TAO uses match those created by libtool from "-version-info."
-##libTAO_la_LDFLAGS = -version-info 2:41:2   ## 2-2=0 --> libTAO.so.0.2.41
-libTAO_la_LDFLAGS = -version-info @TAO_CURRENT@:@TAO_REVISION@:@TAO_AGE@
-
-## These are source files that are needed by the header files if the
-## ACE_TEMPLATES_REQUIRE_SOURCE or ACE_TEMPLATES_REQUIRE_PRAGMA
-## macro is defined.
-if TEMPLATES_REQUIRE_SOURCE
-TEMPLATE_FILES = \
-	Acceptor_Impl.cpp \
-	CONV_FRAMES_T.cpp \
-	DomainS_T.cpp \
-	DynUnion_i_T.cpp \
-	IOPS_T.cpp \
-	MessagingS_T.cpp \
-	PollableS_T.cpp \
-	Sequence_T.cpp \
-	TimeBaseS_T.cpp \
-	varout.cpp
-else
-TEMPLATE_FILES = 
-endif
-
-pkgincludedir = $(prefix)/include/tao
-pkginclude_HEADERS = \
-        Acceptor_Impl.h \
-        Acceptor_Impl.i \
-        Acceptor_Registry.h \
-        Acceptor_Registry.i \
-        Active_Object_Map.h \
-        Active_Object_Map.i \
-        Any.h \
-        Any.i \
-        CDR.h \
-        CDR.i \
-        CDR_Interpreter.h \
-        CONV_FRAMEC.h \
-        CONV_FRAMEC.i \
-        CONV_FRAMES.h \
-        CONV_FRAMES.i \
-        CONV_FRAMES_T.h \
-        CONV_FRAMES_T.i \
-        Client_Strategy_Factory.h \
-        Connector_Registry.h \
-        Context.h \
-        Context.i \
-        CurrentC.h \
-        CurrentC.i \
-        DomainC.h \
-        DomainC.i \
-        DomainS_T.h \
-        DomainS_T.i \
-        DynAnyC.h \
-        DynAnyC.i \
-        DynAny_i.h \
-        DynArray_i.h \
-        DynEnum_i.h \
-        DynSequence_i.h \
-        DynStruct_i.h \
-        DynUnion_i.h \
-        DynUnion_i_T.h \
-        Environment.h \
-        Environment.i \
-        Exception.h \
-        Exception.i \
-        Forwarding_Servant.h \
-        GIOP.h \
-        GIOP.i \
-        GIOP_Server_Request.h \
-        GIOP_Server_Request.i \
-        IIOP_Acceptor.h \
-        IIOP_Acceptor.i \
-        IIOP_Connect.h \
-        IIOP_Connect.i \
-        IIOP_Connector.h \
-        IIOP_Factory.h \
-        IIOP_Profile.h \
-        IIOP_Profile.i \
-        IIOP_Transport.h \
-        IOPC.h \
-        IOPC.i \
-        IOPS.h \
-        IOPS.i \
-        IOPS_T.h \
-        IOPS_T.i \
-        IORC.h \
-        IORC.i \
-        IORManipulation.h \
-        IORS.h \
-        IORS.i \
-        IOR_LookupTable.h \
-        InconsistentTypeCodeC.h \
-        Invocation.h \
-        Invocation.i \
-        Key_Adapters.h \
-        Key_Adapters.i \
-        MProfile.h \
-        MProfile.i \
-        Managed_Types.h \
-        Managed_Types.i \
-        Marshal.h \
-        Marshal.i \
-        MessagingC.h \
-        MessagingC.i \
-        MessagingS.h \
-        MessagingS.i \
-        MessagingS_T.h \
-        MessagingS_T.i \
-        Messaging_Policy_i.h \
-        Messaging_Policy_i.i \
-        NVList.h \
-        NVList.i \
-        ORB.h \
-        ORB.i \
-        ORB_Core.h \
-        ORB_Core.i \
-        Object.h \
-        Object.i \
-        ObjectIDList.h \
-        ObjectIDList.i \
-        Object_Adapter.h \
-        Object_Adapter.i \
-        Object_KeyC.h \
-        Object_KeyC.i \
-        Operation_Table.h \
-        POA.h \
-        POA.i \
-        POAC.h \
-        POAC.i \
-        POAManager.h \
-        POAManager.i \
-        POAS.h \
-        POAS.i \
-        POA_CORBA.h \
-        Pluggable.h \
-        Pluggable.i \
-        PolicyC.h \
-        PolicyC.i \
-        Policy_Manager.h \
-        Policy_Manager.i \
-        PollableC.h \
-        PollableC.i \
-        PollableS.h \
-        PollableS.i \
-        PollableS_T.h \
-        PollableS_T.i \
-        Principal.h \
-        Principal.i \
-        Protocol_Factory.h \
-        Reply_Dispatcher.h \
-        Reply_Dispatcher.i \
-        Request.h \
-        Request.i \
-        Resource_Factory.h \
-        Sequence.h \
-        Sequence.i \
-        Sequence_T.h \
-        Sequence_T.i \
-        Servant_Base.h \
-        Servant_Base.i \
-        Server_Request.h \
-        Server_Request.i \
-        Server_Strategy_Factory.h \
-        Services.h \
-        Services.i \
-        Stub.h \
-        Stub.i \
-        TAO.h \
-        TAO_Internal.h \
-        Tagged_Components.h \
-        Tagged_Components.i \
-        TimeBaseC.h \
-        TimeBaseC.i \
-        TimeBaseS.h \
-        TimeBaseS.i \
-        TimeBaseS_T.h \
-        TimeBaseS_T.i \
-        Timeprobe.h \
-        Transport_Mux_Strategy.h \
-        Typecode.h \
-        Typecode.i \
-        UIOP_Acceptor.h \
-        UIOP_Connect.h \
-        UIOP_Connect.i \
-        UIOP_Connector.h \
-        UIOP_Factory.h \
-        UIOP_Profile.h \
-        UIOP_Profile.i \
-        UIOP_Transport.h \
-        Union.h \
-        ValueBase.h \
-        ValueBase.i \
-        ValueFactory.h \
-        ValueFactory.i \
-        ValueFactory_Map.h \
-        ValueFactory_Map.i \
-        Version.h \
-        Wait_Strategy.h \
-        WrongTransactionC.h \
-        corba.h \
-        corbafwd.h \
-        corbafwd.i \
-        debug.h \
-        default_client.h \
-        default_client.i \
-        default_resource.h \
-        default_resource.i \
-        default_server.h \
-        default_server.i \
-        orbconf.h \
-        params.h \
-        params.i \
-        poa_macros.h \
-        singletons.h \
-        try_macros.h \
-        varout.h \
-        varout.i \
-	$(TEMPLATE_FILES)
-## Make sure $(TEMPLATE_FILES) is in the above header list!
-
-
-## noinst_PROGRAMS = t-sizes
-
-## t_sizes_SOURCES = t-sizes.cpp
-
-EXTRA_DIST = \
-        t-sizes.cpp
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/tao/Makefile.bor b/TAO/tao/Makefile.bor
deleted file mode 100644
index 2cbaa9cdeb7..00000000000
--- a/TAO/tao/Makefile.bor
+++ /dev/null
@@ -1,115 +0,0 @@
-#
-# Makefile for building the TAO library
-#
-
-NAME = tao
-
-OBJFILES = \
-	$(OBJDIR)\Acceptor_Registry.obj \
-	$(OBJDIR)\Active_Object_Map.obj \
-	$(OBJDIR)\Any.obj \
-	$(OBJDIR)\append.obj \
-	$(OBJDIR)\CDR.obj \
-	$(OBJDIR)\CDR_Interpreter.obj \
-	$(OBJDIR)\Client_Strategy_Factory.obj \
-	$(OBJDIR)\Connector_Registry.obj \
-	$(OBJDIR)\Context.obj \
-	$(OBJDIR)\CONV_FRAMEC.obj \
-	$(OBJDIR)\CONV_FRAMES.obj \
-	$(OBJDIR)\corbafwd.obj \
-	$(OBJDIR)\CurrentC.obj \
-	$(OBJDIR)\CurrentS.obj \
-	$(OBJDIR)\debug.obj \
-	$(OBJDIR)\decode.obj \
-	$(OBJDIR)\deep_free.obj \
-	$(OBJDIR)\default_client.obj \
-	$(OBJDIR)\default_resource.obj \
-	$(OBJDIR)\default_server.obj \
-	$(OBJDIR)\DomainC.obj \
-	$(OBJDIR)\DomainS.obj \
-	$(OBJDIR)\DynAny_i.obj \
-	$(OBJDIR)\DynAnyC.obj \
-	$(OBJDIR)\DynAnyS.obj \
-	$(OBJDIR)\DynArray_i.obj \
-	$(OBJDIR)\DynEnum_i.obj \
-	$(OBJDIR)\DynSequence_i.obj \
-	$(OBJDIR)\DynStruct_i.obj \
-	$(OBJDIR)\DynUnion_i.obj \
-	$(OBJDIR)\encode.obj \
-	$(OBJDIR)\Environment.obj \
-	$(OBJDIR)\Exception.obj \
-	$(OBJDIR)\Forwarding_Servant.obj \
-	$(OBJDIR)\GIOP.obj \
-	$(OBJDIR)\GIOP_Server_Request.obj \
-	$(OBJDIR)\IIOP_Acceptor.obj \
-	$(OBJDIR)\IIOP_Connect.obj \
-	$(OBJDIR)\IIOP_Connector.obj \
-	$(OBJDIR)\IIOP_Factory.obj \
-	$(OBJDIR)\IIOP_Profile.obj \
-	$(OBJDIR)\IIOP_Transport.obj \
-	$(OBJDIR)\InconsistentTypeCodeC.obj \
-	$(OBJDIR)\Invocation.obj \
-	$(OBJDIR)\IOPC.obj \
-	$(OBJDIR)\IOPS.obj \
-	$(OBJDIR)\IOR_LookupTable.obj \
-	$(OBJDIR)\IORC.obj \
-	$(OBJDIR)\IORManipulation.obj \
-	$(OBJDIR)\IORS.obj \
-	$(OBJDIR)\Key_Adapters.obj \
-	$(OBJDIR)\Managed_Types.obj \
-	$(OBJDIR)\Marshal.obj \
-	$(OBJDIR)\Messaging_Policy_i.obj \
-	$(OBJDIR)\MessagingC.obj \
-	$(OBJDIR)\MessagingS.obj \
-	$(OBJDIR)\MProfile.obj \
-	$(OBJDIR)\NVList.obj \
-	$(OBJDIR)\Object.obj \
-	$(OBJDIR)\Object_Adapter.obj \
-	$(OBJDIR)\Object_KeyC.obj \
-	$(OBJDIR)\ObjectIDList.obj \
-	$(OBJDIR)\Operation_Table.obj \
-	$(OBJDIR)\ORB.obj \
-	$(OBJDIR)\ORB_Core.obj \
-	$(OBJDIR)\params.obj \
-	$(OBJDIR)\Pluggable.obj \
-	$(OBJDIR)\POA.obj \
-	$(OBJDIR)\POAC.obj \
-	$(OBJDIR)\POAManager.obj \
-	$(OBJDIR)\POAS.obj \
-	$(OBJDIR)\Policy_Manager.obj \
-	$(OBJDIR)\PolicyC.obj \
-	$(OBJDIR)\PolicyS.obj \
-	$(OBJDIR)\Principal.obj \
-	$(OBJDIR)\Protocol_Factory.obj \
-	$(OBJDIR)\Reply_Dispatcher.obj \
-	$(OBJDIR)\Request.obj \
-	$(OBJDIR)\Resource_Factory.obj \
-	$(OBJDIR)\Sequence.obj \
-	$(OBJDIR)\Servant_Base.obj \
-	$(OBJDIR)\Server_Request.obj \
-	$(OBJDIR)\Server_Strategy_Factory.obj \
-	$(OBJDIR)\Services.obj \
-	$(OBJDIR)\skip.obj \
-	$(OBJDIR)\Stub.obj \
-	$(OBJDIR)\Tagged_Components.obj \
-	$(OBJDIR)\TAO.obj \
-	$(OBJDIR)\TAO_Internal.obj \
-	$(OBJDIR)\TimeBaseC.obj \
-	$(OBJDIR)\TimeBaseS.obj \
-	$(OBJDIR)\Transport_Mux_Strategy.obj \
-	$(OBJDIR)\Typecode.obj \
-	$(OBJDIR)\Typecode_Constants.obj \
-	$(OBJDIR)\Union.obj \
-	$(OBJDIR)\ValueBase.obj \
-	$(OBJDIR)\ValueFactory.obj \
-	$(OBJDIR)\ValueFactory_Map.obj \
-	$(OBJDIR)\Wait_Strategy.obj \
-	$(OBJDIR)\WrongTransactionC.obj
-
-CFLAGS = $(ACE_CFLAGS) $(TAO_BUILD_CFLAGS) $(TAO_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = $(ACE_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
diff --git a/TAO/tao/Managed_Types.cpp b/TAO/tao/Managed_Types.cpp
deleted file mode 100644
index 1510168df07..00000000000
--- a/TAO/tao/Managed_Types.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-// $Id$
-
-#include "tao/Managed_Types.h"
-#include "tao/ORB.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/Managed_Types.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(tao, Managed_Types, "$Id$")
-
-// assignment from CORBA::String_var makes a copy
-TAO_String_Manager&
-TAO_String_Manager::operator= (const CORBA::String_var &var)
-{
-  CORBA::string_free (this->ptr_);
-  this->ptr_ = CORBA::string_dup (var.in ());
-  return *this;
-}
-
-// assignment from String_var
-TAO_SeqElem_String_Manager&
-TAO_SeqElem_String_Manager::operator= (const CORBA::String_var &var)
-{
-  if (this->release_)
-    CORBA::string_free (*this->ptr_);
-  *this->ptr_ = CORBA::string_dup (var.in ());
-  return *this;
-}
-
-// ****************************************************************
-
-TAO_WString_Manager&
-TAO_WString_Manager::operator= (const CORBA::WString_var &var)
-{
-  CORBA::wstring_free (this->ptr_);
-  this->ptr_ = CORBA::wstring_dup (var.in ());
-  return *this;
-}
-
-TAO_SeqElem_WString_Manager&
-TAO_SeqElem_WString_Manager::operator= (const CORBA::WString_var &var)
-{
-  if (this->release_)
-    CORBA::wstring_free (*this->ptr_);
-  *this->ptr_ = CORBA::wstring_dup (var.in ());
-  return *this;
-}
-
diff --git a/TAO/tao/Managed_Types.h b/TAO/tao/Managed_Types.h
deleted file mode 100644
index 5e94a7a86e1..00000000000
--- a/TAO/tao/Managed_Types.h
+++ /dev/null
@@ -1,334 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Managed_Types.h
-//
-// = AUTHOR
-//
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#ifndef TAO_MANAGED_TYPES_H
-#define TAO_MANAGED_TYPES_H
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/****************************************************************/
-
-class TAO_Export TAO_String_Manager
-{
-  // = TITLE
-  //   Manager for strings.
-  //
-  // = DESCRIPTION
-  //
-  //   This class implements the generic string manager and is used in the C++
-  //   mapping of "struct" members that are of type "string". The difference
-  //   between this class and the CORBA::String_var class is that the default
-  //   conctructor initializes the underlying string to an empty string in this
-  //   class whereas it is a NUL string for the _var class.
-  //
-public:
-
-  TAO_String_Manager (void);
-  // default CTOR will initialize the underlying ptr_ to empty string.
-
-  TAO_String_Manager (const TAO_String_Manager &);
-  // copy constructor
-
-  ~TAO_String_Manager (void);
-  // destructor
-
-  TAO_String_Manager &operator= (const TAO_String_Manager&);
-  // assignment from another managed type
-
-  TAO_String_Manager &operator= (const CORBA::String_var&);
-  // assignment from var type will make a copy
-
-  TAO_String_Manager &operator= (const char *);
-  // assignment from a constant char* will make a copy
-
-  TAO_String_Manager &operator= (char *);
-  // assignment from char* will not make a copy. The String_Manager will now
-  // own the string.
-
-  operator const char*() const;
-  // cast  (read-only)
-
-  const char *in (void) const;
-  // for in parameter.
-
-  char *&inout (void);
-  // for inout parameter.
-
-  char *&out (void);
-  // for out parameter.
-
-  char *_retn (void);
-  // for string of return type.
-
-private:
-  char *ptr_;
-  // The underlying string
-
-};
-
-/****************************************************************/
-
-class TAO_Export TAO_SeqElem_String_Manager
-{
-  // = TITLE
-  //   TAO_SeqElem_String_Manager
-  //
-  // = DESCRIPTION
-  //   Manager for strings that are the element type of sequences.
-  //
-  //   Similar to the mapping for sequences of objects (and other
-  //   pseudo objects) the mapping for sequences of strings requires
-  //   an auxiliar class or <Manager> to handle the allocation and
-  //   deallocation of the string.  The main difference with respect
-  //   to String_var classes is that automatic release is not
-  //   controlled on a per-item basis, but for the sequence as a
-  //   whole.  The difference wrt Object_Manager is that strings are
-  //   duplicated using CORBA::string_dup () as opposed to
-  //   T::_duplicate(), and released using CORBA::string_free()
-  //   instead of CORBA::release()
-  //
-  //   This class implements the generic string manager and is used to
-  //   instantiate the proper sequence types.
-  //
-  //   This class will have the same semantics as the string manager classes
-  //   defined earlier with respect to the various assignment
-  //   operators. However, the freeing of old storage will be dependent on the
-  //   "release" value of the parent sequence class.
-  //
-public:
-  friend class TAO_Unbounded_String_Sequence;
-
-  // @@ Giving friendship to a template is not implemented on several
-  // compilers:
-  // friend template<CORBA::ULong MAX>
-  //   class TAO_Bounded_String_Sequence<TAO_SeqElem_String_Manager,MAX>;
-
-  TAO_SeqElem_String_Manager (const TAO_SeqElem_String_Manager &);
-  // copy constructor
-
-  TAO_SeqElem_String_Manager (char **buffer, CORBA::Boolean release);
-  // constructor from address of an element
-
-  ~TAO_SeqElem_String_Manager (void);
-  // destructor
-
-  TAO_SeqElem_String_Manager &operator= (const TAO_SeqElem_String_Manager&);
-  // assignment from another managed type
-
-  TAO_SeqElem_String_Manager &operator= (const CORBA::String_var&);
-  // assignment from var type will make a copy
-
-  TAO_SeqElem_String_Manager &operator= (const char *);
-  // assignment from a constant char* will make a copy
-
-  TAO_SeqElem_String_Manager &operator= (char *);
-  // assignment from char* will not make a copy. The SeqElem_String_Manager will now
-  // own the string.
-
-  operator const char*() const;
-  // cast  (read-only)
-
-  const char *in (void) const;
-  // for in parameter.
-
-  char *&inout (void);
-  // for inout parameter.
-
-  char *&out (void);
-  // for out parameter.
-
-  char *_retn (void);
-  // for string of return type.
-
-private:
-  char **ptr_;
-  // Address of string element from the parent's buffer.
-
-  CORBA::Boolean release_;
-  // control memory managment semantics.
-
-  // following are now allowed since these managed class will be used only by
-  // the [] operator of the sequence class. The [] operator will not use the
-  // following ctors to instantiate the managed instance
-
-  TAO_SeqElem_String_Manager (void);
-  // default ctor
-
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_WString_Manager
-{
-  // = TITLE
-  //   Manager for wide strings.
-  //
-  // = DESCRIPTION
-  //
-  //   This class implements the generic wstring manager and is used
-  //   in the C++ mapping of "struct" members that are of type
-  //   "wstring".
-  //   The difference between this class and the CORBA::WString_var
-  //   class is that the default constructor initializes the
-  //   underlying wstring to an empty string in this class whereas it
-  //   is a NUL wstring for the _var class.
-  //
-public:
-
-  TAO_WString_Manager (void);
-  // default CTOR will initialize the underlying ptr_ to empty string.
-
-  TAO_WString_Manager (const TAO_WString_Manager &);
-  // copy constructor
-
-  ~TAO_WString_Manager (void);
-  // destructor
-
-  TAO_WString_Manager &operator= (const TAO_WString_Manager&);
-  // assignment from another managed type
-
-  TAO_WString_Manager &operator= (const CORBA::WString_var&);
-  // assignment from var type will make a copy
-
-  TAO_WString_Manager &operator= (const CORBA::WChar *);
-  // assignment from a constant wchar* will make a copy
-
-  TAO_WString_Manager &operator= (CORBA::WChar *);
-  // assignment from wchar* will not make a copy. The WString_Manager
-  // will now own the string.
-
-  operator const CORBA::WChar*() const;
-  // cast  (read-only)
-
-  const CORBA::WChar *in (void) const;
-  // for in parameter.
-
-  CORBA::WChar *&inout (void);
-  // for inout parameter.
-
-  CORBA::WChar *&out (void);
-  // for out parameter.
-
-  CORBA::WChar *_retn (void);
-  // for string of return type.
-
-private:
-  CORBA::WChar *ptr_;
-  // The underlying wide string
-
-};
-
-/****************************************************************/
-
-class TAO_Export TAO_SeqElem_WString_Manager
-{
-  // = TITLE
-  //   TAO_SeqElem_WString_Manager
-  //
-  // = DESCRIPTION
-  //   Manager for strings that are the element type of sequences.
-  //
-  //   Similar to the mapping for sequences of objects (and other
-  //   pseudo objects) the mapping for sequences of strings requires
-  //   an auxiliar class or <Manager> to handle the allocation and
-  //   deallocation of the string.  The main difference with respect
-  //   to WString_var classes is that automatic release is not
-  //   controlled on a per-item basis, but for the sequence as a
-  //   whole.  The difference wrt Object_Manager is that strings are
-  //   duplicated using CORBA::WString_dup () as opposed to
-  //   T::_duplicate(), and released using CORBA::WString_free()
-  //   instead of CORBA::release()
-  //
-  //   This class implements the generic string manager and is used to
-  //   instantiate the proper sequence types.
-  //
-  //   This class will have the same semantics as the string manager
-  //   classes defined earlier with respect to the various assignment
-  //   operators. However, the freeing of old storage will be
-  //   dependent on the "release" value of the parent sequence class.
-  //
-public:
-  friend class TAO_Unbounded_WString_Sequence;
-
-  // @@ Giving friendship to a template is not implemented on several
-  // compilers:
-  // friend template<CORBA::ULong MAX>
-  //   class TAO_Bounded_WString_Sequence<TAO_SeqElem_WString_Manager,MAX>;
-
-  TAO_SeqElem_WString_Manager (CORBA::WChar **buffer,
-                               CORBA::Boolean release);
-  // constructor from address of an element
-
-  ~TAO_SeqElem_WString_Manager (void);
-  // destructor
-
-  TAO_SeqElem_WString_Manager &operator= (const TAO_SeqElem_WString_Manager&);
-  // assignment from another managed type
-
-  TAO_SeqElem_WString_Manager &operator= (const CORBA::WString_var&);
-  // assignment from var type will make a copy
-
-  TAO_SeqElem_WString_Manager &operator= (const CORBA::WChar *);
-  // assignment from a constant char* will make a copy
-
-  TAO_SeqElem_WString_Manager &operator= (CORBA::WChar *);
-  // assignment from char* will not make a copy. The
-  // SeqElem_WString_Manager will now own the string.
-
-  operator const CORBA::WChar*() const;
-  // cast  (read-only)
-
-  const CORBA::WChar *in (void) const;
-  // for in parameter.
-
-  CORBA::WChar *&inout (void);
-  // for inout parameter.
-
-  CORBA::WChar *&out (void);
-  // for out parameter.
-
-  CORBA::WChar *_retn (void);
-  // for string of return type.
-
-private:
-  CORBA::WChar **ptr_;
-  // Address of string element from the parent's buffer.
-
-  CORBA::Boolean release_;
-  // control memory managment semantics.
-
-  // following are now allowed since these managed class will be used only by
-  // the [] operator of the sequence class. The [] operator will not use the
-  // following ctors to instantiate the managed instance
-
-  TAO_SeqElem_WString_Manager (void);
-  // default ctor
-
-  TAO_SeqElem_WString_Manager (const TAO_SeqElem_WString_Manager &);
-  // copy constructor
-
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao/Managed_Types.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_MANAGED_TYPES_H */
diff --git a/TAO/tao/Managed_Types.i b/TAO/tao/Managed_Types.i
deleted file mode 100644
index 3a0ebc62897..00000000000
--- a/TAO/tao/Managed_Types.i
+++ /dev/null
@@ -1,363 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Managed_Types.i
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-// ****************************************************************
-
-// default CTOR initializes to empty string
-ACE_INLINE
-TAO_String_Manager::TAO_String_Manager (void)
-  :  ptr_ (CORBA::string_dup (""))
-{
-}
-
-// copy ctor copies storage
-ACE_INLINE
-TAO_String_Manager::TAO_String_Manager (const TAO_String_Manager &rhs)
-  :  ptr_ (CORBA::string_dup (rhs.ptr_))
-{
-}
-
-// destructor
-ACE_INLINE
-TAO_String_Manager::~TAO_String_Manager (void)
-{
-  CORBA::string_free (this->ptr_);
-}
-
-// assignment
-ACE_INLINE TAO_String_Manager&
-TAO_String_Manager::operator= (const TAO_String_Manager &rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  CORBA::string_free (this->ptr_);
-  this->ptr_ = CORBA::string_dup (rhs.ptr_);
-  return *this;
-}
-
-// assignment from const char* makes a copy
-ACE_INLINE TAO_String_Manager &
-TAO_String_Manager::operator= (const char * p)
-{
-  CORBA::string_free (this->ptr_);
-  this->ptr_ = CORBA::string_dup (p);
-  return *this;
-}
-
-// assignment from char* owns the string
-ACE_INLINE TAO_String_Manager &
-TAO_String_Manager::operator= (char * p)
-{
-  CORBA::string_free (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-TAO_String_Manager::operator const char* (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const char *
-TAO_String_Manager::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE char *&
-TAO_String_Manager::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE char *&
-TAO_String_Manager::out (void)
-{
-  CORBA::string_free (this->ptr_);
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE char *
-TAO_String_Manager::_retn (void)
-{
-  char *temp = this->ptr_;
-  this->ptr_ = 0;
-  return temp;
-}
-
-// ****************************************************************
-
-// copy ctor
-ACE_INLINE
-TAO_SeqElem_String_Manager::
-TAO_SeqElem_String_Manager (const TAO_SeqElem_String_Manager &rhs)
-  :  ptr_ (rhs.ptr_),
-     release_ (rhs.release_)
-{
-}
-
-ACE_INLINE
-TAO_SeqElem_String_Manager::TAO_SeqElem_String_Manager (char **buffer,
-                                                        CORBA::Boolean release)
-  :  ptr_ (buffer),
-     release_ (release)
-{
-}
-
-ACE_INLINE
-TAO_SeqElem_String_Manager::~TAO_SeqElem_String_Manager (void)
-{
-}
-
-// assignment
-ACE_INLINE TAO_SeqElem_String_Manager&
-TAO_SeqElem_String_Manager::operator= (const TAO_SeqElem_String_Manager &rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  if (this->release_)
-    CORBA::string_free (*this->ptr_);
-  *this->ptr_ = CORBA::string_dup (*rhs.ptr_);
-  return *this;
-}
-
-// assignment from const char* will make copy
-ACE_INLINE TAO_SeqElem_String_Manager &
-TAO_SeqElem_String_Manager::operator= (const char *p)
-{
-  if (this->release_)
-    CORBA::string_free (*this->ptr_);
-  *this->ptr_ = CORBA::string_dup (p);
-  return *this;
-}
-
-// assignment from char* will own it
-ACE_INLINE TAO_SeqElem_String_Manager &
-TAO_SeqElem_String_Manager::operator= (char *p)
-{
-  if (this->release_)
-    CORBA::string_free (*this->ptr_);
-  *this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-TAO_SeqElem_String_Manager::operator const char* (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const char *
-TAO_SeqElem_String_Manager::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE char *&
-TAO_SeqElem_String_Manager::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE char *&
-TAO_SeqElem_String_Manager::out (void)
-{
-  CORBA::string_free (*this->ptr_);
-  *this->ptr_ = 0;
-  return *this->ptr_;
-}
-
-ACE_INLINE char *
-TAO_SeqElem_String_Manager::_retn (void)
-{
-  char *temp = *this->ptr_;
-  *this->ptr_ = 0;
-  return temp;
-}
-
-// ****************************************************************
-
-// default CTOR initializes to empty string
-ACE_INLINE
-TAO_WString_Manager::TAO_WString_Manager (void)
-  :  ptr_ (0) // @@ CORBA::wstring_dup (""))
-{
-}
-
-// copy ctor copies storage
-ACE_INLINE
-TAO_WString_Manager::TAO_WString_Manager (const TAO_WString_Manager &rhs)
-  :  ptr_ (CORBA::wstring_dup (rhs.ptr_))
-{
-}
-
-// destructor
-ACE_INLINE
-TAO_WString_Manager::~TAO_WString_Manager (void)
-{
-  CORBA::wstring_free (this->ptr_);
-}
-
-// assignment
-ACE_INLINE TAO_WString_Manager&
-TAO_WString_Manager::operator= (const TAO_WString_Manager &rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  CORBA::wstring_free (this->ptr_);
-  this->ptr_ = CORBA::wstring_dup (rhs.ptr_);
-  return *this;
-}
-
-// assignment from const CORBA::WChar* makes a copy
-ACE_INLINE TAO_WString_Manager &
-TAO_WString_Manager::operator= (const CORBA::WChar * p)
-{
-  CORBA::wstring_free (this->ptr_);
-  this->ptr_ = CORBA::wstring_dup (p);
-  return *this;
-}
-
-// assignment from CORBA::WChar* owns the string
-ACE_INLINE TAO_WString_Manager &
-TAO_WString_Manager::operator= (CORBA::WChar * p)
-{
-  CORBA::wstring_free (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-TAO_WString_Manager::operator const CORBA::WChar* (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const CORBA::WChar *
-TAO_WString_Manager::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::WChar *&
-TAO_WString_Manager::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::WChar *&
-TAO_WString_Manager::out (void)
-{
-  CORBA::wstring_free (this->ptr_);
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::WChar *
-TAO_WString_Manager::_retn (void)
-{
-  CORBA::WChar *temp = this->ptr_;
-  this->ptr_ = 0;
-  return temp;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_SeqElem_WString_Manager::
-    TAO_SeqElem_WString_Manager (CORBA::WChar **buffer,
-                                 CORBA::Boolean release)
-  :  ptr_ (buffer),
-     release_ (release)
-{
-}
-
-ACE_INLINE
-TAO_SeqElem_WString_Manager::~TAO_SeqElem_WString_Manager (void)
-{
-}
-
-// assignment
-ACE_INLINE TAO_SeqElem_WString_Manager&
-TAO_SeqElem_WString_Manager::operator= (const TAO_SeqElem_WString_Manager &rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  if (this->release_)
-    CORBA::wstring_free (*this->ptr_);
-  *this->ptr_ = CORBA::wstring_dup (*rhs.ptr_);
-  return *this;
-}
-
-// assignment from const CORBA::WChar* will make copy
-ACE_INLINE TAO_SeqElem_WString_Manager &
-TAO_SeqElem_WString_Manager::operator= (const CORBA::WChar *p)
-{
-  if (this->release_)
-    CORBA::wstring_free (*this->ptr_);
-  *this->ptr_ = CORBA::wstring_dup (p);
-  return *this;
-}
-
-// assignment from CORBA::WChar* will own it
-ACE_INLINE TAO_SeqElem_WString_Manager &
-TAO_SeqElem_WString_Manager::operator= (CORBA::WChar *p)
-{
-  if (this->release_)
-    CORBA::wstring_free (*this->ptr_);
-  *this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-TAO_SeqElem_WString_Manager::operator const CORBA::WChar* (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const CORBA::WChar *
-TAO_SeqElem_WString_Manager::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::WChar *&
-TAO_SeqElem_WString_Manager::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::WChar *&
-TAO_SeqElem_WString_Manager::out (void)
-{
-  CORBA::wstring_free (*this->ptr_);
-  *this->ptr_ = 0;
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::WChar *
-TAO_SeqElem_WString_Manager::_retn (void)
-{
-  CORBA::WChar *temp = *this->ptr_;
-  *this->ptr_ = 0;
-  return temp;
-}
diff --git a/TAO/tao/Marshal.cpp b/TAO/tao/Marshal.cpp
deleted file mode 100644
index 97675134fab..00000000000
--- a/TAO/tao/Marshal.cpp
+++ /dev/null
@@ -1,123 +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/singletons.h"
-#include "tao/CDR.h"
-#include "tao/Environment.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Marshal.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, Marshal, "$Id$")
-
-TAO_Marshal_Factory* TAO_Marshal::DEFAULT_MARSHAL_FACTORY = 0;
-
-void
-TAO_Marshal::init (void)
-{
-  DEFAULT_MARSHAL_FACTORY = TAO_MARSHAL_FACTORY::instance();
-}
-
-// cosntructor for the factory
-TAO_Marshal_Factory::TAO_Marshal_Factory (void)
-{
-  // initialize the mobj table
-  mobj_table_[CORBA::tk_null].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_void].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_short].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_long].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_ushort].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_ulong].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_float].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_double].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_boolean].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_char].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_octet].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_any].obj_ = TAO_MARSHAL_ANY::instance ();
-  mobj_table_[CORBA::tk_TypeCode].obj_ = TAO_MARSHAL_TYPECODE::instance ();
-  mobj_table_[CORBA::tk_Principal].obj_ = TAO_MARSHAL_PRINCIPAL::instance ();
-  mobj_table_[CORBA::tk_objref].obj_ = TAO_MARSHAL_OBJREF::instance ();
-  mobj_table_[CORBA::tk_struct].obj_ = TAO_MARSHAL_STRUCT::instance ();
-  mobj_table_[CORBA::tk_union].obj_ = TAO_MARSHAL_UNION::instance ();
-  mobj_table_[CORBA::tk_enum].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_string].obj_ = TAO_MARSHAL_STRING::instance ();
-  mobj_table_[CORBA::tk_sequence].obj_ = TAO_MARSHAL_SEQUENCE::instance ();
-  mobj_table_[CORBA::tk_array].obj_ = TAO_MARSHAL_ARRAY::instance ();
-  mobj_table_[CORBA::tk_alias].obj_ = TAO_MARSHAL_ALIAS::instance ();
-  mobj_table_[CORBA::tk_except].obj_ = TAO_MARSHAL_EXCEPT::instance ();
-  mobj_table_[CORBA::tk_longlong].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_ulonglong].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_longdouble].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_wchar].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_wstring].obj_ = TAO_MARSHAL_WSTRING::instance ();
-}
-
-TAO_Marshal_Factory::~TAO_Marshal_Factory (void)
-{
-}
-
-// Factory method that returns the appropriate marshal object based on
-// the kind of the typecode.
-TAO_Marshal_Object *
-TAO_Marshal_Factory::make_marshal_object (CORBA::TypeCode_ptr tc,
-                                          CORBA::Environment &ACE_TRY_ENV)
-{
-  if (tc && tc->kind_ >= 0 && tc->kind_ < CORBA::TC_KIND_COUNT)
-    return this->mobj_table_[tc->kind_].obj_;
-  ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-}
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<TAO_Marshal_Factory, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_Primitive, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_Any, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_TypeCode, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_Principal, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_ObjRef, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_Struct, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_Union, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_String, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_Sequence, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_Array, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_Alias, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_Except, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_WString, ACE_SYNCH_RECURSIVE_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<TAO_Marshal_Factory, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_Primitive, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_Any, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_TypeCode, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_Principal, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_ObjRef, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_Struct, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_Union, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_String, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_Sequence, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_Array, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_Alias, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_Except, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_WString, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Marshal.h b/TAO/tao/Marshal.h
deleted file mode 100644
index ab4ea402a28..00000000000
--- a/TAO/tao/Marshal.h
+++ /dev/null
@@ -1,648 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Marshal.h
-//
-// = DESCRIPTION
-//     Classes that marshal various IDL data types.
-//
-// = AUTHOR
-//     Aniruddha S. Gokhale
-//
-// ============================================================================
-
-#ifndef TAO_MARSHAL_H
-#define TAO_MARSHAL_H
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Typecode.h"
-#include "tao/Principal.h"
-#include "tao/Any.h"
-#include "tao/ORB.h"
-
-class TAO_OutputCDR;
-class TAO_InputCDR;
-
-CORBA::TypeCode::traverse_status
-DEEP_COPY (CORBA::TypeCode_ptr  param,
-           const void *source,
-           const void *dest,
-           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-CORBA::TypeCode::traverse_status
-DEEP_FREE (CORBA::TypeCode_ptr  param,
-           const void *source,
-           const void *dest,
-           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-// = 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_Export TAO_Marshal_Factory
-{
-  // = TITLE
-  // A Factory for generating specialized marshaling objects
-  //
-  // = DESCRIPTION
-public:
-  TAO_Marshal_Factory (void);
-  // constructor
-
-  virtual ~TAO_Marshal_Factory (void);
-  // destructor
-
-  virtual TAO_Marshal_Object *make_marshal_object (CORBA::TypeCode_ptr tc,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // Factory method that returns the appropriate marshal object.
-
-private:
-  struct TAO_Marshal_Object_Entry
-  {
-    TAO_Marshal_Object *obj_;
-  };
-
-  TAO_Marshal_Object_Entry mobj_table_[CORBA::TC_KIND_COUNT];
-  // A table of specialized marshal objects indexed by the kind_ field
-
-};
-
-class TAO_Export TAO_Marshal
-{
-  // = TITLE
-  //    Namespace in which to put otherwise "global" methods like
-  //    initialize, etc.
-public:
-  static void init (void);
-  // initializaton method to initialize all the marshaling objects and
-  // populating them in the Factory.
-
-  static TAO_Marshal_Factory* DEFAULT_MARSHAL_FACTORY;
-  // default marshaling factory that uses the interpretive marshaling engine of
-  // TAO.
-};
-
-class TAO_Export TAO_Marshal_Object
-{
-  // = TITLE
-  //   TAO_Marshal_Object
-  //
-  // = DESCRIPTION
-  //    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 encoding, decoding
-  //    and deep_freeing.
-public:
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-  // encoding operation
-
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-  // decoding operation
-
-  virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                                 void *context,
-                                                 CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-  // skip operation
-
-  virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
-                                                   TAO_InputCDR *src,
-                                                   TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-  // append operation
-
-  TAO_Marshal_Object (void);
-  // constructor
-
-  virtual ~TAO_Marshal_Object (void);
-  // destructor
-};
-
-class TAO_Export TAO_Marshal_Primitive: public TAO_Marshal_Object
-{
-  // = TITLE
-  //   TAO_Marshal_Primitive
-  // = DESCRIPTION
-  //   marshaling primitives
-public:
-  TAO_Marshal_Primitive (void);
-
-  virtual ~TAO_Marshal_Primitive (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                                 void *context,
-                                                 CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // skip operation
-
-  virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
-                                                   TAO_InputCDR *src,
-                                                   TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // append operation
-
-};
-
-class TAO_Export TAO_Marshal_Any: public TAO_Marshal_Object
-{
-  // = TITLE
-  //   TAO_Marshal_Any
-  // = DESCRIPTION
-  //   Marshal an Any
-public:
-  TAO_Marshal_Any (void);
-
-  virtual ~TAO_Marshal_Any (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *source,
-                                                  const void *,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                                 void *context,
-                                                 CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // skip operation
-
-  virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
-                                                   TAO_InputCDR *src,
-                                                   TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // append operation
-
-};
-
-class TAO_Export TAO_Marshal_TypeCode: public TAO_Marshal_Object
-{
-  // = TITLE
-  //   TAO_Marshal_TypeCode
-  // = DESCRIPTION
-  //   marshal a typecode
-public:
-  TAO_Marshal_TypeCode (void);
-
-  virtual ~TAO_Marshal_TypeCode (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                                 void *context,
-                                                 CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // skip operation
-
-  virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
-                                                   TAO_InputCDR *src,
-                                                   TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // append operation
-
-};
-
-class TAO_Export TAO_Marshal_Principal: public TAO_Marshal_Object
-{
-  // = TITLE
-  //   TAO_Marshal_Principal
-  // = DESCRIPTION
-  //   marshal a principal
-public:
-  TAO_Marshal_Principal (void);
-
-  virtual ~TAO_Marshal_Principal (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                                 void *context,
-                                                 CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // skip operation
-
-  virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
-                                                   TAO_InputCDR *src,
-                                                   TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // append operation
-
-};
-
-class TAO_Export TAO_Marshal_ObjRef: public TAO_Marshal_Object
-{
-  // = TITLE
-  //   TAO_Marshal_ObjRef
-  // = DESCRIPTION
-  //   marshal an object reference
-public:
-  TAO_Marshal_ObjRef (void);
-
-  virtual ~TAO_Marshal_ObjRef (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                                 void *context,
-                                                 CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // skip operation
-
-  virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
-                                                   TAO_InputCDR *src,
-                                                   TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // append operation
-
-};
-
-class TAO_Export TAO_Marshal_Struct: public TAO_Marshal_Object
-{
-  // = TITLE
-  //   TAO_Marshal_Struct
-  // = DESCRIPTION
-  //   marshal a struct
-public:
-  TAO_Marshal_Struct (void);
-
-  virtual ~TAO_Marshal_Struct (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                                 void *context,
-                                                 CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // skip operation
-
-  virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
-                                                   TAO_InputCDR *src,
-                                                   TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // append operation
-
-};
-
-class TAO_Export TAO_Marshal_Union: public TAO_Marshal_Object
-{
-  // = TITLE
-  //   TAO_Marshal_Union
-  // = DESCRIPTION
-  //   marshal a union
-public:
-  TAO_Marshal_Union (void);
-
-  virtual ~TAO_Marshal_Union (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                                 void *context,
-                                                 CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // skip operation
-
-  virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
-                                                   TAO_InputCDR *src,
-                                                   TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // append operation
-
-};
-
-class TAO_Export TAO_Marshal_String: public TAO_Marshal_Object
-{
-  // = TITLE
-  //   TAO_Marshal_String
-  // = DESCRIPTION
-  //   marshal a string
-public:
-  TAO_Marshal_String (void);
-
-  virtual ~TAO_Marshal_String (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                                 void *context,
-                                                 CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // skip operation
-
-  virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
-                                                   TAO_InputCDR *src,
-                                                   TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // append operation
-
-};
-
-class TAO_Export TAO_Marshal_Sequence: public TAO_Marshal_Object
-{
-  // = TITLE
-  //   TAO_Marshal_Sequence
-  // = DESCRIPTION
-  //   marshal a sequence
-public:
-  TAO_Marshal_Sequence (void);
-
-  virtual ~TAO_Marshal_Sequence (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                                 void *context,
-                                                 CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // skip operation
-
-  virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
-                                                   TAO_InputCDR *src,
-                                                   TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // append operation
-
-};
-
-class TAO_Export TAO_Marshal_Array: public TAO_Marshal_Object
-{
-  // = TITLE
-  //   TAO_Marshal_Array
-  // = DESCRIPTION
-  //   marshal an array
-public:
-  TAO_Marshal_Array (void);
-
-  virtual ~TAO_Marshal_Array (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                                 void *context,
-                                                 CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // skip operation
-
-  virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
-                                                   TAO_InputCDR *src,
-                                                   TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // append operation
-
-};
-
-class TAO_Export TAO_Marshal_Alias: public TAO_Marshal_Object
-{
-  // = TITLE
-  //   TAO_Marshal_Alias
-  // = DESCRIPTION
-  //   marshal an alias
-public:
-  TAO_Marshal_Alias (void);
-
-  virtual ~TAO_Marshal_Alias (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                                 void *context,
-                                                 CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // skip operation
-
-  virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
-                                                   TAO_InputCDR *src,
-                                                   TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // append operation
-
-};
-
-class TAO_Export TAO_Marshal_Except: public TAO_Marshal_Object
-{
-  // = TITLE
-  //   TAO_Marshal_Except
-  // = DESCRIPTION
-  //   marshal an exception
-public:
-  TAO_Marshal_Except (void);
-  ~TAO_Marshal_Except (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                                 void *context,
-                                                 CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // skip operation
-
-  virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
-                                                   TAO_InputCDR *src,
-                                                   TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // append operation
-
-};
-
-class TAO_Export TAO_Marshal_WString : public TAO_Marshal_Object
-{
-  // = TITLE
-  //   TAO_Marshal_WString
-  // = DESCRIPTION
-  //   marshal a wide string
-public:
-  TAO_Marshal_WString (void);
-  ~TAO_Marshal_WString (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                                 void *context,
-                                                 CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // skip operation
-
-  virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
-                                                   TAO_InputCDR *src,
-                                                   TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // append operation
-
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Marshal.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_MARSHAL_H */
diff --git a/TAO/tao/Marshal.i b/TAO/tao/Marshal.i
deleted file mode 100644
index 1d95143e76d..00000000000
--- a/TAO/tao/Marshal.i
+++ /dev/null
@@ -1,211 +0,0 @@
-//$Id$
-ACE_INLINE
-TAO_Marshal_Object::TAO_Marshal_Object (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Object::~TAO_Marshal_Object (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Primitive::TAO_Marshal_Primitive (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Primitive::~TAO_Marshal_Primitive (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Any::TAO_Marshal_Any (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Any::~TAO_Marshal_Any (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Principal::TAO_Marshal_Principal (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Principal::~TAO_Marshal_Principal (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_TypeCode::TAO_Marshal_TypeCode (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_TypeCode::~TAO_Marshal_TypeCode (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_ObjRef::TAO_Marshal_ObjRef (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_ObjRef::~TAO_Marshal_ObjRef (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Struct::TAO_Marshal_Struct (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Struct::~TAO_Marshal_Struct (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Union::TAO_Marshal_Union (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Union::~TAO_Marshal_Union (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_String::TAO_Marshal_String (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_String::~TAO_Marshal_String (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Sequence::TAO_Marshal_Sequence (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Sequence::~TAO_Marshal_Sequence (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Array::TAO_Marshal_Array (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Array::~TAO_Marshal_Array (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Alias::TAO_Marshal_Alias (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Alias::~TAO_Marshal_Alias (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Except::TAO_Marshal_Except (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Except::~TAO_Marshal_Except (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_WString::TAO_Marshal_WString (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_WString::~TAO_Marshal_WString (void)
-{
-}
-
-// *************** deep_free methods ******************
-
-// deep_free for Any
-ACE_INLINE CORBA::TypeCode::traverse_status
-TAO_Marshal_Any::deep_free (CORBA::TypeCode_ptr,
-                            const void *source,
-                            const void *,
-                            CORBA::Environment &)
-{
-  ((CORBA::Any *) source)->~CORBA_Any ();
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// deep_free for TypeCode
-ACE_INLINE CORBA::TypeCode::traverse_status
-TAO_Marshal_TypeCode::deep_free (CORBA::TypeCode_ptr,
-                                 const void *source,
-                                 const void *,
-                                 CORBA::Environment &)
-{
-  CORBA::release (*(CORBA::TypeCode_ptr *) source);
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// deep_free for Principal
-ACE_INLINE CORBA::TypeCode::traverse_status
-TAO_Marshal_Principal::deep_free (CORBA::TypeCode_ptr,
-                                  const void *value,
-                                  const void *,
-                                  CORBA::Environment &)
-{
-  CORBA::release (*(CORBA::Principal_ptr *) value);
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// deep_free for ObjRef
-ACE_INLINE CORBA::TypeCode::traverse_status
-TAO_Marshal_ObjRef::deep_free (CORBA::TypeCode_ptr,
-                               const void *source,
-                               const void *,
-                               CORBA::Environment &)
-{
-  CORBA::Object_ptr obj = *(CORBA::Object_ptr *)source;
-  CORBA::release (obj);
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// deep_free for string
-ACE_INLINE CORBA::TypeCode::traverse_status
-TAO_Marshal_String::deep_free (CORBA::TypeCode_ptr,
-                               const void *source,
-                               const void *,
-                               CORBA::Environment &)
-{
-  CORBA::string_free (*(CORBA::Char* *) source);
-  *(CORBA::Char* *)source = 0;
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// deep_free for wstring
-ACE_INLINE CORBA::TypeCode::traverse_status
-TAO_Marshal_WString::deep_free (CORBA::TypeCode_ptr,
-                                const void *source,
-                                const void *,
-                                CORBA::Environment &)
-{
-  CORBA::wstring_free (*(CORBA::WChar* *) source);
-  *(CORBA::WChar* *)source = 0;
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
diff --git a/TAO/tao/Messaging.pidl b/TAO/tao/Messaging.pidl
deleted file mode 100644
index 71f05360ae6..00000000000
--- a/TAO/tao/Messaging.pidl
+++ /dev/null
@@ -1,203 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   Policy.pidl
-//
-// = DESCRIPTION
-//   This file was used to generate the code in Messaging{C,S,S_T}.{h,i,cpp}
-//   The code is then hand-crafted to compile it inside the ORB, avoid
-//   cyclic dependencies and enforce the locality constraints on
-//   certain objects.
-//
-// ================================================================
-
-#pragma prefix "omg.org"
-
-#include "TimeBase.pidl"
-#include "IOP.pidl"
-#include "Policy.pidl"
-#include "Pollable.pidl"
-
-module Messaging
-{
-  //
-  // Messaging Quality of Service
-  //
-
-  typedef short RebindMode;
-  const RebindMode TRANSPARENT  = 0;
-  const RebindMode NO_REBIND    = 1;
-  const RebindMode NO_RECONNECT = 2;
-
-  typedef short SyncScope;
-  const SyncScope SYNC_NONE           = 0;
-  const SyncScope SYNC_WITH_TRANSPORT = 1;
-  const SyncScope SYNC_WITH_SERVER    = 2;
-  const SyncScope SYNC_WITH_TARGET    = 3;
-
-  typedef short RoutingType;
-  const RoutingType ROUTE_NONE              = 0;
-  const RoutingType ROUTE_FORWARD           = 1;
-  const RoutingType ROUTE_STORE_AND_FORWARD = 2;
-
-  typedef TimeBase::TimeT Timeout;
-
-  typedef short Priority;
-
-  typedef unsigned short Ordering;
-  const Ordering ORDER_ANY      = 0x01;
-  const Ordering ORDER_TEMPORAL = 0x02;
-  const Ordering ORDER_PRIORITY = 0x04;
-  const Ordering ORDER_DEADLINE = 0x08;
-
-  //
-  // Locally-Constrained Policy Objects
-  //
-
-  // Rebind Policy (default = TRANSPARENT)
-  const CORBA::PolicyType REBIND_POLICY_TYPE = 23;
-  interface RebindPolicy : CORBA::Policy {
-    readonly attribute RebindMode rebind_mode;
-  };
-
-  // Synchronization Policy (default = WITH_TRANSPORT)
-  const CORBA::PolicyType SYNC_SCOPE_POLICY_TYPE = 24;
-  interface SyncScopePolicy : CORBA::Policy {
-    readonly attribute SyncScope synchronization;
-  };
-
-  // Priority Policies
-  const CORBA::PolicyType REQUEST_PRIORITY_POLICY_TYPE = 25;
-  struct PriorityRange {
-    Priority min;
-    Priority max;
-  };
-  interface RequestPriorityPolicy : CORBA::Policy {
-    readonly attribute PriorityRange priority_range;
-  };
-  const CORBA::PolicyType REPLY_PRIORITY_POLICY_TYPE = 26;
-  interface ReplyPriorityPolicy : CORBA::Policy {
-    readonly attribute PriorityRange priority_range;
-  };
-
-  // Timeout Policies
-  const CORBA::PolicyType REQUEST_START_TIME_POLICY_TYPE = 27;
-  interface RequestStartTimePolicy : CORBA::Policy {
-    readonly attribute TimeBase::UtcT start_time;
-  };
-  const CORBA::PolicyType REQUEST_END_TIME_POLICY_TYPE = 28;
-  interface RequestEndTimePolicy : CORBA::Policy {
-    readonly attribute TimeBase::UtcT end_time;
-  };
-
-  const CORBA::PolicyType REPLY_START_TIME_POLICY_TYPE = 29;
-  interface ReplyStartTimePolicy : CORBA::Policy {
-    readonly attribute TimeBase::UtcT start_time;
-  };
-  const CORBA::PolicyType REPLY_END_TIME_POLICY_TYPE = 30;
-  interface ReplyEndTimePolicy : CORBA::Policy {
-    readonly attribute TimeBase::UtcT end_time;
-  };
-
-  const CORBA::PolicyType RELATIVE_REQ_TIMEOUT_POLICY_TYPE = 31;
-  interface RelativeRequestTimeoutPolicy : CORBA::Policy {
-    readonly attribute TimeBase::TimeT relative_expiry;
-  };
-
-  const CORBA::PolicyType RELATIVE_RT_TIMEOUT_POLICY_TYPE = 32;
-  interface RelativeRoundtripTimeoutPolicy : CORBA::Policy {
-    readonly attribute TimeBase::TimeT relative_expiry;
-  };
-
-  const CORBA::PolicyType ROUTING_POLICY_TYPE = 33;
-  struct RoutingTypeRange {
-    RoutingType min;
-    RoutingType max;
-  };
-  interface RoutingPolicy : CORBA::Policy {
-    readonly attribute RoutingTypeRange routing_range;
-  };
-
-  const CORBA::PolicyType MAX_HOPS_POLICY_TYPE = 34;
-  interface MaxHopsPolicy : CORBA::Policy {
-    readonly attribute unsigned short max_hops;
-  };
-
-  // Router Delivery-ordering Policy (default = ORDER_TEMPORAL)
-  const CORBA::PolicyType QUEUE_ORDER_POLICY_TYPE = 35;
-  interface QueueOrderPolicy : CORBA::Policy {
-    readonly attribute Ordering allowed_orders;
-  };
-
-  //
-  // Propagation of QoS Policies
-  //
-
-  struct PolicyValue {
-    CORBA::PolicyType ptype;
-    sequence<octet>   pvalue;
-  };
-  typedef sequence<PolicyValue> PolicyValueSeq;
-
-  const IOP::ComponentId TAG_POLICIES      = 2;
-  const IOP::ServiceId INVOCATION_POLICIES = 2;
-
-  //
-  // Exception Delivery in the Callback Model
-  //
-#if defined(NO_VALUE)
-  struct ExceptionHolder {
-    boolean         is_system_exception;
-    boolean         byte_order;
-    sequence<octet> marshaled_exception;
-  };
-#else
-  value ExceptionHolder {
-    boolean         is_system_exception;
-    boolean         byte_order;
-    sequence<octet> marshaled_exception;
-  };
-#endif
-
-  //
-  // Base interface for the Callback model
-  //
-
-  interface ReplyHandler { };
-
-  //
-  // Base value for the Polling model
-  //
-
-#if defined(NO_VALUE)
-  interface Poller : CORBA::Pollable {
-    readonly attribute Object  operation_target;
-    readonly attribute string  operation_name;
-
-    attribute ReplyHandler     associated_handler;
-    readonly attribute boolean is_from_poller;
-
-    readonly attribute Object  target;
-    readonly attribute string  op_name;
-  };
-#else
-  value Poller supports CORBA::Pollable {
-    readonly attribute Object  operation_target;
-    readonly attribute string  operation_name;
-
-    attribute ReplyHandler     associated_handler;
-    readonly attribute boolean is_from_poller;
-
-    Object                     target;
-    string                     op_name;
-  };
-#endif
-};
-
-#pragma prefix ""
diff --git a/TAO/tao/MessagingC.cpp b/TAO/tao/MessagingC.cpp
deleted file mode 100644
index c079033d2b4..00000000000
--- a/TAO/tao/MessagingC.cpp
+++ /dev/null
@@ -1,2214 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "tao/MessagingC.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-
-#include "tao/MessagingS.h"
-#include "tao/POA_CORBA.h"
-#include "tao/Stub.h"
-#include "tao/Invocation.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/MessagingC.i"
-#endif /* !defined INLINE */
-
-ACE_RCSID(tao, MessagingC, "$Id$")
-
-static const CORBA::Long _oc_Messaging_RebindMode[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x62696e64), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:Messaging/RebindMode:1.0
-  11, ACE_NTOHL (0x52656269), ACE_NTOHL (0x6e644d6f), ACE_NTOHL (0x64650000),  // name = RebindMode
-  CORBA::tk_short,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RebindMode (CORBA::tk_alias, sizeof (_oc_Messaging_RebindMode), (char *) &_oc_Messaging_RebindMode, 0, sizeof (Messaging::RebindMode));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RebindMode, &_tc_TAO_tc_Messaging_RebindMode)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, TRANSPARENT, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, NO_REBIND, 1)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, NO_RECONNECT, 2)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_Messaging_SyncScope[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  28, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5379), ACE_NTOHL (0x6e635363), ACE_NTOHL (0x6f70653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:Messaging/SyncScope:1.0
-  10, ACE_NTOHL (0x53796e63), ACE_NTOHL (0x53636f70), ACE_NTOHL (0x65000000),  // name = SyncScope
-  CORBA::tk_short,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_SyncScope (CORBA::tk_alias, sizeof (_oc_Messaging_SyncScope), (char *) &_oc_Messaging_SyncScope, 0, sizeof (Messaging::SyncScope));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_SyncScope, &_tc_TAO_tc_Messaging_SyncScope)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_NONE, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_WITH_TRANSPORT, 1)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_WITH_SERVER, 2)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_WITH_TARGET, 3)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_Messaging_RoutingType[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f526f), ACE_NTOHL (0x7574696e), ACE_NTOHL (0x67547970), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:Messaging/RoutingType:1.0
-  12, ACE_NTOHL (0x526f7574), ACE_NTOHL (0x696e6754), ACE_NTOHL (0x79706500),  // name = RoutingType
-  CORBA::tk_short,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RoutingType (CORBA::tk_alias, sizeof (_oc_Messaging_RoutingType), (char *) &_oc_Messaging_RoutingType, 0, sizeof (Messaging::RoutingType));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RoutingType, &_tc_TAO_tc_Messaging_RoutingType)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, ROUTE_NONE, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, ROUTE_FORWARD, 1)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, ROUTE_STORE_AND_FORWARD, 2)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_Messaging_Timeout[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  26, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5469), ACE_NTOHL (0x6d656f75), ACE_NTOHL (0x743a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:Messaging/Timeout:1.0
-  8, ACE_NTOHL (0x54696d65), ACE_NTOHL (0x6f757400),  // name = Timeout
-  CORBA::tk_alias, // typecode kind for typedefs
-  56, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x42617365), ACE_NTOHL (0x2f54696d), ACE_NTOHL (0x65543a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-    6, ACE_NTOHL (0x54696d65), ACE_NTOHL (0x54000000),  // name = TimeT
-    CORBA::tk_ulonglong,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_Timeout (CORBA::tk_alias, sizeof (_oc_Messaging_Timeout), (char *) &_oc_Messaging_Timeout, 0, sizeof (Messaging::Timeout));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Timeout, &_tc_TAO_tc_Messaging_Timeout)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_Messaging_Priority[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5072), ACE_NTOHL (0x696f7269), ACE_NTOHL (0x74793a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:Messaging/Priority:1.0
-  9, ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x0),  // name = Priority
-  CORBA::tk_short,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_Priority (CORBA::tk_alias, sizeof (_oc_Messaging_Priority), (char *) &_oc_Messaging_Priority, 0, sizeof (Messaging::Priority));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Priority, &_tc_TAO_tc_Messaging_Priority)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_Messaging_Ordering[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f4f72), ACE_NTOHL (0x64657269), ACE_NTOHL (0x6e673a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:Messaging/Ordering:1.0
-  9, ACE_NTOHL (0x4f726465), ACE_NTOHL (0x72696e67), ACE_NTOHL (0x0),  // name = Ordering
-  CORBA::tk_ushort,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_Ordering (CORBA::tk_alias, sizeof (_oc_Messaging_Ordering), (char *) &_oc_Messaging_Ordering, 0, sizeof (Messaging::Ordering));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Ordering, &_tc_TAO_tc_Messaging_Ordering)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::UShort)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::UShort, ORDER_ANY, 1)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::UShort)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::UShort, ORDER_TEMPORAL, 2)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::UShort)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::UShort, ORDER_PRIORITY, 4)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::UShort)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::UShort, ORDER_DEADLINE, 8)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, REBIND_POLICY_TYPE,
-                      TAO_MESSAGING_REBIND_POLICY_TYPE)
-TAO_NAMESPACE_END
-Messaging::RebindPolicy_ptr Messaging::RebindPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::RebindPolicy::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/RebindPolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Messaging::RebindPolicy::_nil ());
-  if (is_a == 0)
-    return Messaging::RebindPolicy::_nil ();
-  return Messaging::RebindPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-Messaging::RebindPolicy_ptr Messaging::RebindPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  if (CORBA::is_nil (obj))
-    return Messaging::RebindPolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:Messaging/RebindPolicy:1.0");
-  if (servant == 0)
-    ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::RebindPolicy::_nil ());
-  return new POA_Messaging::_tao_collocated_RebindPolicy(
-      ACE_reinterpret_cast(POA_Messaging::RebindPolicy_ptr, servant),
-      stub
-    );
-}
-
-CORBA::Boolean Messaging::RebindPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RebindPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
-}
-
-const char* Messaging::RebindPolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/RebindPolicy:1.0";
-}
-
-static const CORBA::Long _oc_Messaging_RebindPolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x62696e64), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63793a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:Messaging/RebindPolicy:1.0
-  13, ACE_NTOHL (0x52656269), ACE_NTOHL (0x6e64506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x0),  // name = RebindPolicy,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RebindPolicy (CORBA::tk_objref, sizeof (_oc_Messaging_RebindPolicy), (char *) &_oc_Messaging_RebindPolicy, 0, sizeof (Messaging::RebindPolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RebindPolicy, &_tc_TAO_tc_Messaging_RebindPolicy)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, SYNC_SCOPE_POLICY_TYPE,
-                      TAO_MESSAGING_SYNC_SCOPE_POLICY_TYPE)
-TAO_NAMESPACE_END
-Messaging::SyncScopePolicy_ptr Messaging::SyncScopePolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::SyncScopePolicy::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/SyncScopePolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Messaging::SyncScopePolicy::_nil ());
-  if (is_a == 0)
-    return Messaging::SyncScopePolicy::_nil ();
-  return Messaging::SyncScopePolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-Messaging::SyncScopePolicy_ptr Messaging::SyncScopePolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  if (CORBA::is_nil (obj))
-    return Messaging::SyncScopePolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:Messaging/SyncScopePolicy:1.0");
-  if (servant == 0)
-    ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::SyncScopePolicy::_nil ());
-  return new POA_Messaging::_tao_collocated_SyncScopePolicy(
-      ACE_reinterpret_cast(POA_Messaging::SyncScopePolicy_ptr, servant),
-      stub
-    );
-}
-
-CORBA::Boolean Messaging::SyncScopePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/SyncScopePolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
-}
-
-const char* Messaging::SyncScopePolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/SyncScopePolicy:1.0";
-}
-
-static const CORBA::Long _oc_Messaging_SyncScopePolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5379), ACE_NTOHL (0x6e635363), ACE_NTOHL (0x6f706550), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:Messaging/SyncScopePolicy:1.0
-  16, ACE_NTOHL (0x53796e63), ACE_NTOHL (0x53636f70), ACE_NTOHL (0x65506f6c), ACE_NTOHL (0x69637900),  // name = SyncScopePolicy,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_SyncScopePolicy (CORBA::tk_objref, sizeof (_oc_Messaging_SyncScopePolicy), (char *) &_oc_Messaging_SyncScopePolicy, 0, sizeof (Messaging::SyncScopePolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_SyncScopePolicy, &_tc_TAO_tc_Messaging_SyncScopePolicy)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, REQUEST_PRIORITY_POLICY_TYPE,
-                      TAO_MESSAGING_REQUEST_PRIORITY_POLICY_TYPE)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_Messaging_PriorityRange[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5072), ACE_NTOHL (0x696f7269), ACE_NTOHL (0x74795261), ACE_NTOHL (0x6e67653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:Messaging/PriorityRange:1.0
-  14, ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x52616e67), ACE_NTOHL (0x65000000),  // name = PriorityRange
-  2, // member count
-    4, ACE_NTOHL (0x6d696e00),  // name = min
-    CORBA::tk_alias, // typecode kind for typedefs
-    56, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5072), ACE_NTOHL (0x696f7269), ACE_NTOHL (0x74793a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:Messaging/Priority:1.0
-      9, ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x0),  // name = Priority
-      CORBA::tk_short,
-
-    4, ACE_NTOHL (0x6d617800),  // name = max
-    CORBA::tk_alias, // typecode kind for typedefs
-    56, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5072), ACE_NTOHL (0x696f7269), ACE_NTOHL (0x74793a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:Messaging/Priority:1.0
-      9, ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x0),  // name = Priority
-      CORBA::tk_short,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_PriorityRange (CORBA::tk_struct, sizeof (_oc_Messaging_PriorityRange), (char *) &_oc_Messaging_PriorityRange, 0, sizeof (Messaging::PriorityRange));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PriorityRange, &_tc_TAO_tc_Messaging_PriorityRange)
-TAO_NAMESPACE_END
-Messaging::RequestPriorityPolicy_ptr Messaging::RequestPriorityPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::RequestPriorityPolicy::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/RequestPriorityPolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Messaging::RequestPriorityPolicy::_nil ());
-  if (is_a == 0)
-    return Messaging::RequestPriorityPolicy::_nil ();
-  return Messaging::RequestPriorityPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-Messaging::RequestPriorityPolicy_ptr Messaging::RequestPriorityPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  if (CORBA::is_nil (obj))
-    return Messaging::RequestPriorityPolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:Messaging/RequestPriorityPolicy:1.0");
-  if (servant == 0)
-    ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::RequestPriorityPolicy::_nil ());
-  return new POA_Messaging::_tao_collocated_RequestPriorityPolicy(
-      ACE_reinterpret_cast(POA_Messaging::RequestPriorityPolicy_ptr, servant),
-      stub
-    );
-}
-
-CORBA::Boolean Messaging::RequestPriorityPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RequestPriorityPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
-}
-
-const char* Messaging::RequestPriorityPolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/RequestPriorityPolicy:1.0";
-}
-
-static const CORBA::Long _oc_Messaging_RequestPriorityPolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x71756573), ACE_NTOHL (0x74507269), ACE_NTOHL (0x6f726974), ACE_NTOHL (0x79506f6c), ACE_NTOHL (0x6963793a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:Messaging/RequestPriorityPolicy:1.0
-  22, ACE_NTOHL (0x52657175), ACE_NTOHL (0x65737450), ACE_NTOHL (0x72696f72), ACE_NTOHL (0x69747950), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x79000000),  // name = RequestPriorityPolicy,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RequestPriorityPolicy (CORBA::tk_objref, sizeof (_oc_Messaging_RequestPriorityPolicy), (char *) &_oc_Messaging_RequestPriorityPolicy, 0, sizeof (Messaging::RequestPriorityPolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RequestPriorityPolicy, &_tc_TAO_tc_Messaging_RequestPriorityPolicy)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, REPLY_PRIORITY_POLICY_TYPE,
-                      TAO_MESSAGING_REPLY_PRIORITY_POLICY_TYPE)
-TAO_NAMESPACE_END
-Messaging::ReplyPriorityPolicy_ptr Messaging::ReplyPriorityPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::ReplyPriorityPolicy::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/ReplyPriorityPolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Messaging::ReplyPriorityPolicy::_nil ());
-  if (is_a == 0)
-    return Messaging::ReplyPriorityPolicy::_nil ();
-  return Messaging::ReplyPriorityPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-Messaging::ReplyPriorityPolicy_ptr Messaging::ReplyPriorityPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  if (CORBA::is_nil (obj))
-    return Messaging::ReplyPriorityPolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:Messaging/ReplyPriorityPolicy:1.0");
-  if (servant == 0)
-    ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::ReplyPriorityPolicy::_nil ());
-  return new POA_Messaging::_tao_collocated_ReplyPriorityPolicy(
-      ACE_reinterpret_cast(POA_Messaging::ReplyPriorityPolicy_ptr, servant),
-      stub
-    );
-}
-
-CORBA::Boolean Messaging::ReplyPriorityPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/ReplyPriorityPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
-}
-
-const char* Messaging::ReplyPriorityPolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/ReplyPriorityPolicy:1.0";
-}
-
-static const CORBA::Long _oc_Messaging_ReplyPriorityPolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x706c7950), ACE_NTOHL (0x72696f72), ACE_NTOHL (0x69747950), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:Messaging/ReplyPriorityPolicy:1.0
-  20, ACE_NTOHL (0x5265706c), ACE_NTOHL (0x79507269), ACE_NTOHL (0x6f726974), ACE_NTOHL (0x79506f6c), ACE_NTOHL (0x69637900),  // name = ReplyPriorityPolicy,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyPriorityPolicy (CORBA::tk_objref, sizeof (_oc_Messaging_ReplyPriorityPolicy), (char *) &_oc_Messaging_ReplyPriorityPolicy, 0, sizeof (Messaging::ReplyPriorityPolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ReplyPriorityPolicy, &_tc_TAO_tc_Messaging_ReplyPriorityPolicy)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, REQUEST_START_TIME_POLICY_TYPE,
-                      TAO_MESSAGING_REQUEST_START_TIME_POLICY_TYPE)
-TAO_NAMESPACE_END
-Messaging::RequestStartTimePolicy_ptr Messaging::RequestStartTimePolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::RequestStartTimePolicy::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/RequestStartTimePolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Messaging::RequestStartTimePolicy::_nil ());
-  if (is_a == 0)
-    return Messaging::RequestStartTimePolicy::_nil ();
-  return Messaging::RequestStartTimePolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-Messaging::RequestStartTimePolicy_ptr Messaging::RequestStartTimePolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  if (CORBA::is_nil (obj))
-    return Messaging::RequestStartTimePolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:Messaging/RequestStartTimePolicy:1.0");
-  if (servant == 0)
-    ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::RequestStartTimePolicy::_nil ());
-  return new POA_Messaging::_tao_collocated_RequestStartTimePolicy(
-      ACE_reinterpret_cast(POA_Messaging::RequestStartTimePolicy_ptr, servant),
-      stub
-    );
-}
-
-CORBA::Boolean Messaging::RequestStartTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RequestStartTimePolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
-}
-
-const char* Messaging::RequestStartTimePolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/RequestStartTimePolicy:1.0";
-}
-
-static const CORBA::Long _oc_Messaging_RequestStartTimePolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  41, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x71756573), ACE_NTOHL (0x74537461), ACE_NTOHL (0x72745469), ACE_NTOHL (0x6d65506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:Messaging/RequestStartTimePolicy:1.0
-  23, ACE_NTOHL (0x52657175), ACE_NTOHL (0x65737453), ACE_NTOHL (0x74617274), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63790000),  // name = RequestStartTimePolicy,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RequestStartTimePolicy (CORBA::tk_objref, sizeof (_oc_Messaging_RequestStartTimePolicy), (char *) &_oc_Messaging_RequestStartTimePolicy, 0, sizeof (Messaging::RequestStartTimePolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RequestStartTimePolicy, &_tc_TAO_tc_Messaging_RequestStartTimePolicy)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, REQUEST_END_TIME_POLICY_TYPE,
-                      TAO_MESSAGING_REQUEST_END_TIME_POLICY_TYPE)
-TAO_NAMESPACE_END
-Messaging::RequestEndTimePolicy_ptr Messaging::RequestEndTimePolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::RequestEndTimePolicy::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/RequestEndTimePolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Messaging::RequestEndTimePolicy::_nil ());
-  if (is_a == 0)
-    return Messaging::RequestEndTimePolicy::_nil ();
-  return Messaging::RequestEndTimePolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-Messaging::RequestEndTimePolicy_ptr Messaging::RequestEndTimePolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  if (CORBA::is_nil (obj))
-    return Messaging::RequestEndTimePolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:Messaging/RequestEndTimePolicy:1.0");
-  if (servant == 0)
-    ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::RequestEndTimePolicy::_nil ());
-  return new POA_Messaging::_tao_collocated_RequestEndTimePolicy(
-      ACE_reinterpret_cast(POA_Messaging::RequestEndTimePolicy_ptr, servant),
-      stub
-    );
-}
-
-CORBA::Boolean Messaging::RequestEndTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RequestEndTimePolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
-}
-
-const char* Messaging::RequestEndTimePolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/RequestEndTimePolicy:1.0";
-}
-
-static const CORBA::Long _oc_Messaging_RequestEndTimePolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x71756573), ACE_NTOHL (0x74456e64), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63793a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:Messaging/RequestEndTimePolicy:1.0
-  21, ACE_NTOHL (0x52657175), ACE_NTOHL (0x65737445), ACE_NTOHL (0x6e645469), ACE_NTOHL (0x6d65506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x0),  // name = RequestEndTimePolicy,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RequestEndTimePolicy (CORBA::tk_objref, sizeof (_oc_Messaging_RequestEndTimePolicy), (char *) &_oc_Messaging_RequestEndTimePolicy, 0, sizeof (Messaging::RequestEndTimePolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RequestEndTimePolicy, &_tc_TAO_tc_Messaging_RequestEndTimePolicy)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, REPLY_START_TIME_POLICY_TYPE,
-                      TAO_MESSAGING_REPLY_START_TIME_POLICY_TYPE)
-TAO_NAMESPACE_END
-Messaging::ReplyStartTimePolicy_ptr Messaging::ReplyStartTimePolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::ReplyStartTimePolicy::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/ReplyStartTimePolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Messaging::ReplyStartTimePolicy::_nil ());
-  if (is_a == 0)
-    return Messaging::ReplyStartTimePolicy::_nil ();
-  return Messaging::ReplyStartTimePolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-Messaging::ReplyStartTimePolicy_ptr Messaging::ReplyStartTimePolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  if (CORBA::is_nil (obj))
-    return Messaging::ReplyStartTimePolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:Messaging/ReplyStartTimePolicy:1.0");
-  if (servant == 0)
-    ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::ReplyStartTimePolicy::_nil ());
-  return new POA_Messaging::_tao_collocated_ReplyStartTimePolicy(
-      ACE_reinterpret_cast(POA_Messaging::ReplyStartTimePolicy_ptr, servant),
-      stub
-    );
-}
-
-CORBA::Boolean Messaging::ReplyStartTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/ReplyStartTimePolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
-}
-
-const char* Messaging::ReplyStartTimePolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/ReplyStartTimePolicy:1.0";
-}
-
-static const CORBA::Long _oc_Messaging_ReplyStartTimePolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x706c7953), ACE_NTOHL (0x74617274), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63793a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:Messaging/ReplyStartTimePolicy:1.0
-  21, ACE_NTOHL (0x5265706c), ACE_NTOHL (0x79537461), ACE_NTOHL (0x72745469), ACE_NTOHL (0x6d65506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x0),  // name = ReplyStartTimePolicy,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyStartTimePolicy (CORBA::tk_objref, sizeof (_oc_Messaging_ReplyStartTimePolicy), (char *) &_oc_Messaging_ReplyStartTimePolicy, 0, sizeof (Messaging::ReplyStartTimePolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ReplyStartTimePolicy, &_tc_TAO_tc_Messaging_ReplyStartTimePolicy)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, REPLY_END_TIME_POLICY_TYPE,
-                      TAO_MESSAGING_REPLY_END_TIME_POLICY_TYPE)
-TAO_NAMESPACE_END
-Messaging::ReplyEndTimePolicy_ptr Messaging::ReplyEndTimePolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::ReplyEndTimePolicy::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/ReplyEndTimePolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Messaging::ReplyEndTimePolicy::_nil ());
-  if (is_a == 0)
-    return Messaging::ReplyEndTimePolicy::_nil ();
-  return Messaging::ReplyEndTimePolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-Messaging::ReplyEndTimePolicy_ptr Messaging::ReplyEndTimePolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  if (CORBA::is_nil (obj))
-    return Messaging::ReplyEndTimePolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:Messaging/ReplyEndTimePolicy:1.0");
-  if (servant == 0)
-    ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::ReplyEndTimePolicy::_nil ());
-  return new POA_Messaging::_tao_collocated_ReplyEndTimePolicy(
-      ACE_reinterpret_cast(POA_Messaging::ReplyEndTimePolicy_ptr, servant),
-      stub
-    );
-}
-
-CORBA::Boolean Messaging::ReplyEndTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/ReplyEndTimePolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
-}
-
-const char* Messaging::ReplyEndTimePolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/ReplyEndTimePolicy:1.0";
-}
-
-static const CORBA::Long _oc_Messaging_ReplyEndTimePolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x706c7945), ACE_NTOHL (0x6e645469), ACE_NTOHL (0x6d65506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:Messaging/ReplyEndTimePolicy:1.0
-  19, ACE_NTOHL (0x5265706c), ACE_NTOHL (0x79456e64), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63790000),  // name = ReplyEndTimePolicy,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyEndTimePolicy (CORBA::tk_objref, sizeof (_oc_Messaging_ReplyEndTimePolicy), (char *) &_oc_Messaging_ReplyEndTimePolicy, 0, sizeof (Messaging::ReplyEndTimePolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ReplyEndTimePolicy, &_tc_TAO_tc_Messaging_ReplyEndTimePolicy)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, RELATIVE_REQ_TIMEOUT_POLICY_TYPE,
-                      TAO_MESSAGING_RELATIVE_REQ_TIMEOUT_POLICY_TYPE)
-TAO_NAMESPACE_END
-Messaging::RelativeRequestTimeoutPolicy_ptr Messaging::RelativeRequestTimeoutPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::RelativeRequestTimeoutPolicy::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/RelativeRequestTimeoutPolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Messaging::RelativeRequestTimeoutPolicy::_nil ());
-  if (is_a == 0)
-    return Messaging::RelativeRequestTimeoutPolicy::_nil ();
-  return Messaging::RelativeRequestTimeoutPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-Messaging::RelativeRequestTimeoutPolicy_ptr Messaging::RelativeRequestTimeoutPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  if (CORBA::is_nil (obj))
-    return Messaging::RelativeRequestTimeoutPolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:Messaging/RelativeRequestTimeoutPolicy:1.0");
-  if (servant == 0)
-    ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::RelativeRequestTimeoutPolicy::_nil ());
-  return new POA_Messaging::_tao_collocated_RelativeRequestTimeoutPolicy(
-      ACE_reinterpret_cast(POA_Messaging::RelativeRequestTimeoutPolicy_ptr, servant),
-      stub
-    );
-}
-
-CORBA::Boolean Messaging::RelativeRequestTimeoutPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RelativeRequestTimeoutPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
-}
-
-const char* Messaging::RelativeRequestTimeoutPolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/RelativeRequestTimeoutPolicy:1.0";
-}
-
-static const CORBA::Long _oc_Messaging_RelativeRequestTimeoutPolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  47, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x6c617469), ACE_NTOHL (0x76655265), ACE_NTOHL (0x71756573), ACE_NTOHL (0x7454696d), ACE_NTOHL (0x656f7574), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63793a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:Messaging/RelativeRequestTimeoutPolicy:1.0
-  29, ACE_NTOHL (0x52656c61), ACE_NTOHL (0x74697665), ACE_NTOHL (0x52657175), ACE_NTOHL (0x65737454), ACE_NTOHL (0x696d656f), ACE_NTOHL (0x7574506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x0),  // name = RelativeRequestTimeoutPolicy,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RelativeRequestTimeoutPolicy (CORBA::tk_objref, sizeof (_oc_Messaging_RelativeRequestTimeoutPolicy), (char *) &_oc_Messaging_RelativeRequestTimeoutPolicy, 0, sizeof (Messaging::RelativeRequestTimeoutPolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RelativeRequestTimeoutPolicy, &_tc_TAO_tc_Messaging_RelativeRequestTimeoutPolicy)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-                      TAO_MESSAGING_RELATIVE_RT_TIMEOUT_POLICY_TYPE)
-TAO_NAMESPACE_END
-Messaging::RelativeRoundtripTimeoutPolicy_ptr Messaging::RelativeRoundtripTimeoutPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Messaging::RelativeRoundtripTimeoutPolicy::_nil
-                    ());
-  if (is_a == 0)
-    return Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
-  return Messaging::RelativeRoundtripTimeoutPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-Messaging::RelativeRoundtripTimeoutPolicy_ptr Messaging::RelativeRoundtripTimeoutPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  if (CORBA::is_nil (obj))
-    return Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0");
-  if (servant == 0)
-    ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::RelativeRoundtripTimeoutPolicy::_nil ());
-  return new POA_Messaging::_tao_collocated_RelativeRoundtripTimeoutPolicy(
-      ACE_reinterpret_cast(POA_Messaging::RelativeRoundtripTimeoutPolicy_ptr, servant),
-      stub
-    );
-}
-
-CORBA::Boolean Messaging::RelativeRoundtripTimeoutPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
-}
-
-const char* Messaging::RelativeRoundtripTimeoutPolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0";
-}
-
-static const CORBA::Long _oc_Messaging_RelativeRoundtripTimeoutPolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  49, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x6c617469), ACE_NTOHL (0x7665526f), ACE_NTOHL (0x756e6474), ACE_NTOHL (0x72697054), ACE_NTOHL (0x696d656f), ACE_NTOHL (0x7574506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0
-  31, ACE_NTOHL (0x52656c61), ACE_NTOHL (0x74697665), ACE_NTOHL (0x526f756e), ACE_NTOHL (0x64747269), ACE_NTOHL (0x7054696d), ACE_NTOHL (0x656f7574), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63790000),  // name = RelativeRoundtripTimeoutPolicy,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RelativeRoundtripTimeoutPolicy (CORBA::tk_objref, sizeof (_oc_Messaging_RelativeRoundtripTimeoutPolicy), (char *) &_oc_Messaging_RelativeRoundtripTimeoutPolicy, 0, sizeof (Messaging::RelativeRoundtripTimeoutPolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RelativeRoundtripTimeoutPolicy, &_tc_TAO_tc_Messaging_RelativeRoundtripTimeoutPolicy)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, ROUTING_POLICY_TYPE,
-                      TAO_MESSAGING_ROUTING_POLICY_TYPE)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_Messaging_RoutingTypeRange[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f526f), ACE_NTOHL (0x7574696e), ACE_NTOHL (0x67547970), ACE_NTOHL (0x6552616e), ACE_NTOHL (0x67653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:Messaging/RoutingTypeRange:1.0
-  17, ACE_NTOHL (0x526f7574), ACE_NTOHL (0x696e6754), ACE_NTOHL (0x79706552), ACE_NTOHL (0x616e6765), ACE_NTOHL (0x0),  // name = RoutingTypeRange
-  2, // member count
-    4, ACE_NTOHL (0x6d696e00),  // name = min
-    CORBA::tk_alias, // typecode kind for typedefs
-    60, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f526f), ACE_NTOHL (0x7574696e), ACE_NTOHL (0x67547970), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:Messaging/RoutingType:1.0
-      12, ACE_NTOHL (0x526f7574), ACE_NTOHL (0x696e6754), ACE_NTOHL (0x79706500),  // name = RoutingType
-      CORBA::tk_short,
-
-    4, ACE_NTOHL (0x6d617800),  // name = max
-    CORBA::tk_alias, // typecode kind for typedefs
-    60, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f526f), ACE_NTOHL (0x7574696e), ACE_NTOHL (0x67547970), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:Messaging/RoutingType:1.0
-      12, ACE_NTOHL (0x526f7574), ACE_NTOHL (0x696e6754), ACE_NTOHL (0x79706500),  // name = RoutingType
-      CORBA::tk_short,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RoutingTypeRange (CORBA::tk_struct, sizeof (_oc_Messaging_RoutingTypeRange), (char *) &_oc_Messaging_RoutingTypeRange, 0, sizeof (Messaging::RoutingTypeRange));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RoutingTypeRange, &_tc_TAO_tc_Messaging_RoutingTypeRange)
-TAO_NAMESPACE_END
-Messaging::RoutingPolicy_ptr Messaging::RoutingPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::RoutingPolicy::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/RoutingPolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Messaging::RoutingPolicy::_nil ());
-  if (is_a == 0)
-    return Messaging::RoutingPolicy::_nil ();
-  return Messaging::RoutingPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-Messaging::RoutingPolicy_ptr Messaging::RoutingPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  if (CORBA::is_nil (obj))
-    return Messaging::RoutingPolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:Messaging/RoutingPolicy:1.0");
-  if (servant == 0)
-    ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::RoutingPolicy::_nil ());
-  return new POA_Messaging::_tao_collocated_RoutingPolicy(
-      ACE_reinterpret_cast(POA_Messaging::RoutingPolicy_ptr, servant),
-      stub
-    );
-}
-
-CORBA::Boolean Messaging::RoutingPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RoutingPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
-}
-
-const char* Messaging::RoutingPolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/RoutingPolicy:1.0";
-}
-
-static const CORBA::Long _oc_Messaging_RoutingPolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f526f), ACE_NTOHL (0x7574696e), ACE_NTOHL (0x67506f6c), ACE_NTOHL (0x6963793a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:Messaging/RoutingPolicy:1.0
-  14, ACE_NTOHL (0x526f7574), ACE_NTOHL (0x696e6750), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x79000000),  // name = RoutingPolicy,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RoutingPolicy (CORBA::tk_objref, sizeof (_oc_Messaging_RoutingPolicy), (char *) &_oc_Messaging_RoutingPolicy, 0, sizeof (Messaging::RoutingPolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RoutingPolicy, &_tc_TAO_tc_Messaging_RoutingPolicy)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, MAX_HOPS_POLICY_TYPE,
-                      TAO_MESSAGING_MAX_HOPS_POLICY_TYPE)
-TAO_NAMESPACE_END
-Messaging::MaxHopsPolicy_ptr Messaging::MaxHopsPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::MaxHopsPolicy::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/MaxHopsPolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Messaging::MaxHopsPolicy::_nil ());
-  if (is_a == 0)
-    return Messaging::MaxHopsPolicy::_nil ();
-  return Messaging::MaxHopsPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-Messaging::MaxHopsPolicy_ptr Messaging::MaxHopsPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  if (CORBA::is_nil (obj))
-    return Messaging::MaxHopsPolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:Messaging/MaxHopsPolicy:1.0");
-  if (servant == 0)
-    ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::MaxHopsPolicy::_nil ());
-  return new POA_Messaging::_tao_collocated_MaxHopsPolicy(
-      ACE_reinterpret_cast(POA_Messaging::MaxHopsPolicy_ptr, servant),
-      stub
-    );
-}
-
-CORBA::Boolean Messaging::MaxHopsPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/MaxHopsPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
-}
-
-const char* Messaging::MaxHopsPolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/MaxHopsPolicy:1.0";
-}
-
-static const CORBA::Long _oc_Messaging_MaxHopsPolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f4d61), ACE_NTOHL (0x78486f70), ACE_NTOHL (0x73506f6c), ACE_NTOHL (0x6963793a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:Messaging/MaxHopsPolicy:1.0
-  14, ACE_NTOHL (0x4d617848), ACE_NTOHL (0x6f707350), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x79000000),  // name = MaxHopsPolicy,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_MaxHopsPolicy (CORBA::tk_objref, sizeof (_oc_Messaging_MaxHopsPolicy), (char *) &_oc_Messaging_MaxHopsPolicy, 0, sizeof (Messaging::MaxHopsPolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_MaxHopsPolicy, &_tc_TAO_tc_Messaging_MaxHopsPolicy)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, QUEUE_ORDER_POLICY_TYPE,
-                      TAO_MESSAGING_QUEUE_ORDER_POLICY_TYPE)
-TAO_NAMESPACE_END
-Messaging::QueueOrderPolicy_ptr Messaging::QueueOrderPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::QueueOrderPolicy::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/QueueOrderPolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Messaging::QueueOrderPolicy::_nil ());
-  if (is_a == 0)
-    return Messaging::QueueOrderPolicy::_nil ();
-  return Messaging::QueueOrderPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-Messaging::QueueOrderPolicy_ptr Messaging::QueueOrderPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  if (CORBA::is_nil (obj))
-    return Messaging::QueueOrderPolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:Messaging/QueueOrderPolicy:1.0");
-  if (servant == 0)
-    ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::QueueOrderPolicy::_nil ());
-  return new POA_Messaging::_tao_collocated_QueueOrderPolicy(
-      ACE_reinterpret_cast(POA_Messaging::QueueOrderPolicy_ptr, servant),
-      stub
-    );
-}
-
-CORBA::Boolean Messaging::QueueOrderPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/QueueOrderPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
-}
-
-const char* Messaging::QueueOrderPolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/QueueOrderPolicy:1.0";
-}
-
-static const CORBA::Long _oc_Messaging_QueueOrderPolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5175), ACE_NTOHL (0x6575654f), ACE_NTOHL (0x72646572), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63793a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:Messaging/QueueOrderPolicy:1.0
-  17, ACE_NTOHL (0x51756575), ACE_NTOHL (0x654f7264), ACE_NTOHL (0x6572506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x0),  // name = QueueOrderPolicy,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_QueueOrderPolicy (CORBA::tk_objref, sizeof (_oc_Messaging_QueueOrderPolicy), (char *) &_oc_Messaging_QueueOrderPolicy, 0, sizeof (Messaging::QueueOrderPolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_QueueOrderPolicy, &_tc_TAO_tc_Messaging_QueueOrderPolicy)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_Messaging_PolicyValue[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x56616c75), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:Messaging/PolicyValue:1.0
-  12, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c756500),  // name = PolicyValue
-  2, // member count
-    6, ACE_NTOHL (0x70747970), ACE_NTOHL (0x65000000),  // name = ptype
-    CORBA::tk_alias, // typecode kind for typedefs
-    64, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x54797065), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
-      11, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795479), ACE_NTOHL (0x70650000),  // name = PolicyType
-      CORBA::tk_ulong,
-
-    7, ACE_NTOHL (0x7076616c), ACE_NTOHL (0x75650000),  // name = pvalue
-    CORBA::tk_sequence, // typecode kind
-    12, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_octet,
-
-    0,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_PolicyValue (CORBA::tk_struct, sizeof (_oc_Messaging_PolicyValue), (char *) &_oc_Messaging_PolicyValue, 0, sizeof (Messaging::PolicyValue));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PolicyValue, &_tc_TAO_tc_Messaging_PolicyValue)
-TAO_NAMESPACE_END
-
-#if !defined (_MESSAGING_POLICYVALUE__TAO_SEQ_OCTET_CS_)
-#define _MESSAGING_POLICYVALUE__TAO_SEQ_OCTET_CS_
-
-// *************************************************************
-// Messaging::PolicyValue::_tao_seq_Octet
-// *************************************************************
-
-Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (void)
-{}
-Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size
-  : TAO_Unbounded_Sequence<CORBA::Octet> (max)
-{}
-Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  : TAO_Unbounded_Sequence<CORBA::Octet> (max, length, buffer, release)
-{}
-Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor
-  : TAO_Unbounded_Sequence<CORBA::Octet> (seq)
-{}
-Messaging::PolicyValue::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
-{}
-
-static const CORBA::Long _oc_Messaging_PolicyValue__tao_seq_Octet[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-
-  0,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_PolicyValue__tao_seq_Octet (CORBA::tk_sequence, sizeof (_oc_Messaging_PolicyValue__tao_seq_Octet), (char *) &_oc_Messaging_PolicyValue__tao_seq_Octet, 0, sizeof (Messaging::PolicyValue::_tao_seq_Octet));
-CORBA::TypeCode_ptr Messaging::PolicyValue::_tc__tao_seq_Octet = &_tc_TAO_tc_Messaging_PolicyValue__tao_seq_Octet;
-
-// *************************************************************
-// Messaging::PolicyValueSeq
-// *************************************************************
-
-Messaging::PolicyValueSeq::PolicyValueSeq (void)
-{}
-Messaging::PolicyValueSeq::PolicyValueSeq (CORBA::ULong max) // uses max size
-  : TAO_Unbounded_Sequence<Messaging::PolicyValue> (max)
-{}
-Messaging::PolicyValueSeq::PolicyValueSeq (CORBA::ULong max, CORBA::ULong length, Messaging::PolicyValue *buffer, CORBA::Boolean release)
-  : TAO_Unbounded_Sequence<Messaging::PolicyValue> (max, length, buffer, release)
-{}
-Messaging::PolicyValueSeq::PolicyValueSeq (const PolicyValueSeq &seq) // copy ctor
-  : TAO_Unbounded_Sequence<Messaging::PolicyValue> (seq)
-{}
-Messaging::PolicyValueSeq::~PolicyValueSeq (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-static const CORBA::Long _oc_Messaging_PolicyValueSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:Messaging/PolicyValueSeq:1.0
-  15, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c756553), ACE_NTOHL (0x65710000),  // name = PolicyValueSeq
-  CORBA::tk_sequence, // typecode kind
-  192, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    176, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x56616c75), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:Messaging/PolicyValue:1.0
-      12, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c756500),  // name = PolicyValue
-      2, // member count
-        6, ACE_NTOHL (0x70747970), ACE_NTOHL (0x65000000),  // name = ptype
-        CORBA::tk_alias, // typecode kind for typedefs
-        64, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x54797065), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
-          11, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795479), ACE_NTOHL (0x70650000),  // name = PolicyType
-          CORBA::tk_ulong,
-
-        7, ACE_NTOHL (0x7076616c), ACE_NTOHL (0x75650000),  // name = pvalue
-        CORBA::tk_sequence, // typecode kind
-        12, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          CORBA::tk_octet,
-
-        0,
-      0,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_PolicyValueSeq (CORBA::tk_alias, sizeof (_oc_Messaging_PolicyValueSeq), (char *) &_oc_Messaging_PolicyValueSeq, 0, sizeof (Messaging::PolicyValueSeq));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PolicyValueSeq, &_tc_TAO_tc_Messaging_PolicyValueSeq)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_POLICIES, 2)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, INVOCATION_POLICIES, 2)
-TAO_NAMESPACE_END
-
-// ****************************************************************
-
-#if defined(TAO_POLLER)
-static const CORBA::Long _oc_Messaging_ExceptionHolder[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f4578), ACE_NTOHL (0x63657074), ACE_NTOHL (0x696f6e48), ACE_NTOHL (0x6f6c6465), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:Messaging/ExceptionHolder:1.0
-  16, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e486f6c), ACE_NTOHL (0x64657200),  // name = ExceptionHolder
-  3, // member count
-    20, ACE_NTOHL (0x69735f73), ACE_NTOHL (0x79737465), ACE_NTOHL (0x6d5f6578), ACE_NTOHL (0x63657074), ACE_NTOHL (0x696f6e00),  // name = is_system_exception
-    CORBA::tk_boolean,
-
-    11, ACE_NTOHL (0x62797465), ACE_NTOHL (0x5f6f7264), ACE_NTOHL (0x65720000),  // name = byte_order
-    CORBA::tk_boolean,
-
-    20, ACE_NTOHL (0x6d617273), ACE_NTOHL (0x68616c65), ACE_NTOHL (0x645f6578), ACE_NTOHL (0x63657074), ACE_NTOHL (0x696f6e00),  // name = marshaled_exception
-    CORBA::tk_sequence, // typecode kind
-    12, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_octet,
-
-    0,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_ExceptionHolder (CORBA::tk_struct, sizeof (_oc_Messaging_ExceptionHolder), (char *) &_oc_Messaging_ExceptionHolder, 0, sizeof (Messaging::ExceptionHolder));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ExceptionHolder, &_tc_TAO_tc_Messaging_ExceptionHolder)
-TAO_NAMESPACE_END
-
-// *************************************************************
-// Messaging::ExceptionHolder::_tao_seq_Octet
-// *************************************************************
-
-Messaging::ExceptionHolder::_tao_seq_Octet::_tao_seq_Octet (void)
-{}
-Messaging::ExceptionHolder::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size
-  : TAO_Unbounded_Sequence<CORBA::Octet> (max)
-{}
-Messaging::ExceptionHolder::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  : TAO_Unbounded_Sequence<CORBA::Octet> (max, length, buffer, release)
-{}
-Messaging::ExceptionHolder::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor
-  : TAO_Unbounded_Sequence<CORBA::Octet> (seq)
-{}
-Messaging::ExceptionHolder::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
-{}
-
-static const CORBA::Long _oc_Messaging_ExceptionHolder__tao_seq_Octet[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-
-  0,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_ExceptionHolder__tao_seq_Octet (CORBA::tk_sequence, sizeof (_oc_Messaging_ExceptionHolder__tao_seq_Octet), (char *) &_oc_Messaging_ExceptionHolder__tao_seq_Octet, 0, sizeof (Messaging::ExceptionHolder::_tao_seq_Octet));
-CORBA::TypeCode_ptr Messaging::ExceptionHolder::_tc__tao_seq_Octet = &_tc_TAO_tc_Messaging_ExceptionHolder__tao_seq_Octet;
-
-// ****************************************************************
-
-Messaging::ReplyHandler_ptr Messaging::ReplyHandler::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::ReplyHandler::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/ReplyHandler:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Messaging::ReplyHandler::_nil ());
-  if (is_a == 0)
-    return Messaging::ReplyHandler::_nil ();
-  return Messaging::ReplyHandler::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-Messaging::ReplyHandler_ptr Messaging::ReplyHandler::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  if (CORBA::is_nil (obj))
-    return Messaging::ReplyHandler::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:Messaging/ReplyHandler:1.0");
-  if (servant == 0)
-    return new Messaging::ReplyHandler(stub);
-  return new POA_Messaging::_tao_collocated_ReplyHandler(
-      ACE_reinterpret_cast(POA_Messaging::ReplyHandler_ptr, servant),
-      stub
-    );
-}
-
-CORBA::Boolean Messaging::ReplyHandler::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/ReplyHandler:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
-}
-
-const char* Messaging::ReplyHandler::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/ReplyHandler:1.0";
-}
-
-static const CORBA::Long _oc_Messaging_ReplyHandler[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x706c7948), ACE_NTOHL (0x616e646c), ACE_NTOHL (0x65723a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:Messaging/ReplyHandler:1.0
-  13, ACE_NTOHL (0x5265706c), ACE_NTOHL (0x7948616e), ACE_NTOHL (0x646c6572), ACE_NTOHL (0x0),  // name = ReplyHandler,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyHandler (CORBA::tk_objref, sizeof (_oc_Messaging_ReplyHandler), (char *) &_oc_Messaging_ReplyHandler, 0, sizeof (Messaging::ReplyHandler));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ReplyHandler, &_tc_TAO_tc_Messaging_ReplyHandler)
-TAO_NAMESPACE_END
-
-
-Messaging::Poller_ptr Messaging::Poller::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::Poller::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:Messaging/Poller:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Messaging::Poller::_nil ());
-  if (is_a == 0)
-    return Messaging::Poller::_nil ();
-  return Messaging::Poller::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-Messaging::Poller_ptr Messaging::Poller::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  if (CORBA::is_nil (obj))
-    return Messaging::Poller::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:Messaging/Poller:1.0");
-  if (servant == 0)
-    return new Messaging::Poller(stub);
-  return new POA_Messaging::_tao_collocated_Poller(
-      ACE_reinterpret_cast(POA_Messaging::Poller_ptr, servant),
-      stub
-    );
-}
-
-CORBA::Object_ptr Messaging::Poller::operation_target (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    CORBA::Object_ptr _tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""operation_target",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    ACE_TRY_ENV.clear ();
-    _tao_call.start (ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-char * Messaging::Poller::operation_name (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    char *_tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""operation_name",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    ACE_TRY_ENV.clear ();
-    _tao_call.start (ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-Messaging::ReplyHandler_ptr Messaging::Poller::associated_handler (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    Messaging::ReplyHandler_ptr _tao_retval = Messaging::ReplyHandler::_nil ();
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""associated_handler",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    ACE_TRY_ENV.clear ();
-    _tao_call.start (ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void Messaging::Poller::associated_handler (
-    Messaging::ReplyHandler_ptr associated_handler,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""associated_handler",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    ACE_TRY_ENV.clear ();
-    _tao_call.start (ACE_TRY_ENV);
-        ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << associated_handler)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-
-  }
-
-}
-
-CORBA::Boolean Messaging::Poller::is_from_poller (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    CORBA::Boolean _tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""is_from_poller",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    ACE_TRY_ENV.clear ();
-    _tao_call.start (ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::Object_ptr Messaging::Poller::target (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    CORBA::Object_ptr _tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""target",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    ACE_TRY_ENV.clear ();
-    _tao_call.start (ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-char * Messaging::Poller::op_name (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    char *_tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""op_name",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    ACE_TRY_ENV.clear ();
-    _tao_call.start (ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::Boolean Messaging::Poller::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/Poller:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Pollable:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
-}
-
-const char* Messaging::Poller::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/Poller:1.0";
-}
-
-static const CORBA::Long _oc_Messaging_Poller[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  25, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f506f), ACE_NTOHL (0x6c6c6572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:Messaging/Poller:1.0
-  7, ACE_NTOHL (0x506f6c6c), ACE_NTOHL (0x65720000),  // name = Poller,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_Poller (CORBA::tk_objref, sizeof (_oc_Messaging_Poller), (char *) &_oc_Messaging_Poller, 0, sizeof (Messaging::Poller));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Poller, &_tc_TAO_tc_Messaging_Poller)
-TAO_NAMESPACE_END
-#endif
-
-// ****************************************************************
-
-void operator<<= (CORBA::Any &_tao_any, const Messaging::PriorityRange &_tao_elem) // copying
-{
-  Messaging::PriorityRange *_any_val;
-  ACE_NEW (_any_val, Messaging::PriorityRange (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (Messaging::_tc_PriorityRange, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, Messaging::PriorityRange *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (Messaging::_tc_PriorityRange, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::PriorityRange *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (Messaging::_tc_PriorityRange, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (Messaging::PriorityRange *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, Messaging::PriorityRange, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (Messaging::_tc_PriorityRange, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (Messaging::_tc_PriorityRange, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-// ****************************************************************
-
-void operator<<= (CORBA::Any &_tao_any, const Messaging::RoutingTypeRange &_tao_elem) // copying
-{
-  Messaging::RoutingTypeRange *_any_val;
-  ACE_NEW (_any_val, Messaging::RoutingTypeRange (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (Messaging::_tc_RoutingTypeRange, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, Messaging::RoutingTypeRange *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (Messaging::_tc_RoutingTypeRange, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::RoutingTypeRange *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (Messaging::_tc_RoutingTypeRange, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (Messaging::RoutingTypeRange *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, Messaging::RoutingTypeRange, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (Messaging::_tc_RoutingTypeRange, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (Messaging::_tc_RoutingTypeRange, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-// ****************************************************************
-
-void operator<<= (CORBA::Any &_tao_any, const Messaging::PolicyValue &_tao_elem) // copying
-{
-  Messaging::PolicyValue *_any_val;
-  ACE_NEW (_any_val, Messaging::PolicyValue (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (Messaging::_tc_PolicyValue, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, Messaging::PolicyValue *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (Messaging::_tc_PolicyValue, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::PolicyValue *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (Messaging::_tc_PolicyValue, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (Messaging::PolicyValue *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, Messaging::PolicyValue, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (Messaging::_tc_PolicyValue, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (Messaging::_tc_PolicyValue, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-// ****************************************************************
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const Messaging::PolicyValueSeq &_tao_elem
-  ) // copying
-{
-  Messaging::PolicyValueSeq *_tao_any_val;
-  ACE_NEW (_tao_any_val, Messaging::PolicyValueSeq (_tao_elem));
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (Messaging::_tc_PolicyValueSeq, _tao_any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, Messaging::PolicyValueSeq *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (Messaging::_tc_PolicyValueSeq, _tao_elem, 0, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::PolicyValueSeq *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (Messaging::_tc_PolicyValueSeq, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (Messaging::PolicyValueSeq *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, Messaging::PolicyValueSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (Messaging::_tc_PolicyValueSeq, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (Messaging::_tc_PolicyValueSeq, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-// ****************************************************************
-
-#if defined(TAO_POLLER)
-void operator<<= (CORBA::Any &_tao_any, const Messaging::ExceptionHolder &_tao_elem) // copying
-{
-  Messaging::ExceptionHolder *_any_val;
-  ACE_NEW (_any_val, Messaging::ExceptionHolder (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (Messaging::_tc_ExceptionHolder, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, Messaging::ExceptionHolder *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (Messaging::_tc_ExceptionHolder, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::ExceptionHolder *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (Messaging::_tc_ExceptionHolder, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (Messaging::ExceptionHolder *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, Messaging::ExceptionHolder, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (Messaging::_tc_ExceptionHolder, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (Messaging::_tc_ExceptionHolder, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-// ****************************************************************
-
-void operator<<= (CORBA::Any &_tao_any, Messaging::ReplyHandler_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = Messaging::ReplyHandler::_duplicate (_tao_elem);
-    _tao_any.replace (Messaging::_tc_ReplyHandler, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::ReplyHandler_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = Messaging::ReplyHandler::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (Messaging::_tc_ReplyHandler, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (Messaging::_tc_ReplyHandler, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = Messaging::ReplyHandler::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (Messaging::_tc_ReplyHandler, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-// ****************************************************************
-
-void operator<<= (CORBA::Any &_tao_any, Messaging::Poller_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = Messaging::Poller::_duplicate (_tao_elem);
-    _tao_any.replace (Messaging::_tc_Poller, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::Poller_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = Messaging::Poller::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (Messaging::_tc_Poller, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (Messaging::_tc_Poller, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = Messaging::Poller::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (Messaging::_tc_Poller, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-#endif /* TAO_POLLER */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-  template class TAO_Unbounded_Sequence<Messaging::PolicyValue>;
-
-#if defined(TAO_POLLER)
-  template class TAO_Object_Field_T<Messaging::ReplyHandler,Messaging::ReplyHandler_var>;
-  template class TAO_Object_Field_T<Messaging::Poller,Messaging::Poller_var>;
-  template class TAO_Object_Manager<Messaging::ReplyHandler,Messaging::ReplyHandler_var>;
-  template class TAO_Object_Manager<Messaging::Poller,Messaging::Poller_var>;
-#endif /* TAO_POLLER */
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_Unbounded_Sequence<Messaging::PolicyValue>
-
-#if defined(TAO_POLLER)
-#  pragma instantiate TAO_Object_Field_T<Messaging::ReplyHandler,Messaging::ReplyHandler_var>
-#  pragma instantiate TAO_Object_Field_T<Messaging::Poller,Messaging::Poller_var>
-#  pragma instantiate TAO_Object_Manager<Messaging::ReplyHandler,Messaging::ReplyHandler_var>
-#  pragma instantiate TAO_Object_Manager<Messaging::Poller,Messaging::Poller_var>
-#endif /* TAO_POLLER */
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
diff --git a/TAO/tao/MessagingC.h b/TAO/tao/MessagingC.h
deleted file mode 100644
index 39a431192d8..00000000000
--- a/TAO/tao/MessagingC.h
+++ /dev/null
@@ -1,1926 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   MessagingC.h
-//
-// = DESCRIPTION
-//   Generated from MessagingC.pidl, the CORBA module for the Message
-//   specification.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#ifndef TAO_IDL_MESSAGINGC_H
-#define TAO_IDL_MESSAGINGC_H
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Any.h"
-#include "tao/CDR.h"
-#include "tao/TimeBaseC.h"
-#include "tao/PolicyC.h"
-#include "tao/IOPC.h"
-#include "tao/PollableC.h"
-#include "tao/varout.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined(TRANSPARENT)
-// Some platforms define this macro for ioctl()
-#undef TRANSPARENT
-#endif
-
-TAO_NAMESPACE  Messaging
-{
-  typedef CORBA::Short RebindMode;
-  typedef CORBA::Short_out RebindMode_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RebindMode;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short TRANSPARENT;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short NO_REBIND;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short NO_RECONNECT;
-
-  typedef CORBA::Short SyncScope;
-  typedef CORBA::Short_out SyncScope_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_SyncScope;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_NONE;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_WITH_TRANSPORT;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_WITH_SERVER;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_WITH_TARGET;
-
-  typedef CORBA::Short RoutingType;
-  typedef CORBA::Short_out RoutingType_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RoutingType;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short ROUTE_NONE;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short ROUTE_FORWARD;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short ROUTE_STORE_AND_FORWARD;
-
-  typedef TimeBase::TimeT Timeout;
-  typedef TimeBase::TimeT_out Timeout_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Timeout;
-
-  typedef CORBA::Short Priority;
-  typedef CORBA::Short_out Priority_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Priority;
-
-  typedef CORBA::UShort Ordering;
-  typedef CORBA::UShort_out Ordering_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Ordering;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::UShort ORDER_ANY;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::UShort ORDER_TEMPORAL;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::UShort ORDER_PRIORITY;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::UShort ORDER_DEADLINE;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REBIND_POLICY_TYPE;
-
-
-  class RebindPolicy;
-  typedef RebindPolicy *RebindPolicy_ptr;
-
-  class TAO_Export RebindPolicy_var
-  {
-  public:
-    RebindPolicy_var (void); // default constructor
-    RebindPolicy_var (RebindPolicy_ptr);
-    RebindPolicy_var (const RebindPolicy_var &); // copy constructor
-    ~RebindPolicy_var (void); // destructor
-
-    RebindPolicy_var &operator= (RebindPolicy_ptr);
-    RebindPolicy_var &operator= (const RebindPolicy_var &);
-    RebindPolicy_ptr operator-> (void) const;
-
-    operator const RebindPolicy_ptr &() const;
-    operator RebindPolicy_ptr &();
-    // in, inout, out, _retn
-    RebindPolicy_ptr in (void) const;
-    RebindPolicy_ptr &inout (void);
-    RebindPolicy_ptr &out (void);
-    RebindPolicy_ptr _retn (void);
-    RebindPolicy_ptr ptr (void) const;
-
-  private:
-    RebindPolicy_ptr ptr_;
-  };
-
-  class TAO_Export RebindPolicy_out
-  {
-  public:
-    RebindPolicy_out (RebindPolicy_ptr &);
-    RebindPolicy_out (RebindPolicy_var &);
-    RebindPolicy_out (const RebindPolicy_out &);
-    RebindPolicy_out &operator= (const RebindPolicy_out &);
-    RebindPolicy_out &operator= (const RebindPolicy_var &);
-    RebindPolicy_out &operator= (RebindPolicy_ptr);
-    operator RebindPolicy_ptr &();
-    RebindPolicy_ptr &ptr (void);
-    RebindPolicy_ptr operator-> (void);
-
-  private:
-    RebindPolicy_ptr &ptr_;
-  };
-
-  class TAO_Export RebindPolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef RebindPolicy_ptr _ptr_type;
-    typedef RebindPolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static RebindPolicy_ptr _duplicate (RebindPolicy_ptr obj);
-    static RebindPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    static RebindPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    static RebindPolicy_ptr _nil (void);
-
-    virtual RebindMode rebind_mode (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    RebindPolicy (void); // default constructor
-    RebindPolicy (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~RebindPolicy (void);
-  private:
-    RebindPolicy (const RebindPolicy &);
-    void operator= (const RebindPolicy &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RebindPolicy;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong SYNC_SCOPE_POLICY_TYPE;
-
-  class SyncScopePolicy;
-  typedef SyncScopePolicy *SyncScopePolicy_ptr;
-
-  class TAO_Export SyncScopePolicy_var
-  {
-  public:
-    SyncScopePolicy_var (void); // default constructor
-    SyncScopePolicy_var (SyncScopePolicy_ptr);
-    SyncScopePolicy_var (const SyncScopePolicy_var &); // copy constructor
-    ~SyncScopePolicy_var (void); // destructor
-
-    SyncScopePolicy_var &operator= (SyncScopePolicy_ptr);
-    SyncScopePolicy_var &operator= (const SyncScopePolicy_var &);
-    SyncScopePolicy_ptr operator-> (void) const;
-
-    operator const SyncScopePolicy_ptr &() const;
-    operator SyncScopePolicy_ptr &();
-    // in, inout, out, _retn
-    SyncScopePolicy_ptr in (void) const;
-    SyncScopePolicy_ptr &inout (void);
-    SyncScopePolicy_ptr &out (void);
-    SyncScopePolicy_ptr _retn (void);
-    SyncScopePolicy_ptr ptr (void) const;
-
-  private:
-    SyncScopePolicy_ptr ptr_;
-  };
-
-  class TAO_Export SyncScopePolicy_out
-  {
-  public:
-    SyncScopePolicy_out (SyncScopePolicy_ptr &);
-    SyncScopePolicy_out (SyncScopePolicy_var &);
-    SyncScopePolicy_out (const SyncScopePolicy_out &);
-    SyncScopePolicy_out &operator= (const SyncScopePolicy_out &);
-    SyncScopePolicy_out &operator= (const SyncScopePolicy_var &);
-    SyncScopePolicy_out &operator= (SyncScopePolicy_ptr);
-    operator SyncScopePolicy_ptr &();
-    SyncScopePolicy_ptr &ptr (void);
-    SyncScopePolicy_ptr operator-> (void);
-
-  private:
-    SyncScopePolicy_ptr &ptr_;
-  };
-
-  class TAO_Export SyncScopePolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef SyncScopePolicy_ptr _ptr_type;
-    typedef SyncScopePolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static SyncScopePolicy_ptr _duplicate (SyncScopePolicy_ptr obj);
-    static SyncScopePolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    static SyncScopePolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    static SyncScopePolicy_ptr _nil (void);
-
-    virtual SyncScope synchronization (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    SyncScopePolicy (void); // default constructor
-    SyncScopePolicy (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~SyncScopePolicy (void);
-  private:
-    SyncScopePolicy (const SyncScopePolicy &);
-    void operator= (const SyncScopePolicy &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_SyncScopePolicy;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REQUEST_PRIORITY_POLICY_TYPE;
-
-  struct TAO_Export PriorityRange
-  {
-    Priority min;
-    Priority max;
-  };
-
-  class TAO_Export PriorityRange_var
-  {
-  public:
-    PriorityRange_var (void); // default constructor
-    PriorityRange_var (PriorityRange *);
-    PriorityRange_var (const PriorityRange_var &); // copy constructor
-    ~PriorityRange_var (void); // destructor
-
-    PriorityRange_var &operator= (PriorityRange *);
-    PriorityRange_var &operator= (const PriorityRange_var &);
-    PriorityRange *operator-> (void);
-    const PriorityRange *operator-> (void) const;
-
-    operator const PriorityRange &() const;
-    operator PriorityRange &();
-    operator PriorityRange &() const;
-    // in, inout, out, _retn
-    const PriorityRange &in (void) const;
-    PriorityRange &inout (void);
-    PriorityRange &out (void);
-    PriorityRange _retn (void);
-    PriorityRange *ptr (void) const;
-
-  private:
-    PriorityRange *ptr_;
-  };
-
-  typedef PriorityRange &PriorityRange_out;
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PriorityRange;
-
-  class RequestPriorityPolicy;
-  typedef RequestPriorityPolicy *RequestPriorityPolicy_ptr;
-
-  class TAO_Export RequestPriorityPolicy_var
-  {
-  public:
-    RequestPriorityPolicy_var (void); // default constructor
-    RequestPriorityPolicy_var (RequestPriorityPolicy_ptr);
-    RequestPriorityPolicy_var (const RequestPriorityPolicy_var &); // copy constructor
-    ~RequestPriorityPolicy_var (void); // destructor
-
-    RequestPriorityPolicy_var &operator= (RequestPriorityPolicy_ptr);
-    RequestPriorityPolicy_var &operator= (const RequestPriorityPolicy_var &);
-    RequestPriorityPolicy_ptr operator-> (void) const;
-
-    operator const RequestPriorityPolicy_ptr &() const;
-    operator RequestPriorityPolicy_ptr &();
-    // in, inout, out, _retn
-    RequestPriorityPolicy_ptr in (void) const;
-    RequestPriorityPolicy_ptr &inout (void);
-    RequestPriorityPolicy_ptr &out (void);
-    RequestPriorityPolicy_ptr _retn (void);
-    RequestPriorityPolicy_ptr ptr (void) const;
-
-  private:
-    RequestPriorityPolicy_ptr ptr_;
-  };
-
-  class TAO_Export RequestPriorityPolicy_out
-  {
-  public:
-    RequestPriorityPolicy_out (RequestPriorityPolicy_ptr &);
-    RequestPriorityPolicy_out (RequestPriorityPolicy_var &);
-    RequestPriorityPolicy_out (const RequestPriorityPolicy_out &);
-    RequestPriorityPolicy_out &operator= (const RequestPriorityPolicy_out &);
-    RequestPriorityPolicy_out &operator= (const RequestPriorityPolicy_var &);
-    RequestPriorityPolicy_out &operator= (RequestPriorityPolicy_ptr);
-    operator RequestPriorityPolicy_ptr &();
-    RequestPriorityPolicy_ptr &ptr (void);
-    RequestPriorityPolicy_ptr operator-> (void);
-
-  private:
-    RequestPriorityPolicy_ptr &ptr_;
-  };
-
-  class TAO_Export RequestPriorityPolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef RequestPriorityPolicy_ptr _ptr_type;
-    typedef RequestPriorityPolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static RequestPriorityPolicy_ptr _duplicate (RequestPriorityPolicy_ptr obj);
-    static RequestPriorityPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    static RequestPriorityPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    static RequestPriorityPolicy_ptr _nil (void);
-
-    virtual PriorityRange priority_range (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    RequestPriorityPolicy (void); // default constructor
-    RequestPriorityPolicy (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~RequestPriorityPolicy (void);
-  private:
-    RequestPriorityPolicy (const RequestPriorityPolicy &);
-    void operator= (const RequestPriorityPolicy &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RequestPriorityPolicy;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REPLY_PRIORITY_POLICY_TYPE;
-
-  class ReplyPriorityPolicy;
-  typedef ReplyPriorityPolicy *ReplyPriorityPolicy_ptr;
-
-  class TAO_Export ReplyPriorityPolicy_var
-  {
-  public:
-    ReplyPriorityPolicy_var (void); // default constructor
-    ReplyPriorityPolicy_var (ReplyPriorityPolicy_ptr);
-    ReplyPriorityPolicy_var (const ReplyPriorityPolicy_var &); // copy constructor
-    ~ReplyPriorityPolicy_var (void); // destructor
-
-    ReplyPriorityPolicy_var &operator= (ReplyPriorityPolicy_ptr);
-    ReplyPriorityPolicy_var &operator= (const ReplyPriorityPolicy_var &);
-    ReplyPriorityPolicy_ptr operator-> (void) const;
-
-    operator const ReplyPriorityPolicy_ptr &() const;
-    operator ReplyPriorityPolicy_ptr &();
-    // in, inout, out, _retn
-    ReplyPriorityPolicy_ptr in (void) const;
-    ReplyPriorityPolicy_ptr &inout (void);
-    ReplyPriorityPolicy_ptr &out (void);
-    ReplyPriorityPolicy_ptr _retn (void);
-    ReplyPriorityPolicy_ptr ptr (void) const;
-
-  private:
-    ReplyPriorityPolicy_ptr ptr_;
-  };
-
-  class TAO_Export ReplyPriorityPolicy_out
-  {
-  public:
-    ReplyPriorityPolicy_out (ReplyPriorityPolicy_ptr &);
-    ReplyPriorityPolicy_out (ReplyPriorityPolicy_var &);
-    ReplyPriorityPolicy_out (const ReplyPriorityPolicy_out &);
-    ReplyPriorityPolicy_out &operator= (const ReplyPriorityPolicy_out &);
-    ReplyPriorityPolicy_out &operator= (const ReplyPriorityPolicy_var &);
-    ReplyPriorityPolicy_out &operator= (ReplyPriorityPolicy_ptr);
-    operator ReplyPriorityPolicy_ptr &();
-    ReplyPriorityPolicy_ptr &ptr (void);
-    ReplyPriorityPolicy_ptr operator-> (void);
-
-  private:
-    ReplyPriorityPolicy_ptr &ptr_;
-  };
-
-  class TAO_Export ReplyPriorityPolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef ReplyPriorityPolicy_ptr _ptr_type;
-    typedef ReplyPriorityPolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static ReplyPriorityPolicy_ptr _duplicate (ReplyPriorityPolicy_ptr obj);
-    static ReplyPriorityPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    static ReplyPriorityPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    static ReplyPriorityPolicy_ptr _nil (void);
-
-    virtual PriorityRange priority_range (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    ReplyPriorityPolicy (void); // default constructor
-    ReplyPriorityPolicy (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~ReplyPriorityPolicy (void);
-  private:
-    ReplyPriorityPolicy (const ReplyPriorityPolicy &);
-    void operator= (const ReplyPriorityPolicy &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ReplyPriorityPolicy;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REQUEST_START_TIME_POLICY_TYPE;
-
-  class RequestStartTimePolicy;
-  typedef RequestStartTimePolicy *RequestStartTimePolicy_ptr;
-
-  class TAO_Export RequestStartTimePolicy_var
-  {
-  public:
-    RequestStartTimePolicy_var (void); // default constructor
-    RequestStartTimePolicy_var (RequestStartTimePolicy_ptr);
-    RequestStartTimePolicy_var (const RequestStartTimePolicy_var &); // copy constructor
-    ~RequestStartTimePolicy_var (void); // destructor
-
-    RequestStartTimePolicy_var &operator= (RequestStartTimePolicy_ptr);
-    RequestStartTimePolicy_var &operator= (const RequestStartTimePolicy_var &);
-    RequestStartTimePolicy_ptr operator-> (void) const;
-
-    operator const RequestStartTimePolicy_ptr &() const;
-    operator RequestStartTimePolicy_ptr &();
-    // in, inout, out, _retn
-    RequestStartTimePolicy_ptr in (void) const;
-    RequestStartTimePolicy_ptr &inout (void);
-    RequestStartTimePolicy_ptr &out (void);
-    RequestStartTimePolicy_ptr _retn (void);
-    RequestStartTimePolicy_ptr ptr (void) const;
-
-  private:
-    RequestStartTimePolicy_ptr ptr_;
-  };
-
-  class TAO_Export RequestStartTimePolicy_out
-  {
-  public:
-    RequestStartTimePolicy_out (RequestStartTimePolicy_ptr &);
-    RequestStartTimePolicy_out (RequestStartTimePolicy_var &);
-    RequestStartTimePolicy_out (const RequestStartTimePolicy_out &);
-    RequestStartTimePolicy_out &operator= (const RequestStartTimePolicy_out &);
-    RequestStartTimePolicy_out &operator= (const RequestStartTimePolicy_var &);
-    RequestStartTimePolicy_out &operator= (RequestStartTimePolicy_ptr);
-    operator RequestStartTimePolicy_ptr &();
-    RequestStartTimePolicy_ptr &ptr (void);
-    RequestStartTimePolicy_ptr operator-> (void);
-
-  private:
-    RequestStartTimePolicy_ptr &ptr_;
-  };
-
-  class TAO_Export RequestStartTimePolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef RequestStartTimePolicy_ptr _ptr_type;
-    typedef RequestStartTimePolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static RequestStartTimePolicy_ptr _duplicate (RequestStartTimePolicy_ptr obj);
-    static RequestStartTimePolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    static RequestStartTimePolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    static RequestStartTimePolicy_ptr _nil (void);
-
-    virtual TimeBase::UtcT start_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    RequestStartTimePolicy (void); // default constructor
-    RequestStartTimePolicy (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~RequestStartTimePolicy (void);
-  private:
-    RequestStartTimePolicy (const RequestStartTimePolicy &);
-    void operator= (const RequestStartTimePolicy &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RequestStartTimePolicy;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REQUEST_END_TIME_POLICY_TYPE;
-
-  class RequestEndTimePolicy;
-  typedef RequestEndTimePolicy *RequestEndTimePolicy_ptr;
-
-  class TAO_Export RequestEndTimePolicy_var
-  {
-  public:
-    RequestEndTimePolicy_var (void); // default constructor
-    RequestEndTimePolicy_var (RequestEndTimePolicy_ptr);
-    RequestEndTimePolicy_var (const RequestEndTimePolicy_var &); // copy constructor
-    ~RequestEndTimePolicy_var (void); // destructor
-
-    RequestEndTimePolicy_var &operator= (RequestEndTimePolicy_ptr);
-    RequestEndTimePolicy_var &operator= (const RequestEndTimePolicy_var &);
-    RequestEndTimePolicy_ptr operator-> (void) const;
-
-    operator const RequestEndTimePolicy_ptr &() const;
-    operator RequestEndTimePolicy_ptr &();
-    // in, inout, out, _retn
-    RequestEndTimePolicy_ptr in (void) const;
-    RequestEndTimePolicy_ptr &inout (void);
-    RequestEndTimePolicy_ptr &out (void);
-    RequestEndTimePolicy_ptr _retn (void);
-    RequestEndTimePolicy_ptr ptr (void) const;
-
-  private:
-    RequestEndTimePolicy_ptr ptr_;
-  };
-
-  class TAO_Export RequestEndTimePolicy_out
-  {
-  public:
-    RequestEndTimePolicy_out (RequestEndTimePolicy_ptr &);
-    RequestEndTimePolicy_out (RequestEndTimePolicy_var &);
-    RequestEndTimePolicy_out (const RequestEndTimePolicy_out &);
-    RequestEndTimePolicy_out &operator= (const RequestEndTimePolicy_out &);
-    RequestEndTimePolicy_out &operator= (const RequestEndTimePolicy_var &);
-    RequestEndTimePolicy_out &operator= (RequestEndTimePolicy_ptr);
-    operator RequestEndTimePolicy_ptr &();
-    RequestEndTimePolicy_ptr &ptr (void);
-    RequestEndTimePolicy_ptr operator-> (void);
-
-  private:
-    RequestEndTimePolicy_ptr &ptr_;
-  };
-
-  class TAO_Export RequestEndTimePolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef RequestEndTimePolicy_ptr _ptr_type;
-    typedef RequestEndTimePolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static RequestEndTimePolicy_ptr _duplicate (RequestEndTimePolicy_ptr obj);
-    static RequestEndTimePolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    static RequestEndTimePolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    static RequestEndTimePolicy_ptr _nil (void);
-
-    virtual TimeBase::UtcT end_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    RequestEndTimePolicy (void); // default constructor
-    RequestEndTimePolicy (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~RequestEndTimePolicy (void);
-  private:
-    RequestEndTimePolicy (const RequestEndTimePolicy &);
-    void operator= (const RequestEndTimePolicy &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RequestEndTimePolicy;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REPLY_START_TIME_POLICY_TYPE;
-
-  class ReplyStartTimePolicy;
-  typedef ReplyStartTimePolicy *ReplyStartTimePolicy_ptr;
-
-  class TAO_Export ReplyStartTimePolicy_var
-  {
-  public:
-    ReplyStartTimePolicy_var (void); // default constructor
-    ReplyStartTimePolicy_var (ReplyStartTimePolicy_ptr);
-    ReplyStartTimePolicy_var (const ReplyStartTimePolicy_var &); // copy constructor
-    ~ReplyStartTimePolicy_var (void); // destructor
-
-    ReplyStartTimePolicy_var &operator= (ReplyStartTimePolicy_ptr);
-    ReplyStartTimePolicy_var &operator= (const ReplyStartTimePolicy_var &);
-    ReplyStartTimePolicy_ptr operator-> (void) const;
-
-    operator const ReplyStartTimePolicy_ptr &() const;
-    operator ReplyStartTimePolicy_ptr &();
-    // in, inout, out, _retn
-    ReplyStartTimePolicy_ptr in (void) const;
-    ReplyStartTimePolicy_ptr &inout (void);
-    ReplyStartTimePolicy_ptr &out (void);
-    ReplyStartTimePolicy_ptr _retn (void);
-    ReplyStartTimePolicy_ptr ptr (void) const;
-
-  private:
-    ReplyStartTimePolicy_ptr ptr_;
-  };
-
-  class TAO_Export ReplyStartTimePolicy_out
-  {
-  public:
-    ReplyStartTimePolicy_out (ReplyStartTimePolicy_ptr &);
-    ReplyStartTimePolicy_out (ReplyStartTimePolicy_var &);
-    ReplyStartTimePolicy_out (const ReplyStartTimePolicy_out &);
-    ReplyStartTimePolicy_out &operator= (const ReplyStartTimePolicy_out &);
-    ReplyStartTimePolicy_out &operator= (const ReplyStartTimePolicy_var &);
-    ReplyStartTimePolicy_out &operator= (ReplyStartTimePolicy_ptr);
-    operator ReplyStartTimePolicy_ptr &();
-    ReplyStartTimePolicy_ptr &ptr (void);
-    ReplyStartTimePolicy_ptr operator-> (void);
-
-  private:
-    ReplyStartTimePolicy_ptr &ptr_;
-  };
-
-  class TAO_Export ReplyStartTimePolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef ReplyStartTimePolicy_ptr _ptr_type;
-    typedef ReplyStartTimePolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static ReplyStartTimePolicy_ptr _duplicate (ReplyStartTimePolicy_ptr obj);
-    static ReplyStartTimePolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    static ReplyStartTimePolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    static ReplyStartTimePolicy_ptr _nil (void);
-
-    virtual TimeBase::UtcT start_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    ReplyStartTimePolicy (void); // default constructor
-    ReplyStartTimePolicy (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~ReplyStartTimePolicy (void);
-  private:
-    ReplyStartTimePolicy (const ReplyStartTimePolicy &);
-    void operator= (const ReplyStartTimePolicy &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ReplyStartTimePolicy;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REPLY_END_TIME_POLICY_TYPE;
-
-  class ReplyEndTimePolicy;
-  typedef ReplyEndTimePolicy *ReplyEndTimePolicy_ptr;
-
-  class TAO_Export ReplyEndTimePolicy_var
-  {
-  public:
-    ReplyEndTimePolicy_var (void); // default constructor
-    ReplyEndTimePolicy_var (ReplyEndTimePolicy_ptr);
-    ReplyEndTimePolicy_var (const ReplyEndTimePolicy_var &); // copy constructor
-    ~ReplyEndTimePolicy_var (void); // destructor
-
-    ReplyEndTimePolicy_var &operator= (ReplyEndTimePolicy_ptr);
-    ReplyEndTimePolicy_var &operator= (const ReplyEndTimePolicy_var &);
-    ReplyEndTimePolicy_ptr operator-> (void) const;
-
-    operator const ReplyEndTimePolicy_ptr &() const;
-    operator ReplyEndTimePolicy_ptr &();
-    // in, inout, out, _retn
-    ReplyEndTimePolicy_ptr in (void) const;
-    ReplyEndTimePolicy_ptr &inout (void);
-    ReplyEndTimePolicy_ptr &out (void);
-    ReplyEndTimePolicy_ptr _retn (void);
-    ReplyEndTimePolicy_ptr ptr (void) const;
-
-  private:
-    ReplyEndTimePolicy_ptr ptr_;
-  };
-
-  class TAO_Export ReplyEndTimePolicy_out
-  {
-  public:
-    ReplyEndTimePolicy_out (ReplyEndTimePolicy_ptr &);
-    ReplyEndTimePolicy_out (ReplyEndTimePolicy_var &);
-    ReplyEndTimePolicy_out (const ReplyEndTimePolicy_out &);
-    ReplyEndTimePolicy_out &operator= (const ReplyEndTimePolicy_out &);
-    ReplyEndTimePolicy_out &operator= (const ReplyEndTimePolicy_var &);
-    ReplyEndTimePolicy_out &operator= (ReplyEndTimePolicy_ptr);
-    operator ReplyEndTimePolicy_ptr &();
-    ReplyEndTimePolicy_ptr &ptr (void);
-    ReplyEndTimePolicy_ptr operator-> (void);
-
-  private:
-    ReplyEndTimePolicy_ptr &ptr_;
-  };
-
-  class TAO_Export ReplyEndTimePolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef ReplyEndTimePolicy_ptr _ptr_type;
-    typedef ReplyEndTimePolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static ReplyEndTimePolicy_ptr _duplicate (ReplyEndTimePolicy_ptr obj);
-    static ReplyEndTimePolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    static ReplyEndTimePolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    static ReplyEndTimePolicy_ptr _nil (void);
-
-    virtual TimeBase::UtcT end_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    ReplyEndTimePolicy (void); // default constructor
-    ReplyEndTimePolicy (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~ReplyEndTimePolicy (void);
-  private:
-    ReplyEndTimePolicy (const ReplyEndTimePolicy &);
-    void operator= (const ReplyEndTimePolicy &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ReplyEndTimePolicy;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong RELATIVE_REQ_TIMEOUT_POLICY_TYPE;
-
-  class RelativeRequestTimeoutPolicy;
-  typedef RelativeRequestTimeoutPolicy *RelativeRequestTimeoutPolicy_ptr;
-
-  class TAO_Export RelativeRequestTimeoutPolicy_var
-  {
-  public:
-    RelativeRequestTimeoutPolicy_var (void); // default constructor
-    RelativeRequestTimeoutPolicy_var (RelativeRequestTimeoutPolicy_ptr);
-    RelativeRequestTimeoutPolicy_var (const RelativeRequestTimeoutPolicy_var &); // copy constructor
-    ~RelativeRequestTimeoutPolicy_var (void); // destructor
-
-    RelativeRequestTimeoutPolicy_var &operator= (RelativeRequestTimeoutPolicy_ptr);
-    RelativeRequestTimeoutPolicy_var &operator= (const RelativeRequestTimeoutPolicy_var &);
-    RelativeRequestTimeoutPolicy_ptr operator-> (void) const;
-
-    operator const RelativeRequestTimeoutPolicy_ptr &() const;
-    operator RelativeRequestTimeoutPolicy_ptr &();
-    // in, inout, out, _retn
-    RelativeRequestTimeoutPolicy_ptr in (void) const;
-    RelativeRequestTimeoutPolicy_ptr &inout (void);
-    RelativeRequestTimeoutPolicy_ptr &out (void);
-    RelativeRequestTimeoutPolicy_ptr _retn (void);
-    RelativeRequestTimeoutPolicy_ptr ptr (void) const;
-
-  private:
-    RelativeRequestTimeoutPolicy_ptr ptr_;
-  };
-
-  class TAO_Export RelativeRequestTimeoutPolicy_out
-  {
-  public:
-    RelativeRequestTimeoutPolicy_out (RelativeRequestTimeoutPolicy_ptr &);
-    RelativeRequestTimeoutPolicy_out (RelativeRequestTimeoutPolicy_var &);
-    RelativeRequestTimeoutPolicy_out (const RelativeRequestTimeoutPolicy_out &);
-    RelativeRequestTimeoutPolicy_out &operator= (const RelativeRequestTimeoutPolicy_out &);
-    RelativeRequestTimeoutPolicy_out &operator= (const RelativeRequestTimeoutPolicy_var &);
-    RelativeRequestTimeoutPolicy_out &operator= (RelativeRequestTimeoutPolicy_ptr);
-    operator RelativeRequestTimeoutPolicy_ptr &();
-    RelativeRequestTimeoutPolicy_ptr &ptr (void);
-    RelativeRequestTimeoutPolicy_ptr operator-> (void);
-
-  private:
-    RelativeRequestTimeoutPolicy_ptr &ptr_;
-  };
-
-  class TAO_Export RelativeRequestTimeoutPolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef RelativeRequestTimeoutPolicy_ptr _ptr_type;
-    typedef RelativeRequestTimeoutPolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static RelativeRequestTimeoutPolicy_ptr _duplicate (RelativeRequestTimeoutPolicy_ptr obj);
-    static RelativeRequestTimeoutPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    static RelativeRequestTimeoutPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    static RelativeRequestTimeoutPolicy_ptr _nil (void);
-
-    virtual TimeBase::TimeT relative_expiry (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    RelativeRequestTimeoutPolicy (void); // default constructor
-    RelativeRequestTimeoutPolicy (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~RelativeRequestTimeoutPolicy (void);
-  private:
-    RelativeRequestTimeoutPolicy (const RelativeRequestTimeoutPolicy &);
-    void operator= (const RelativeRequestTimeoutPolicy &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RelativeRequestTimeoutPolicy;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong RELATIVE_RT_TIMEOUT_POLICY_TYPE;
-
-  class RelativeRoundtripTimeoutPolicy;
-  typedef RelativeRoundtripTimeoutPolicy *RelativeRoundtripTimeoutPolicy_ptr;
-
-  class TAO_Export RelativeRoundtripTimeoutPolicy_var
-  {
-  public:
-    RelativeRoundtripTimeoutPolicy_var (void); // default constructor
-    RelativeRoundtripTimeoutPolicy_var (RelativeRoundtripTimeoutPolicy_ptr);
-    RelativeRoundtripTimeoutPolicy_var (const RelativeRoundtripTimeoutPolicy_var &); // copy constructor
-    ~RelativeRoundtripTimeoutPolicy_var (void); // destructor
-
-    RelativeRoundtripTimeoutPolicy_var &operator= (RelativeRoundtripTimeoutPolicy_ptr);
-    RelativeRoundtripTimeoutPolicy_var &operator= (const RelativeRoundtripTimeoutPolicy_var &);
-    RelativeRoundtripTimeoutPolicy_ptr operator-> (void) const;
-
-    operator const RelativeRoundtripTimeoutPolicy_ptr &() const;
-    operator RelativeRoundtripTimeoutPolicy_ptr &();
-    // in, inout, out, _retn
-    RelativeRoundtripTimeoutPolicy_ptr in (void) const;
-    RelativeRoundtripTimeoutPolicy_ptr &inout (void);
-    RelativeRoundtripTimeoutPolicy_ptr &out (void);
-    RelativeRoundtripTimeoutPolicy_ptr _retn (void);
-    RelativeRoundtripTimeoutPolicy_ptr ptr (void) const;
-
-  private:
-    RelativeRoundtripTimeoutPolicy_ptr ptr_;
-  };
-
-  class TAO_Export RelativeRoundtripTimeoutPolicy_out
-  {
-  public:
-    RelativeRoundtripTimeoutPolicy_out (RelativeRoundtripTimeoutPolicy_ptr &);
-    RelativeRoundtripTimeoutPolicy_out (RelativeRoundtripTimeoutPolicy_var &);
-    RelativeRoundtripTimeoutPolicy_out (const RelativeRoundtripTimeoutPolicy_out &);
-    RelativeRoundtripTimeoutPolicy_out &operator= (const RelativeRoundtripTimeoutPolicy_out &);
-    RelativeRoundtripTimeoutPolicy_out &operator= (const RelativeRoundtripTimeoutPolicy_var &);
-    RelativeRoundtripTimeoutPolicy_out &operator= (RelativeRoundtripTimeoutPolicy_ptr);
-    operator RelativeRoundtripTimeoutPolicy_ptr &();
-    RelativeRoundtripTimeoutPolicy_ptr &ptr (void);
-    RelativeRoundtripTimeoutPolicy_ptr operator-> (void);
-
-  private:
-    RelativeRoundtripTimeoutPolicy_ptr &ptr_;
-  };
-
-  class TAO_Export RelativeRoundtripTimeoutPolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef RelativeRoundtripTimeoutPolicy_ptr _ptr_type;
-    typedef RelativeRoundtripTimeoutPolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static RelativeRoundtripTimeoutPolicy_ptr _duplicate (RelativeRoundtripTimeoutPolicy_ptr obj);
-    static RelativeRoundtripTimeoutPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    static RelativeRoundtripTimeoutPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    static RelativeRoundtripTimeoutPolicy_ptr _nil (void);
-
-    virtual TimeBase::TimeT relative_expiry (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    RelativeRoundtripTimeoutPolicy (void); // default constructor
-    RelativeRoundtripTimeoutPolicy (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~RelativeRoundtripTimeoutPolicy (void);
-  private:
-    RelativeRoundtripTimeoutPolicy (const RelativeRoundtripTimeoutPolicy &);
-    void operator= (const RelativeRoundtripTimeoutPolicy &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RelativeRoundtripTimeoutPolicy;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong ROUTING_POLICY_TYPE;
-
-  struct TAO_Export RoutingTypeRange
-  {
-    RoutingType min;
-    RoutingType max;
-  };
-
-  class TAO_Export RoutingTypeRange_var
-  {
-  public:
-    RoutingTypeRange_var (void); // default constructor
-    RoutingTypeRange_var (RoutingTypeRange *);
-    RoutingTypeRange_var (const RoutingTypeRange_var &); // copy constructor
-    ~RoutingTypeRange_var (void); // destructor
-
-    RoutingTypeRange_var &operator= (RoutingTypeRange *);
-    RoutingTypeRange_var &operator= (const RoutingTypeRange_var &);
-    RoutingTypeRange *operator-> (void);
-    const RoutingTypeRange *operator-> (void) const;
-
-    operator const RoutingTypeRange &() const;
-    operator RoutingTypeRange &();
-    operator RoutingTypeRange &() const;
-    // in, inout, out, _retn
-    const RoutingTypeRange &in (void) const;
-    RoutingTypeRange &inout (void);
-    RoutingTypeRange &out (void);
-    RoutingTypeRange _retn (void);
-    RoutingTypeRange *ptr (void) const;
-
-  private:
-    RoutingTypeRange *ptr_;
-  };
-
-  typedef RoutingTypeRange &RoutingTypeRange_out;
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RoutingTypeRange;
-
-  class RoutingPolicy;
-  typedef RoutingPolicy *RoutingPolicy_ptr;
-
-  class TAO_Export RoutingPolicy_var
-  {
-  public:
-    RoutingPolicy_var (void); // default constructor
-    RoutingPolicy_var (RoutingPolicy_ptr);
-    RoutingPolicy_var (const RoutingPolicy_var &); // copy constructor
-    ~RoutingPolicy_var (void); // destructor
-
-    RoutingPolicy_var &operator= (RoutingPolicy_ptr);
-    RoutingPolicy_var &operator= (const RoutingPolicy_var &);
-    RoutingPolicy_ptr operator-> (void) const;
-
-    operator const RoutingPolicy_ptr &() const;
-    operator RoutingPolicy_ptr &();
-    // in, inout, out, _retn
-    RoutingPolicy_ptr in (void) const;
-    RoutingPolicy_ptr &inout (void);
-    RoutingPolicy_ptr &out (void);
-    RoutingPolicy_ptr _retn (void);
-    RoutingPolicy_ptr ptr (void) const;
-
-  private:
-    RoutingPolicy_ptr ptr_;
-  };
-
-  class TAO_Export RoutingPolicy_out
-  {
-  public:
-    RoutingPolicy_out (RoutingPolicy_ptr &);
-    RoutingPolicy_out (RoutingPolicy_var &);
-    RoutingPolicy_out (const RoutingPolicy_out &);
-    RoutingPolicy_out &operator= (const RoutingPolicy_out &);
-    RoutingPolicy_out &operator= (const RoutingPolicy_var &);
-    RoutingPolicy_out &operator= (RoutingPolicy_ptr);
-    operator RoutingPolicy_ptr &();
-    RoutingPolicy_ptr &ptr (void);
-    RoutingPolicy_ptr operator-> (void);
-
-  private:
-    RoutingPolicy_ptr &ptr_;
-  };
-
-  class TAO_Export RoutingPolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef RoutingPolicy_ptr _ptr_type;
-    typedef RoutingPolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static RoutingPolicy_ptr _duplicate (RoutingPolicy_ptr obj);
-    static RoutingPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    static RoutingPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    static RoutingPolicy_ptr _nil (void);
-
-    virtual RoutingTypeRange routing_range (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    RoutingPolicy (void); // default constructor
-    RoutingPolicy (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~RoutingPolicy (void);
-  private:
-    RoutingPolicy (const RoutingPolicy &);
-    void operator= (const RoutingPolicy &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RoutingPolicy;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong MAX_HOPS_POLICY_TYPE;
-
-  class MaxHopsPolicy;
-  typedef MaxHopsPolicy *MaxHopsPolicy_ptr;
-
-  class TAO_Export MaxHopsPolicy_var
-  {
-  public:
-    MaxHopsPolicy_var (void); // default constructor
-    MaxHopsPolicy_var (MaxHopsPolicy_ptr);
-    MaxHopsPolicy_var (const MaxHopsPolicy_var &); // copy constructor
-    ~MaxHopsPolicy_var (void); // destructor
-
-    MaxHopsPolicy_var &operator= (MaxHopsPolicy_ptr);
-    MaxHopsPolicy_var &operator= (const MaxHopsPolicy_var &);
-    MaxHopsPolicy_ptr operator-> (void) const;
-
-    operator const MaxHopsPolicy_ptr &() const;
-    operator MaxHopsPolicy_ptr &();
-    // in, inout, out, _retn
-    MaxHopsPolicy_ptr in (void) const;
-    MaxHopsPolicy_ptr &inout (void);
-    MaxHopsPolicy_ptr &out (void);
-    MaxHopsPolicy_ptr _retn (void);
-    MaxHopsPolicy_ptr ptr (void) const;
-
-  private:
-    MaxHopsPolicy_ptr ptr_;
-  };
-
-  class TAO_Export MaxHopsPolicy_out
-  {
-  public:
-    MaxHopsPolicy_out (MaxHopsPolicy_ptr &);
-    MaxHopsPolicy_out (MaxHopsPolicy_var &);
-    MaxHopsPolicy_out (const MaxHopsPolicy_out &);
-    MaxHopsPolicy_out &operator= (const MaxHopsPolicy_out &);
-    MaxHopsPolicy_out &operator= (const MaxHopsPolicy_var &);
-    MaxHopsPolicy_out &operator= (MaxHopsPolicy_ptr);
-    operator MaxHopsPolicy_ptr &();
-    MaxHopsPolicy_ptr &ptr (void);
-    MaxHopsPolicy_ptr operator-> (void);
-
-  private:
-    MaxHopsPolicy_ptr &ptr_;
-  };
-
-  class TAO_Export MaxHopsPolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef MaxHopsPolicy_ptr _ptr_type;
-    typedef MaxHopsPolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static MaxHopsPolicy_ptr _duplicate (MaxHopsPolicy_ptr obj);
-    static MaxHopsPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    static MaxHopsPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    static MaxHopsPolicy_ptr _nil (void);
-
-    virtual CORBA::UShort max_hops (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    MaxHopsPolicy (void); // default constructor
-    MaxHopsPolicy (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~MaxHopsPolicy (void);
-  private:
-    MaxHopsPolicy (const MaxHopsPolicy &);
-    void operator= (const MaxHopsPolicy &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_MaxHopsPolicy;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong QUEUE_ORDER_POLICY_TYPE;
-
-  class QueueOrderPolicy;
-  typedef QueueOrderPolicy *QueueOrderPolicy_ptr;
-
-  class TAO_Export QueueOrderPolicy_var
-  {
-  public:
-    QueueOrderPolicy_var (void); // default constructor
-    QueueOrderPolicy_var (QueueOrderPolicy_ptr);
-    QueueOrderPolicy_var (const QueueOrderPolicy_var &); // copy constructor
-    ~QueueOrderPolicy_var (void); // destructor
-
-    QueueOrderPolicy_var &operator= (QueueOrderPolicy_ptr);
-    QueueOrderPolicy_var &operator= (const QueueOrderPolicy_var &);
-    QueueOrderPolicy_ptr operator-> (void) const;
-
-    operator const QueueOrderPolicy_ptr &() const;
-    operator QueueOrderPolicy_ptr &();
-    // in, inout, out, _retn
-    QueueOrderPolicy_ptr in (void) const;
-    QueueOrderPolicy_ptr &inout (void);
-    QueueOrderPolicy_ptr &out (void);
-    QueueOrderPolicy_ptr _retn (void);
-    QueueOrderPolicy_ptr ptr (void) const;
-
-  private:
-    QueueOrderPolicy_ptr ptr_;
-  };
-
-  class TAO_Export QueueOrderPolicy_out
-  {
-  public:
-    QueueOrderPolicy_out (QueueOrderPolicy_ptr &);
-    QueueOrderPolicy_out (QueueOrderPolicy_var &);
-    QueueOrderPolicy_out (const QueueOrderPolicy_out &);
-    QueueOrderPolicy_out &operator= (const QueueOrderPolicy_out &);
-    QueueOrderPolicy_out &operator= (const QueueOrderPolicy_var &);
-    QueueOrderPolicy_out &operator= (QueueOrderPolicy_ptr);
-    operator QueueOrderPolicy_ptr &();
-    QueueOrderPolicy_ptr &ptr (void);
-    QueueOrderPolicy_ptr operator-> (void);
-
-  private:
-    QueueOrderPolicy_ptr &ptr_;
-  };
-
-  class TAO_Export QueueOrderPolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef QueueOrderPolicy_ptr _ptr_type;
-    typedef QueueOrderPolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static QueueOrderPolicy_ptr _duplicate (QueueOrderPolicy_ptr obj);
-    static QueueOrderPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    static QueueOrderPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    static QueueOrderPolicy_ptr _nil (void);
-
-    virtual Ordering allowed_orders (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    QueueOrderPolicy (void); // default constructor
-    QueueOrderPolicy (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~QueueOrderPolicy (void);
-  private:
-    QueueOrderPolicy (const QueueOrderPolicy &);
-    void operator= (const QueueOrderPolicy &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_QueueOrderPolicy;
-
-  struct TAO_Export PolicyValue
-  {
-    CORBA::PolicyType ptype;
-
-    // *************************************************************
-    // _tao_seq_Octet
-    // *************************************************************
-
-    class TAO_Export _tao_seq_Octet : public TAO_Unbounded_Sequence<CORBA::Octet>
-    {
-    public:
-      _tao_seq_Octet (void); // default ctor
-      _tao_seq_Octet (CORBA::ULong max); // uses max size
-      _tao_seq_Octet (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::Octet *buffer,
-        CORBA::Boolean release=0
-      );
-      _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor
-      ~_tao_seq_Octet (void); // dtor
-
-#if defined(TAO_NO_COPY_OCTET_SEQUENCES)
-      _tao_seq_Octet (
-          CORBA::ULong length,
-          const ACE_Message_Block* mb
-        )
-        : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
-#endif /* TAO_NO_COPY_OCTET_SEQUENCE */
-
-    };
-    typedef _tao_seq_Octet *_tao_seq_Octet_ptr;
-    static CORBA::TypeCode_ptr _tc__tao_seq_Octet;
-
-    _tao_seq_Octet pvalue;
-  };
-
-  class TAO_Export PolicyValue_var
-  {
-  public:
-    PolicyValue_var (void); // default constructor
-    PolicyValue_var (PolicyValue *);
-    PolicyValue_var (const PolicyValue_var &); // copy constructor
-    ~PolicyValue_var (void); // destructor
-
-    PolicyValue_var &operator= (PolicyValue *);
-    PolicyValue_var &operator= (const PolicyValue_var &);
-    PolicyValue *operator-> (void);
-    const PolicyValue *operator-> (void) const;
-
-    operator const PolicyValue &() const;
-    operator PolicyValue &();
-    operator PolicyValue &() const;
-    // in, inout, out, _retn
-    const PolicyValue &in (void) const;
-    PolicyValue &inout (void);
-    PolicyValue *&out (void);
-    PolicyValue *_retn (void);
-    PolicyValue *ptr (void) const;
-
-  private:
-    PolicyValue *ptr_;
-  };
-
-  class TAO_Export PolicyValue_out
-  {
-  public:
-    PolicyValue_out (PolicyValue *&);
-    PolicyValue_out (PolicyValue_var &);
-    PolicyValue_out (const PolicyValue_out &);
-    PolicyValue_out &operator= (const PolicyValue_out &);
-    PolicyValue_out &operator= (PolicyValue *);
-    operator PolicyValue *&();
-    PolicyValue *&ptr (void);
-    PolicyValue *operator-> (void);
-
-  private:
-    PolicyValue *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const PolicyValue_var &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PolicyValue;
-
-  // *************************************************************
-  // PolicyValueSeq
-  // *************************************************************
-
-  class TAO_Export PolicyValueSeq : public TAO_Unbounded_Sequence<PolicyValue>
-  {
-  public:
-    PolicyValueSeq (void); // default ctor
-    PolicyValueSeq (CORBA::ULong max); // uses max size
-    PolicyValueSeq (
-      CORBA::ULong max,
-      CORBA::ULong length,
-      PolicyValue *buffer,
-      CORBA::Boolean release=0
-    );
-    PolicyValueSeq (const PolicyValueSeq &); // copy ctor
-    ~PolicyValueSeq (void); // dtor
-  };
-  typedef PolicyValueSeq *PolicyValueSeq_ptr;
-
-  // *************************************************************
-  // class Messaging::PolicyValueSeq_var
-  // *************************************************************
-
-  class TAO_Export PolicyValueSeq_var
-  {
-  public:
-    PolicyValueSeq_var (void); // default constructor
-    PolicyValueSeq_var (PolicyValueSeq *);
-    PolicyValueSeq_var (const PolicyValueSeq_var &); // copy constructor
-    ~PolicyValueSeq_var (void); // destructor
-
-    PolicyValueSeq_var &operator= (PolicyValueSeq *);
-    PolicyValueSeq_var &operator= (const PolicyValueSeq_var &);
-    PolicyValueSeq *operator-> (void);
-    const PolicyValueSeq *operator-> (void) const;
-
-    operator const PolicyValueSeq &() const;
-    operator PolicyValueSeq &();
-    operator PolicyValueSeq &() const;
-    PolicyValue &operator[] (CORBA::ULong slot);
-    // in, inout, out, _retn
-    const PolicyValueSeq &in (void) const;
-    PolicyValueSeq &inout (void);
-    PolicyValueSeq *&out (void);
-    PolicyValueSeq *_retn (void);
-    PolicyValueSeq *ptr (void) const;
-
-  private:
-    PolicyValueSeq *ptr_;
-  };
-
-  class TAO_Export PolicyValueSeq_out
-  {
-  public:
-    PolicyValueSeq_out (PolicyValueSeq *&);
-    PolicyValueSeq_out (PolicyValueSeq_var &);
-    PolicyValueSeq_out (const PolicyValueSeq_out &);
-    PolicyValueSeq_out &operator= (const PolicyValueSeq_out &);
-    PolicyValueSeq_out &operator= (PolicyValueSeq *);
-    operator PolicyValueSeq *&();
-    PolicyValueSeq *&ptr (void);
-    PolicyValueSeq *operator-> (void);
-    PolicyValue &operator[] (CORBA::ULong slot);
-
-  private:
-    PolicyValueSeq *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const PolicyValueSeq_var &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PolicyValueSeq;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_POLICIES;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong INVOCATION_POLICIES;
-
-#if defined (TAO_POLLER)
-  struct TAO_Export ExceptionHolder
-  {
-    CORBA::Boolean is_system_exception;
-    CORBA::Boolean byte_order;
-
-    // *************************************************************
-    // _tao_seq_Octet
-    // *************************************************************
-
-    class TAO_Export _tao_seq_Octet : public TAO_Unbounded_Sequence<CORBA::Octet>
-    {
-    public:
-      _tao_seq_Octet (void); // default ctor
-      _tao_seq_Octet (CORBA::ULong max); // uses max size
-      _tao_seq_Octet (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::Octet *buffer,
-        CORBA::Boolean release=0
-      );
-      _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor
-      ~_tao_seq_Octet (void); // dtor
-
-#if defined(TAO_NO_COPY_OCTET_SEQUENCES)
-      _tao_seq_Octet (
-          CORBA::ULong length,
-          const ACE_Message_Block* mb
-        )
-        : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
-#endif /* TAO_NO_COPY_OCTET_SEQUENCE */
-
-    };
-    typedef _tao_seq_Octet *_tao_seq_Octet_ptr;
-    static CORBA::TypeCode_ptr _tc__tao_seq_Octet;
-
-    _tao_seq_Octet marshaled_exception;
-  };
-
-  class TAO_Export ExceptionHolder_var
-  {
-  public:
-    ExceptionHolder_var (void); // default constructor
-    ExceptionHolder_var (ExceptionHolder *);
-    ExceptionHolder_var (const ExceptionHolder_var &); // copy constructor
-    ~ExceptionHolder_var (void); // destructor
-
-    ExceptionHolder_var &operator= (ExceptionHolder *);
-    ExceptionHolder_var &operator= (const ExceptionHolder_var &);
-    ExceptionHolder *operator-> (void);
-    const ExceptionHolder *operator-> (void) const;
-
-    operator const ExceptionHolder &() const;
-    operator ExceptionHolder &();
-    operator ExceptionHolder &() const;
-    // in, inout, out, _retn
-    const ExceptionHolder &in (void) const;
-    ExceptionHolder &inout (void);
-    ExceptionHolder *&out (void);
-    ExceptionHolder *_retn (void);
-    ExceptionHolder *ptr (void) const;
-
-  private:
-    ExceptionHolder *ptr_;
-  };
-
-  class TAO_Export ExceptionHolder_out
-  {
-  public:
-    ExceptionHolder_out (ExceptionHolder *&);
-    ExceptionHolder_out (ExceptionHolder_var &);
-    ExceptionHolder_out (const ExceptionHolder_out &);
-    ExceptionHolder_out &operator= (const ExceptionHolder_out &);
-    ExceptionHolder_out &operator= (ExceptionHolder *);
-    operator ExceptionHolder *&();
-    ExceptionHolder *&ptr (void);
-    ExceptionHolder *operator-> (void);
-
-  private:
-    ExceptionHolder *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const ExceptionHolder_var &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ExceptionHolder;
-
-  class ReplyHandler;
-  typedef ReplyHandler *ReplyHandler_ptr;
-  
-  class TAO_Export ReplyHandler_var
-  {
-  public:
-    ReplyHandler_var (void); // default constructor
-    ReplyHandler_var (ReplyHandler_ptr);
-    ReplyHandler_var (const ReplyHandler_var &); // copy constructor
-    ~ReplyHandler_var (void); // destructor
-
-    ReplyHandler_var &operator= (ReplyHandler_ptr);
-    ReplyHandler_var &operator= (const ReplyHandler_var &);
-    ReplyHandler_ptr operator-> (void) const;
-
-    operator const ReplyHandler_ptr &() const;
-    operator ReplyHandler_ptr &();
-    // in, inout, out, _retn
-    ReplyHandler_ptr in (void) const;
-    ReplyHandler_ptr &inout (void);
-    ReplyHandler_ptr &out (void);
-    ReplyHandler_ptr _retn (void);
-    ReplyHandler_ptr ptr (void) const;
-
-  private:
-    ReplyHandler_ptr ptr_;
-  };
-
-  class TAO_Export ReplyHandler_out
-  {
-  public:
-    ReplyHandler_out (ReplyHandler_ptr &);
-    ReplyHandler_out (ReplyHandler_var &);
-    ReplyHandler_out (const ReplyHandler_out &);
-    ReplyHandler_out &operator= (const ReplyHandler_out &);
-    ReplyHandler_out &operator= (const ReplyHandler_var &);
-    ReplyHandler_out &operator= (ReplyHandler_ptr);
-    operator ReplyHandler_ptr &();
-    ReplyHandler_ptr &ptr (void);
-    ReplyHandler_ptr operator-> (void);
-
-  private:
-    ReplyHandler_ptr &ptr_;
-  };
-
-  class TAO_Export ReplyHandler : public virtual ACE_CORBA_1 (Object)
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef ReplyHandler_ptr _ptr_type;
-    typedef ReplyHandler_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static ReplyHandler_ptr _duplicate (ReplyHandler_ptr obj);
-    static ReplyHandler_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    static ReplyHandler_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    static ReplyHandler_ptr _nil (void);
-
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    ReplyHandler (void); // default constructor
-    ReplyHandler (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~ReplyHandler (void);
-  private:
-    ReplyHandler (const ReplyHandler &);
-    void operator= (const ReplyHandler &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ReplyHandler;
-
-  class Poller;
-  typedef Poller *Poller_ptr;
-
-  class TAO_Export Poller_var
-  {
-  public:
-    Poller_var (void); // default constructor
-    Poller_var (Poller_ptr);
-    Poller_var (const Poller_var &); // copy constructor
-    ~Poller_var (void); // destructor
-
-    Poller_var &operator= (Poller_ptr);
-    Poller_var &operator= (const Poller_var &);
-    Poller_ptr operator-> (void) const;
-
-    operator const Poller_ptr &() const;
-    operator Poller_ptr &();
-    // in, inout, out, _retn
-    Poller_ptr in (void) const;
-    Poller_ptr &inout (void);
-    Poller_ptr &out (void);
-    Poller_ptr _retn (void);
-    Poller_ptr ptr (void) const;
-
-  private:
-    Poller_ptr ptr_;
-  };
-
-  class TAO_Export Poller_out
-  {
-  public:
-    Poller_out (Poller_ptr &);
-    Poller_out (Poller_var &);
-    Poller_out (const Poller_out &);
-    Poller_out &operator= (const Poller_out &);
-    Poller_out &operator= (const Poller_var &);
-    Poller_out &operator= (Poller_ptr);
-    operator Poller_ptr &();
-    Poller_ptr &ptr (void);
-    Poller_ptr operator-> (void);
-
-  private:
-    Poller_ptr &ptr_;
-  };
-
-  class TAO_Export Poller: public virtual CORBA::Pollable
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef Poller_ptr _ptr_type;
-    typedef Poller_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static Poller_ptr _duplicate (Poller_ptr obj);
-    static Poller_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    static Poller_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    static Poller_ptr _nil (void);
-
-    virtual CORBA::Object_ptr operation_target (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual char * operation_name (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual ReplyHandler_ptr associated_handler (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void associated_handler (
-        ReplyHandler_ptr associated_handler,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::Boolean is_from_poller (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::Object_ptr target (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual char * op_name (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    Poller (void); // default constructor
-    Poller (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~Poller (void);
-  private:
-    Poller (const Poller &);
-    void operator= (const Poller &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Poller;
-#endif /* TAO_POLLER */
-
-}; // module Messaging
-
-// Typedef for the Reply Handler Skeleton.
-// This is handcrafted not generated by the IDL compiler.
-
-class TAO_InputCDR;
-
-#if defined (TAO_POLLER)
-typedef void (*TAO_Reply_Handler_Skeleton)(
-    TAO_InputCDR &,
-    Messaging::ReplyHandler *,
-    CORBA::Environment &
-    );
-#endif /* TAO_POLLER */
-
-void TAO_Export operator<<= (CORBA::Any &, Messaging::PriorityRange*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, Messaging::PriorityRange *&);
-
-void TAO_Export operator<<= (CORBA::Any &, const Messaging::RoutingTypeRange &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, Messaging::RoutingTypeRange*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, Messaging::RoutingTypeRange *&);
-
-void TAO_Export operator<<= (CORBA::Any &, const Messaging::PolicyValue &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, Messaging::PolicyValue*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, Messaging::PolicyValue *&);
-void TAO_Export operator<<= (CORBA::Any &, const Messaging::PolicyValueSeq &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, Messaging::PolicyValueSeq*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, Messaging::PolicyValueSeq *&);
-
-#if defined (TAO_POLLER)
-void TAO_Export operator<<= (CORBA::Any &, const Messaging::ExceptionHolder &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, Messaging::ExceptionHolder*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, Messaging::ExceptionHolder *&);
-// Any operators for interface Messaging::ReplyHandler
-void TAO_Export operator<<= (CORBA::Any &, Messaging::ReplyHandler_ptr);
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, Messaging::ReplyHandler *&);
-// Any operators for interface Messaging::Poller
-void TAO_Export operator<<= (CORBA::Any &, Messaging::Poller_ptr);
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, Messaging::Poller *&);
-#endif
-
-#ifndef __ACE_INLINE__
-
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const Messaging::PriorityRange &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, Messaging::PriorityRange &);
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const Messaging::RoutingTypeRange &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, Messaging::RoutingTypeRange &);
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const Messaging::PolicyValue &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, Messaging::PolicyValue &);
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const Messaging::PolicyValue::_tao_seq_Octet &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, Messaging::PolicyValue::_tao_seq_Octet &);
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const Messaging::PolicyValueSeq &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, Messaging::PolicyValueSeq &);
-
-#if defined (TAO_POLLER)
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, Messaging::ExceptionHolder &);
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder::_tao_seq_Octet &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, Messaging::ExceptionHolder::_tao_seq_Octet &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const Messaging::ReplyHandler_ptr );
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, Messaging::ReplyHandler_ptr &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const Messaging::Poller_ptr );
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, Messaging::Poller_ptr &);
-#endif
-
-#endif /* __ACE_INLINE__ */
-
-
-#if defined (__ACE_INLINE__)
-#include "MessagingC.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
-#endif /* TAO_IDL_MESSAGINGC_H */
diff --git a/TAO/tao/MessagingC.i b/TAO/tao/MessagingC.i
deleted file mode 100644
index 089a9683786..00000000000
--- a/TAO/tao/MessagingC.i
+++ /dev/null
@@ -1,3917 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-ACE_INLINE
-Messaging::RebindPolicy::RebindPolicy (void) // default constructor
-{}
-
-ACE_INLINE
-Messaging::RebindPolicy::RebindPolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-Messaging::RebindPolicy::~RebindPolicy (void) // destructor
-{}
-
-ACE_INLINE Messaging::RebindPolicy_ptr
-Messaging::RebindPolicy::_duplicate (Messaging::RebindPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE Messaging::RebindPolicy_ptr
-Messaging::RebindPolicy::_nil (void)
-{
-  return (Messaging::RebindPolicy_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::RebindPolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::RebindPolicy_var::RebindPolicy_var (void) // default constructor
-  : ptr_ (Messaging::RebindPolicy::_nil ())
-{}
-
-ACE_INLINE
-Messaging::RebindPolicy_var::RebindPolicy_var (Messaging::RebindPolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE Messaging::RebindPolicy_ptr
-Messaging::RebindPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RebindPolicy_var::RebindPolicy_var (const Messaging::RebindPolicy_var &p) // copy constructor
-  : ptr_ (Messaging::RebindPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::RebindPolicy_var::~RebindPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::RebindPolicy_var &
-Messaging::RebindPolicy_var::operator= (Messaging::RebindPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::RebindPolicy_var &
-Messaging::RebindPolicy_var::operator= (const Messaging::RebindPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = Messaging::RebindPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RebindPolicy_var::operator const Messaging::RebindPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RebindPolicy_var::operator Messaging::RebindPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RebindPolicy_ptr
-Messaging::RebindPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RebindPolicy_ptr
-Messaging::RebindPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RebindPolicy_ptr &
-Messaging::RebindPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RebindPolicy_ptr &
-Messaging::RebindPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::RebindPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RebindPolicy_ptr
-Messaging::RebindPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  Messaging::RebindPolicy_ptr val = this->ptr_;
-  this->ptr_ = Messaging::RebindPolicy::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::RebindPolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::RebindPolicy_out::RebindPolicy_out (Messaging::RebindPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = Messaging::RebindPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RebindPolicy_out::RebindPolicy_out (Messaging::RebindPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::RebindPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RebindPolicy_out::RebindPolicy_out (const Messaging::RebindPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::RebindPolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::RebindPolicy_out &
-Messaging::RebindPolicy_out::operator= (const Messaging::RebindPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::RebindPolicy_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::RebindPolicy_out &
-Messaging::RebindPolicy_out::operator= (const Messaging::RebindPolicy_var &p)
-{
-  this->ptr_ = Messaging::RebindPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::RebindPolicy_out &
-Messaging::RebindPolicy_out::operator= (Messaging::RebindPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RebindPolicy_out::operator Messaging::RebindPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RebindPolicy_ptr &
-Messaging::RebindPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RebindPolicy_ptr
-Messaging::RebindPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::SyncScopePolicy::SyncScopePolicy (void) // default constructor
-{}
-
-ACE_INLINE
-Messaging::SyncScopePolicy::SyncScopePolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-Messaging::SyncScopePolicy::~SyncScopePolicy (void) // destructor
-{}
-
-ACE_INLINE Messaging::SyncScopePolicy_ptr
-Messaging::SyncScopePolicy::_duplicate (Messaging::SyncScopePolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE Messaging::SyncScopePolicy_ptr
-Messaging::SyncScopePolicy::_nil (void)
-{
-  return (Messaging::SyncScopePolicy_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::SyncScopePolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::SyncScopePolicy_var::SyncScopePolicy_var (void) // default constructor
-  : ptr_ (Messaging::SyncScopePolicy::_nil ())
-{}
-
-ACE_INLINE
-Messaging::SyncScopePolicy_var::SyncScopePolicy_var (Messaging::SyncScopePolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE Messaging::SyncScopePolicy_ptr
-Messaging::SyncScopePolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::SyncScopePolicy_var::SyncScopePolicy_var (const Messaging::SyncScopePolicy_var &p) // copy constructor
-  : ptr_ (Messaging::SyncScopePolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::SyncScopePolicy_var::~SyncScopePolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::SyncScopePolicy_var &
-Messaging::SyncScopePolicy_var::operator= (Messaging::SyncScopePolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::SyncScopePolicy_var &
-Messaging::SyncScopePolicy_var::operator= (const Messaging::SyncScopePolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = Messaging::SyncScopePolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::SyncScopePolicy_var::operator const Messaging::SyncScopePolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::SyncScopePolicy_var::operator Messaging::SyncScopePolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::SyncScopePolicy_ptr
-Messaging::SyncScopePolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::SyncScopePolicy_ptr
-Messaging::SyncScopePolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::SyncScopePolicy_ptr &
-Messaging::SyncScopePolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::SyncScopePolicy_ptr &
-Messaging::SyncScopePolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::SyncScopePolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::SyncScopePolicy_ptr
-Messaging::SyncScopePolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  Messaging::SyncScopePolicy_ptr val = this->ptr_;
-  this->ptr_ = Messaging::SyncScopePolicy::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::SyncScopePolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::SyncScopePolicy_out::SyncScopePolicy_out (Messaging::SyncScopePolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = Messaging::SyncScopePolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::SyncScopePolicy_out::SyncScopePolicy_out (Messaging::SyncScopePolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::SyncScopePolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::SyncScopePolicy_out::SyncScopePolicy_out (const Messaging::SyncScopePolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::SyncScopePolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::SyncScopePolicy_out &
-Messaging::SyncScopePolicy_out::operator= (const Messaging::SyncScopePolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::SyncScopePolicy_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::SyncScopePolicy_out &
-Messaging::SyncScopePolicy_out::operator= (const Messaging::SyncScopePolicy_var &p)
-{
-  this->ptr_ = Messaging::SyncScopePolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::SyncScopePolicy_out &
-Messaging::SyncScopePolicy_out::operator= (Messaging::SyncScopePolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::SyncScopePolicy_out::operator Messaging::SyncScopePolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::SyncScopePolicy_ptr &
-Messaging::SyncScopePolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::SyncScopePolicy_ptr
-Messaging::SyncScopePolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::PriorityRange_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::PriorityRange_var::PriorityRange_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-Messaging::PriorityRange_var::PriorityRange_var (Messaging::PriorityRange *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-Messaging::PriorityRange_var::PriorityRange_var (const Messaging::PriorityRange_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new Messaging::PriorityRange(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-Messaging::PriorityRange_var::~PriorityRange_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE Messaging::PriorityRange_var &
-Messaging::PriorityRange_var::operator= (Messaging::PriorityRange *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::PriorityRange_var &
-Messaging::PriorityRange_var::operator= (const Messaging::PriorityRange_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new Messaging::PriorityRange (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const Messaging::PriorityRange *
-Messaging::PriorityRange_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::PriorityRange *
-Messaging::PriorityRange_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::PriorityRange_var::operator const Messaging::PriorityRange &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Messaging::PriorityRange_var::operator Messaging::PriorityRange &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Messaging::PriorityRange_var::operator Messaging::PriorityRange &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const Messaging::PriorityRange &
-Messaging::PriorityRange_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE Messaging::PriorityRange &
-Messaging::PriorityRange_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for fixed size
-ACE_INLINE Messaging::PriorityRange &
-Messaging::PriorityRange_var::out (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE Messaging::PriorityRange
-Messaging::PriorityRange_var::_retn (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE Messaging::PriorityRange *
-Messaging::PriorityRange_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy::RequestPriorityPolicy (void) // default constructor
-{}
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy::RequestPriorityPolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy::~RequestPriorityPolicy (void) // destructor
-{}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_ptr
-Messaging::RequestPriorityPolicy::_duplicate (Messaging::RequestPriorityPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_ptr
-Messaging::RequestPriorityPolicy::_nil (void)
-{
-  return (Messaging::RequestPriorityPolicy_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::RequestPriorityPolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy_var::RequestPriorityPolicy_var (void) // default constructor
-  : ptr_ (Messaging::RequestPriorityPolicy::_nil ())
-{}
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy_var::RequestPriorityPolicy_var (Messaging::RequestPriorityPolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_ptr
-Messaging::RequestPriorityPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy_var::RequestPriorityPolicy_var (const Messaging::RequestPriorityPolicy_var &p) // copy constructor
-  : ptr_ (Messaging::RequestPriorityPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy_var::~RequestPriorityPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_var &
-Messaging::RequestPriorityPolicy_var::operator= (Messaging::RequestPriorityPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_var &
-Messaging::RequestPriorityPolicy_var::operator= (const Messaging::RequestPriorityPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = Messaging::RequestPriorityPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy_var::operator const Messaging::RequestPriorityPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy_var::operator Messaging::RequestPriorityPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_ptr
-Messaging::RequestPriorityPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_ptr
-Messaging::RequestPriorityPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_ptr &
-Messaging::RequestPriorityPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_ptr &
-Messaging::RequestPriorityPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::RequestPriorityPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_ptr
-Messaging::RequestPriorityPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  Messaging::RequestPriorityPolicy_ptr val = this->ptr_;
-  this->ptr_ = Messaging::RequestPriorityPolicy::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::RequestPriorityPolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy_out::RequestPriorityPolicy_out (Messaging::RequestPriorityPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = Messaging::RequestPriorityPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy_out::RequestPriorityPolicy_out (Messaging::RequestPriorityPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::RequestPriorityPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy_out::RequestPriorityPolicy_out (const Messaging::RequestPriorityPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::RequestPriorityPolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_out &
-Messaging::RequestPriorityPolicy_out::operator= (const Messaging::RequestPriorityPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::RequestPriorityPolicy_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_out &
-Messaging::RequestPriorityPolicy_out::operator= (const Messaging::RequestPriorityPolicy_var &p)
-{
-  this->ptr_ = Messaging::RequestPriorityPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_out &
-Messaging::RequestPriorityPolicy_out::operator= (Messaging::RequestPriorityPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy_out::operator Messaging::RequestPriorityPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_ptr &
-Messaging::RequestPriorityPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_ptr
-Messaging::RequestPriorityPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy::ReplyPriorityPolicy (void) // default constructor
-{}
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy::ReplyPriorityPolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy::~ReplyPriorityPolicy (void) // destructor
-{}
-
-ACE_INLINE Messaging::ReplyPriorityPolicy_ptr
-Messaging::ReplyPriorityPolicy::_duplicate (Messaging::ReplyPriorityPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE Messaging::ReplyPriorityPolicy_ptr
-Messaging::ReplyPriorityPolicy::_nil (void)
-{
-  return (Messaging::ReplyPriorityPolicy_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::ReplyPriorityPolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy_var::ReplyPriorityPolicy_var (void) // default constructor
-  : ptr_ (Messaging::ReplyPriorityPolicy::_nil ())
-{}
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy_var::ReplyPriorityPolicy_var (Messaging::ReplyPriorityPolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE Messaging::ReplyPriorityPolicy_ptr
-Messaging::ReplyPriorityPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy_var::ReplyPriorityPolicy_var (const Messaging::ReplyPriorityPolicy_var &p) // copy constructor
-  : ptr_ (Messaging::ReplyPriorityPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy_var::~ReplyPriorityPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::ReplyPriorityPolicy_var &
-Messaging::ReplyPriorityPolicy_var::operator= (Messaging::ReplyPriorityPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::ReplyPriorityPolicy_var &
-Messaging::ReplyPriorityPolicy_var::operator= (const Messaging::ReplyPriorityPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = Messaging::ReplyPriorityPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy_var::operator const Messaging::ReplyPriorityPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy_var::operator Messaging::ReplyPriorityPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyPriorityPolicy_ptr
-Messaging::ReplyPriorityPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyPriorityPolicy_ptr
-Messaging::ReplyPriorityPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyPriorityPolicy_ptr &
-Messaging::ReplyPriorityPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyPriorityPolicy_ptr &
-Messaging::ReplyPriorityPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::ReplyPriorityPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyPriorityPolicy_ptr
-Messaging::ReplyPriorityPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  Messaging::ReplyPriorityPolicy_ptr val = this->ptr_;
-  this->ptr_ = Messaging::ReplyPriorityPolicy::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::ReplyPriorityPolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy_out::ReplyPriorityPolicy_out (Messaging::ReplyPriorityPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = Messaging::ReplyPriorityPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy_out::ReplyPriorityPolicy_out (Messaging::ReplyPriorityPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::ReplyPriorityPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy_out::ReplyPriorityPolicy_out (const Messaging::ReplyPriorityPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::ReplyPriorityPolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::ReplyPriorityPolicy_out &
-Messaging::ReplyPriorityPolicy_out::operator= (const Messaging::ReplyPriorityPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::ReplyPriorityPolicy_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::ReplyPriorityPolicy_out &
-Messaging::ReplyPriorityPolicy_out::operator= (const Messaging::ReplyPriorityPolicy_var &p)
-{
-  this->ptr_ = Messaging::ReplyPriorityPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::ReplyPriorityPolicy_out &
-Messaging::ReplyPriorityPolicy_out::operator= (Messaging::ReplyPriorityPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy_out::operator Messaging::ReplyPriorityPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyPriorityPolicy_ptr &
-Messaging::ReplyPriorityPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyPriorityPolicy_ptr
-Messaging::ReplyPriorityPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RequestStartTimePolicy::RequestStartTimePolicy (void) // default constructor
-{}
-
-ACE_INLINE
-Messaging::RequestStartTimePolicy::RequestStartTimePolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-Messaging::RequestStartTimePolicy::~RequestStartTimePolicy (void) // destructor
-{}
-
-ACE_INLINE Messaging::RequestStartTimePolicy_ptr
-Messaging::RequestStartTimePolicy::_duplicate (Messaging::RequestStartTimePolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE Messaging::RequestStartTimePolicy_ptr
-Messaging::RequestStartTimePolicy::_nil (void)
-{
-  return (Messaging::RequestStartTimePolicy_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::RequestStartTimePolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::RequestStartTimePolicy_var::RequestStartTimePolicy_var (void) // default constructor
-  : ptr_ (Messaging::RequestStartTimePolicy::_nil ())
-{}
-
-ACE_INLINE
-Messaging::RequestStartTimePolicy_var::RequestStartTimePolicy_var (Messaging::RequestStartTimePolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE Messaging::RequestStartTimePolicy_ptr
-Messaging::RequestStartTimePolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RequestStartTimePolicy_var::RequestStartTimePolicy_var (const Messaging::RequestStartTimePolicy_var &p) // copy constructor
-  : ptr_ (Messaging::RequestStartTimePolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::RequestStartTimePolicy_var::~RequestStartTimePolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::RequestStartTimePolicy_var &
-Messaging::RequestStartTimePolicy_var::operator= (Messaging::RequestStartTimePolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::RequestStartTimePolicy_var &
-Messaging::RequestStartTimePolicy_var::operator= (const Messaging::RequestStartTimePolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = Messaging::RequestStartTimePolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RequestStartTimePolicy_var::operator const Messaging::RequestStartTimePolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RequestStartTimePolicy_var::operator Messaging::RequestStartTimePolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestStartTimePolicy_ptr
-Messaging::RequestStartTimePolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestStartTimePolicy_ptr
-Messaging::RequestStartTimePolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestStartTimePolicy_ptr &
-Messaging::RequestStartTimePolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestStartTimePolicy_ptr &
-Messaging::RequestStartTimePolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::RequestStartTimePolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestStartTimePolicy_ptr
-Messaging::RequestStartTimePolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  Messaging::RequestStartTimePolicy_ptr val = this->ptr_;
-  this->ptr_ = Messaging::RequestStartTimePolicy::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::RequestStartTimePolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::RequestStartTimePolicy_out::RequestStartTimePolicy_out (Messaging::RequestStartTimePolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = Messaging::RequestStartTimePolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RequestStartTimePolicy_out::RequestStartTimePolicy_out (Messaging::RequestStartTimePolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::RequestStartTimePolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RequestStartTimePolicy_out::RequestStartTimePolicy_out (const Messaging::RequestStartTimePolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::RequestStartTimePolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::RequestStartTimePolicy_out &
-Messaging::RequestStartTimePolicy_out::operator= (const Messaging::RequestStartTimePolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::RequestStartTimePolicy_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::RequestStartTimePolicy_out &
-Messaging::RequestStartTimePolicy_out::operator= (const Messaging::RequestStartTimePolicy_var &p)
-{
-  this->ptr_ = Messaging::RequestStartTimePolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::RequestStartTimePolicy_out &
-Messaging::RequestStartTimePolicy_out::operator= (Messaging::RequestStartTimePolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RequestStartTimePolicy_out::operator Messaging::RequestStartTimePolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestStartTimePolicy_ptr &
-Messaging::RequestStartTimePolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestStartTimePolicy_ptr
-Messaging::RequestStartTimePolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy::RequestEndTimePolicy (void) // default constructor
-{}
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy::RequestEndTimePolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy::~RequestEndTimePolicy (void) // destructor
-{}
-
-ACE_INLINE Messaging::RequestEndTimePolicy_ptr
-Messaging::RequestEndTimePolicy::_duplicate (Messaging::RequestEndTimePolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE Messaging::RequestEndTimePolicy_ptr
-Messaging::RequestEndTimePolicy::_nil (void)
-{
-  return (Messaging::RequestEndTimePolicy_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::RequestEndTimePolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy_var::RequestEndTimePolicy_var (void) // default constructor
-  : ptr_ (Messaging::RequestEndTimePolicy::_nil ())
-{}
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy_var::RequestEndTimePolicy_var (Messaging::RequestEndTimePolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE Messaging::RequestEndTimePolicy_ptr
-Messaging::RequestEndTimePolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy_var::RequestEndTimePolicy_var (const Messaging::RequestEndTimePolicy_var &p) // copy constructor
-  : ptr_ (Messaging::RequestEndTimePolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy_var::~RequestEndTimePolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::RequestEndTimePolicy_var &
-Messaging::RequestEndTimePolicy_var::operator= (Messaging::RequestEndTimePolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::RequestEndTimePolicy_var &
-Messaging::RequestEndTimePolicy_var::operator= (const Messaging::RequestEndTimePolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = Messaging::RequestEndTimePolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy_var::operator const Messaging::RequestEndTimePolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy_var::operator Messaging::RequestEndTimePolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestEndTimePolicy_ptr
-Messaging::RequestEndTimePolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestEndTimePolicy_ptr
-Messaging::RequestEndTimePolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestEndTimePolicy_ptr &
-Messaging::RequestEndTimePolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestEndTimePolicy_ptr &
-Messaging::RequestEndTimePolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::RequestEndTimePolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestEndTimePolicy_ptr
-Messaging::RequestEndTimePolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  Messaging::RequestEndTimePolicy_ptr val = this->ptr_;
-  this->ptr_ = Messaging::RequestEndTimePolicy::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::RequestEndTimePolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy_out::RequestEndTimePolicy_out (Messaging::RequestEndTimePolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = Messaging::RequestEndTimePolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy_out::RequestEndTimePolicy_out (Messaging::RequestEndTimePolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::RequestEndTimePolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy_out::RequestEndTimePolicy_out (const Messaging::RequestEndTimePolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::RequestEndTimePolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::RequestEndTimePolicy_out &
-Messaging::RequestEndTimePolicy_out::operator= (const Messaging::RequestEndTimePolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::RequestEndTimePolicy_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::RequestEndTimePolicy_out &
-Messaging::RequestEndTimePolicy_out::operator= (const Messaging::RequestEndTimePolicy_var &p)
-{
-  this->ptr_ = Messaging::RequestEndTimePolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::RequestEndTimePolicy_out &
-Messaging::RequestEndTimePolicy_out::operator= (Messaging::RequestEndTimePolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy_out::operator Messaging::RequestEndTimePolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestEndTimePolicy_ptr &
-Messaging::RequestEndTimePolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestEndTimePolicy_ptr
-Messaging::RequestEndTimePolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy::ReplyStartTimePolicy (void) // default constructor
-{}
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy::ReplyStartTimePolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy::~ReplyStartTimePolicy (void) // destructor
-{}
-
-ACE_INLINE Messaging::ReplyStartTimePolicy_ptr
-Messaging::ReplyStartTimePolicy::_duplicate (Messaging::ReplyStartTimePolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE Messaging::ReplyStartTimePolicy_ptr
-Messaging::ReplyStartTimePolicy::_nil (void)
-{
-  return (Messaging::ReplyStartTimePolicy_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::ReplyStartTimePolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy_var::ReplyStartTimePolicy_var (void) // default constructor
-  : ptr_ (Messaging::ReplyStartTimePolicy::_nil ())
-{}
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy_var::ReplyStartTimePolicy_var (Messaging::ReplyStartTimePolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE Messaging::ReplyStartTimePolicy_ptr
-Messaging::ReplyStartTimePolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy_var::ReplyStartTimePolicy_var (const Messaging::ReplyStartTimePolicy_var &p) // copy constructor
-  : ptr_ (Messaging::ReplyStartTimePolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy_var::~ReplyStartTimePolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::ReplyStartTimePolicy_var &
-Messaging::ReplyStartTimePolicy_var::operator= (Messaging::ReplyStartTimePolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::ReplyStartTimePolicy_var &
-Messaging::ReplyStartTimePolicy_var::operator= (const Messaging::ReplyStartTimePolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = Messaging::ReplyStartTimePolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy_var::operator const Messaging::ReplyStartTimePolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy_var::operator Messaging::ReplyStartTimePolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyStartTimePolicy_ptr
-Messaging::ReplyStartTimePolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyStartTimePolicy_ptr
-Messaging::ReplyStartTimePolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyStartTimePolicy_ptr &
-Messaging::ReplyStartTimePolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyStartTimePolicy_ptr &
-Messaging::ReplyStartTimePolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::ReplyStartTimePolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyStartTimePolicy_ptr
-Messaging::ReplyStartTimePolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  Messaging::ReplyStartTimePolicy_ptr val = this->ptr_;
-  this->ptr_ = Messaging::ReplyStartTimePolicy::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::ReplyStartTimePolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy_out::ReplyStartTimePolicy_out (Messaging::ReplyStartTimePolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = Messaging::ReplyStartTimePolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy_out::ReplyStartTimePolicy_out (Messaging::ReplyStartTimePolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::ReplyStartTimePolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy_out::ReplyStartTimePolicy_out (const Messaging::ReplyStartTimePolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::ReplyStartTimePolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::ReplyStartTimePolicy_out &
-Messaging::ReplyStartTimePolicy_out::operator= (const Messaging::ReplyStartTimePolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::ReplyStartTimePolicy_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::ReplyStartTimePolicy_out &
-Messaging::ReplyStartTimePolicy_out::operator= (const Messaging::ReplyStartTimePolicy_var &p)
-{
-  this->ptr_ = Messaging::ReplyStartTimePolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::ReplyStartTimePolicy_out &
-Messaging::ReplyStartTimePolicy_out::operator= (Messaging::ReplyStartTimePolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy_out::operator Messaging::ReplyStartTimePolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyStartTimePolicy_ptr &
-Messaging::ReplyStartTimePolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyStartTimePolicy_ptr
-Messaging::ReplyStartTimePolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ReplyEndTimePolicy::ReplyEndTimePolicy (void) // default constructor
-{}
-
-ACE_INLINE
-Messaging::ReplyEndTimePolicy::ReplyEndTimePolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-Messaging::ReplyEndTimePolicy::~ReplyEndTimePolicy (void) // destructor
-{}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_ptr
-Messaging::ReplyEndTimePolicy::_duplicate (Messaging::ReplyEndTimePolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_ptr
-Messaging::ReplyEndTimePolicy::_nil (void)
-{
-  return (Messaging::ReplyEndTimePolicy_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::ReplyEndTimePolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::ReplyEndTimePolicy_var::ReplyEndTimePolicy_var (void) // default constructor
-  : ptr_ (Messaging::ReplyEndTimePolicy::_nil ())
-{}
-
-ACE_INLINE
-Messaging::ReplyEndTimePolicy_var::ReplyEndTimePolicy_var (Messaging::ReplyEndTimePolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_ptr
-Messaging::ReplyEndTimePolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ReplyEndTimePolicy_var::ReplyEndTimePolicy_var (const Messaging::ReplyEndTimePolicy_var &p) // copy constructor
-  : ptr_ (Messaging::ReplyEndTimePolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::ReplyEndTimePolicy_var::~ReplyEndTimePolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_var &
-Messaging::ReplyEndTimePolicy_var::operator= (Messaging::ReplyEndTimePolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_var &
-Messaging::ReplyEndTimePolicy_var::operator= (const Messaging::ReplyEndTimePolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = Messaging::ReplyEndTimePolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::ReplyEndTimePolicy_var::operator const Messaging::ReplyEndTimePolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ReplyEndTimePolicy_var::operator Messaging::ReplyEndTimePolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_ptr
-Messaging::ReplyEndTimePolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_ptr
-Messaging::ReplyEndTimePolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_ptr &
-Messaging::ReplyEndTimePolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_ptr &
-Messaging::ReplyEndTimePolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::ReplyEndTimePolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_ptr
-Messaging::ReplyEndTimePolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  Messaging::ReplyEndTimePolicy_ptr val = this->ptr_;
-  this->ptr_ = Messaging::ReplyEndTimePolicy::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::ReplyEndTimePolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::ReplyEndTimePolicy_out::ReplyEndTimePolicy_out (Messaging::ReplyEndTimePolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = Messaging::ReplyEndTimePolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::ReplyEndTimePolicy_out::ReplyEndTimePolicy_out (Messaging::ReplyEndTimePolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::ReplyEndTimePolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::ReplyEndTimePolicy_out::ReplyEndTimePolicy_out (const Messaging::ReplyEndTimePolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::ReplyEndTimePolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_out &
-Messaging::ReplyEndTimePolicy_out::operator= (const Messaging::ReplyEndTimePolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::ReplyEndTimePolicy_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_out &
-Messaging::ReplyEndTimePolicy_out::operator= (const Messaging::ReplyEndTimePolicy_var &p)
-{
-  this->ptr_ = Messaging::ReplyEndTimePolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_out &
-Messaging::ReplyEndTimePolicy_out::operator= (Messaging::ReplyEndTimePolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::ReplyEndTimePolicy_out::operator Messaging::ReplyEndTimePolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_ptr &
-Messaging::ReplyEndTimePolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_ptr
-Messaging::ReplyEndTimePolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy::RelativeRequestTimeoutPolicy (void) // default constructor
-{}
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy::RelativeRequestTimeoutPolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy::~RelativeRequestTimeoutPolicy (void) // destructor
-{}
-
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr
-Messaging::RelativeRequestTimeoutPolicy::_duplicate (Messaging::RelativeRequestTimeoutPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr
-Messaging::RelativeRequestTimeoutPolicy::_nil (void)
-{
-  return (Messaging::RelativeRequestTimeoutPolicy_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::RelativeRequestTimeoutPolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy_var::RelativeRequestTimeoutPolicy_var (void) // default constructor
-  : ptr_ (Messaging::RelativeRequestTimeoutPolicy::_nil ())
-{}
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy_var::RelativeRequestTimeoutPolicy_var (Messaging::RelativeRequestTimeoutPolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr
-Messaging::RelativeRequestTimeoutPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy_var::RelativeRequestTimeoutPolicy_var (const Messaging::RelativeRequestTimeoutPolicy_var &p) // copy constructor
-  : ptr_ (Messaging::RelativeRequestTimeoutPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy_var::~RelativeRequestTimeoutPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_var &
-Messaging::RelativeRequestTimeoutPolicy_var::operator= (Messaging::RelativeRequestTimeoutPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_var &
-Messaging::RelativeRequestTimeoutPolicy_var::operator= (const Messaging::RelativeRequestTimeoutPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = Messaging::RelativeRequestTimeoutPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy_var::operator const Messaging::RelativeRequestTimeoutPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy_var::operator Messaging::RelativeRequestTimeoutPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr
-Messaging::RelativeRequestTimeoutPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr
-Messaging::RelativeRequestTimeoutPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr &
-Messaging::RelativeRequestTimeoutPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr &
-Messaging::RelativeRequestTimeoutPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::RelativeRequestTimeoutPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr
-Messaging::RelativeRequestTimeoutPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  Messaging::RelativeRequestTimeoutPolicy_ptr val = this->ptr_;
-  this->ptr_ = Messaging::RelativeRequestTimeoutPolicy::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::RelativeRequestTimeoutPolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy_out::RelativeRequestTimeoutPolicy_out (Messaging::RelativeRequestTimeoutPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = Messaging::RelativeRequestTimeoutPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy_out::RelativeRequestTimeoutPolicy_out (Messaging::RelativeRequestTimeoutPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::RelativeRequestTimeoutPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy_out::RelativeRequestTimeoutPolicy_out (const Messaging::RelativeRequestTimeoutPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::RelativeRequestTimeoutPolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_out &
-Messaging::RelativeRequestTimeoutPolicy_out::operator= (const Messaging::RelativeRequestTimeoutPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::RelativeRequestTimeoutPolicy_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_out &
-Messaging::RelativeRequestTimeoutPolicy_out::operator= (const Messaging::RelativeRequestTimeoutPolicy_var &p)
-{
-  this->ptr_ = Messaging::RelativeRequestTimeoutPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_out &
-Messaging::RelativeRequestTimeoutPolicy_out::operator= (Messaging::RelativeRequestTimeoutPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy_out::operator Messaging::RelativeRequestTimeoutPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr &
-Messaging::RelativeRequestTimeoutPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr
-Messaging::RelativeRequestTimeoutPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy::RelativeRoundtripTimeoutPolicy (void) // default constructor
-{}
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy::RelativeRoundtripTimeoutPolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy::~RelativeRoundtripTimeoutPolicy (void) // destructor
-{}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr
-Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (Messaging::RelativeRoundtripTimeoutPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr
-Messaging::RelativeRoundtripTimeoutPolicy::_nil (void)
-{
-  return (Messaging::RelativeRoundtripTimeoutPolicy_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::RelativeRoundtripTimeoutPolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy_var::RelativeRoundtripTimeoutPolicy_var (void) // default constructor
-  : ptr_ (Messaging::RelativeRoundtripTimeoutPolicy::_nil ())
-{}
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy_var::RelativeRoundtripTimeoutPolicy_var (Messaging::RelativeRoundtripTimeoutPolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr
-Messaging::RelativeRoundtripTimeoutPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy_var::RelativeRoundtripTimeoutPolicy_var (const Messaging::RelativeRoundtripTimeoutPolicy_var &p) // copy constructor
-  : ptr_ (Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy_var::~RelativeRoundtripTimeoutPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_var &
-Messaging::RelativeRoundtripTimeoutPolicy_var::operator= (Messaging::RelativeRoundtripTimeoutPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_var &
-Messaging::RelativeRoundtripTimeoutPolicy_var::operator= (const Messaging::RelativeRoundtripTimeoutPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy_var::operator const Messaging::RelativeRoundtripTimeoutPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy_var::operator Messaging::RelativeRoundtripTimeoutPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr
-Messaging::RelativeRoundtripTimeoutPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr
-Messaging::RelativeRoundtripTimeoutPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr &
-Messaging::RelativeRoundtripTimeoutPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr &
-Messaging::RelativeRoundtripTimeoutPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr
-Messaging::RelativeRoundtripTimeoutPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  Messaging::RelativeRoundtripTimeoutPolicy_ptr val = this->ptr_;
-  this->ptr_ = Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::RelativeRoundtripTimeoutPolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy_out::RelativeRoundtripTimeoutPolicy_out (Messaging::RelativeRoundtripTimeoutPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy_out::RelativeRoundtripTimeoutPolicy_out (Messaging::RelativeRoundtripTimeoutPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy_out::RelativeRoundtripTimeoutPolicy_out (const Messaging::RelativeRoundtripTimeoutPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::RelativeRoundtripTimeoutPolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_out &
-Messaging::RelativeRoundtripTimeoutPolicy_out::operator= (const Messaging::RelativeRoundtripTimeoutPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::RelativeRoundtripTimeoutPolicy_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_out &
-Messaging::RelativeRoundtripTimeoutPolicy_out::operator= (const Messaging::RelativeRoundtripTimeoutPolicy_var &p)
-{
-  this->ptr_ = Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_out &
-Messaging::RelativeRoundtripTimeoutPolicy_out::operator= (Messaging::RelativeRoundtripTimeoutPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy_out::operator Messaging::RelativeRoundtripTimeoutPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr &
-Messaging::RelativeRoundtripTimeoutPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr
-Messaging::RelativeRoundtripTimeoutPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::RoutingTypeRange_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::RoutingTypeRange_var::RoutingTypeRange_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-Messaging::RoutingTypeRange_var::RoutingTypeRange_var (Messaging::RoutingTypeRange *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-Messaging::RoutingTypeRange_var::RoutingTypeRange_var (const Messaging::RoutingTypeRange_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new Messaging::RoutingTypeRange(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-Messaging::RoutingTypeRange_var::~RoutingTypeRange_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE Messaging::RoutingTypeRange_var &
-Messaging::RoutingTypeRange_var::operator= (Messaging::RoutingTypeRange *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::RoutingTypeRange_var &
-Messaging::RoutingTypeRange_var::operator= (const Messaging::RoutingTypeRange_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new Messaging::RoutingTypeRange (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const Messaging::RoutingTypeRange *
-Messaging::RoutingTypeRange_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RoutingTypeRange *
-Messaging::RoutingTypeRange_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RoutingTypeRange_var::operator const Messaging::RoutingTypeRange &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RoutingTypeRange_var::operator Messaging::RoutingTypeRange &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RoutingTypeRange_var::operator Messaging::RoutingTypeRange &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const Messaging::RoutingTypeRange &
-Messaging::RoutingTypeRange_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE Messaging::RoutingTypeRange &
-Messaging::RoutingTypeRange_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for fixed size
-ACE_INLINE Messaging::RoutingTypeRange &
-Messaging::RoutingTypeRange_var::out (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE Messaging::RoutingTypeRange
-Messaging::RoutingTypeRange_var::_retn (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE Messaging::RoutingTypeRange *
-Messaging::RoutingTypeRange_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RoutingPolicy::RoutingPolicy (void) // default constructor
-{}
-
-ACE_INLINE
-Messaging::RoutingPolicy::RoutingPolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-Messaging::RoutingPolicy::~RoutingPolicy (void) // destructor
-{}
-
-ACE_INLINE Messaging::RoutingPolicy_ptr
-Messaging::RoutingPolicy::_duplicate (Messaging::RoutingPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE Messaging::RoutingPolicy_ptr
-Messaging::RoutingPolicy::_nil (void)
-{
-  return (Messaging::RoutingPolicy_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::RoutingPolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::RoutingPolicy_var::RoutingPolicy_var (void) // default constructor
-  : ptr_ (Messaging::RoutingPolicy::_nil ())
-{}
-
-ACE_INLINE
-Messaging::RoutingPolicy_var::RoutingPolicy_var (Messaging::RoutingPolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE Messaging::RoutingPolicy_ptr
-Messaging::RoutingPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RoutingPolicy_var::RoutingPolicy_var (const Messaging::RoutingPolicy_var &p) // copy constructor
-  : ptr_ (Messaging::RoutingPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::RoutingPolicy_var::~RoutingPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::RoutingPolicy_var &
-Messaging::RoutingPolicy_var::operator= (Messaging::RoutingPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::RoutingPolicy_var &
-Messaging::RoutingPolicy_var::operator= (const Messaging::RoutingPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = Messaging::RoutingPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RoutingPolicy_var::operator const Messaging::RoutingPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RoutingPolicy_var::operator Messaging::RoutingPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RoutingPolicy_ptr
-Messaging::RoutingPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RoutingPolicy_ptr
-Messaging::RoutingPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RoutingPolicy_ptr &
-Messaging::RoutingPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RoutingPolicy_ptr &
-Messaging::RoutingPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::RoutingPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RoutingPolicy_ptr
-Messaging::RoutingPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  Messaging::RoutingPolicy_ptr val = this->ptr_;
-  this->ptr_ = Messaging::RoutingPolicy::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::RoutingPolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::RoutingPolicy_out::RoutingPolicy_out (Messaging::RoutingPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = Messaging::RoutingPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RoutingPolicy_out::RoutingPolicy_out (Messaging::RoutingPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::RoutingPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RoutingPolicy_out::RoutingPolicy_out (const Messaging::RoutingPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::RoutingPolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::RoutingPolicy_out &
-Messaging::RoutingPolicy_out::operator= (const Messaging::RoutingPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::RoutingPolicy_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::RoutingPolicy_out &
-Messaging::RoutingPolicy_out::operator= (const Messaging::RoutingPolicy_var &p)
-{
-  this->ptr_ = Messaging::RoutingPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::RoutingPolicy_out &
-Messaging::RoutingPolicy_out::operator= (Messaging::RoutingPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RoutingPolicy_out::operator Messaging::RoutingPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RoutingPolicy_ptr &
-Messaging::RoutingPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RoutingPolicy_ptr
-Messaging::RoutingPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::MaxHopsPolicy::MaxHopsPolicy (void) // default constructor
-{}
-
-ACE_INLINE
-Messaging::MaxHopsPolicy::MaxHopsPolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-Messaging::MaxHopsPolicy::~MaxHopsPolicy (void) // destructor
-{}
-
-ACE_INLINE Messaging::MaxHopsPolicy_ptr
-Messaging::MaxHopsPolicy::_duplicate (Messaging::MaxHopsPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE Messaging::MaxHopsPolicy_ptr
-Messaging::MaxHopsPolicy::_nil (void)
-{
-  return (Messaging::MaxHopsPolicy_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::MaxHopsPolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::MaxHopsPolicy_var::MaxHopsPolicy_var (void) // default constructor
-  : ptr_ (Messaging::MaxHopsPolicy::_nil ())
-{}
-
-ACE_INLINE
-Messaging::MaxHopsPolicy_var::MaxHopsPolicy_var (Messaging::MaxHopsPolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE Messaging::MaxHopsPolicy_ptr
-Messaging::MaxHopsPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::MaxHopsPolicy_var::MaxHopsPolicy_var (const Messaging::MaxHopsPolicy_var &p) // copy constructor
-  : ptr_ (Messaging::MaxHopsPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::MaxHopsPolicy_var::~MaxHopsPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::MaxHopsPolicy_var &
-Messaging::MaxHopsPolicy_var::operator= (Messaging::MaxHopsPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::MaxHopsPolicy_var &
-Messaging::MaxHopsPolicy_var::operator= (const Messaging::MaxHopsPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = Messaging::MaxHopsPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::MaxHopsPolicy_var::operator const Messaging::MaxHopsPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::MaxHopsPolicy_var::operator Messaging::MaxHopsPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::MaxHopsPolicy_ptr
-Messaging::MaxHopsPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::MaxHopsPolicy_ptr
-Messaging::MaxHopsPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::MaxHopsPolicy_ptr &
-Messaging::MaxHopsPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::MaxHopsPolicy_ptr &
-Messaging::MaxHopsPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::MaxHopsPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::MaxHopsPolicy_ptr
-Messaging::MaxHopsPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  Messaging::MaxHopsPolicy_ptr val = this->ptr_;
-  this->ptr_ = Messaging::MaxHopsPolicy::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::MaxHopsPolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::MaxHopsPolicy_out::MaxHopsPolicy_out (Messaging::MaxHopsPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = Messaging::MaxHopsPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::MaxHopsPolicy_out::MaxHopsPolicy_out (Messaging::MaxHopsPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::MaxHopsPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::MaxHopsPolicy_out::MaxHopsPolicy_out (const Messaging::MaxHopsPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::MaxHopsPolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::MaxHopsPolicy_out &
-Messaging::MaxHopsPolicy_out::operator= (const Messaging::MaxHopsPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::MaxHopsPolicy_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::MaxHopsPolicy_out &
-Messaging::MaxHopsPolicy_out::operator= (const Messaging::MaxHopsPolicy_var &p)
-{
-  this->ptr_ = Messaging::MaxHopsPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::MaxHopsPolicy_out &
-Messaging::MaxHopsPolicy_out::operator= (Messaging::MaxHopsPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::MaxHopsPolicy_out::operator Messaging::MaxHopsPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::MaxHopsPolicy_ptr &
-Messaging::MaxHopsPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::MaxHopsPolicy_ptr
-Messaging::MaxHopsPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::QueueOrderPolicy::QueueOrderPolicy (void) // default constructor
-{}
-
-ACE_INLINE
-Messaging::QueueOrderPolicy::QueueOrderPolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-Messaging::QueueOrderPolicy::~QueueOrderPolicy (void) // destructor
-{}
-
-ACE_INLINE Messaging::QueueOrderPolicy_ptr
-Messaging::QueueOrderPolicy::_duplicate (Messaging::QueueOrderPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE Messaging::QueueOrderPolicy_ptr
-Messaging::QueueOrderPolicy::_nil (void)
-{
-  return (Messaging::QueueOrderPolicy_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::QueueOrderPolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::QueueOrderPolicy_var::QueueOrderPolicy_var (void) // default constructor
-  : ptr_ (Messaging::QueueOrderPolicy::_nil ())
-{}
-
-ACE_INLINE
-Messaging::QueueOrderPolicy_var::QueueOrderPolicy_var (Messaging::QueueOrderPolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE Messaging::QueueOrderPolicy_ptr
-Messaging::QueueOrderPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::QueueOrderPolicy_var::QueueOrderPolicy_var (const Messaging::QueueOrderPolicy_var &p) // copy constructor
-  : ptr_ (Messaging::QueueOrderPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::QueueOrderPolicy_var::~QueueOrderPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::QueueOrderPolicy_var &
-Messaging::QueueOrderPolicy_var::operator= (Messaging::QueueOrderPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::QueueOrderPolicy_var &
-Messaging::QueueOrderPolicy_var::operator= (const Messaging::QueueOrderPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = Messaging::QueueOrderPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::QueueOrderPolicy_var::operator const Messaging::QueueOrderPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::QueueOrderPolicy_var::operator Messaging::QueueOrderPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::QueueOrderPolicy_ptr
-Messaging::QueueOrderPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::QueueOrderPolicy_ptr
-Messaging::QueueOrderPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::QueueOrderPolicy_ptr &
-Messaging::QueueOrderPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::QueueOrderPolicy_ptr &
-Messaging::QueueOrderPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::QueueOrderPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::QueueOrderPolicy_ptr
-Messaging::QueueOrderPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  Messaging::QueueOrderPolicy_ptr val = this->ptr_;
-  this->ptr_ = Messaging::QueueOrderPolicy::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::QueueOrderPolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::QueueOrderPolicy_out::QueueOrderPolicy_out (Messaging::QueueOrderPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = Messaging::QueueOrderPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::QueueOrderPolicy_out::QueueOrderPolicy_out (Messaging::QueueOrderPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::QueueOrderPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::QueueOrderPolicy_out::QueueOrderPolicy_out (const Messaging::QueueOrderPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::QueueOrderPolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::QueueOrderPolicy_out &
-Messaging::QueueOrderPolicy_out::operator= (const Messaging::QueueOrderPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::QueueOrderPolicy_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::QueueOrderPolicy_out &
-Messaging::QueueOrderPolicy_out::operator= (const Messaging::QueueOrderPolicy_var &p)
-{
-  this->ptr_ = Messaging::QueueOrderPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::QueueOrderPolicy_out &
-Messaging::QueueOrderPolicy_out::operator= (Messaging::QueueOrderPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::QueueOrderPolicy_out::operator Messaging::QueueOrderPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::QueueOrderPolicy_ptr &
-Messaging::QueueOrderPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::QueueOrderPolicy_ptr
-Messaging::QueueOrderPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::PolicyValue_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::PolicyValue_var::PolicyValue_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-Messaging::PolicyValue_var::PolicyValue_var (Messaging::PolicyValue *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-Messaging::PolicyValue_var::PolicyValue_var (const Messaging::PolicyValue_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new Messaging::PolicyValue(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-Messaging::PolicyValue_var::~PolicyValue_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE Messaging::PolicyValue_var &
-Messaging::PolicyValue_var::operator= (Messaging::PolicyValue *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::PolicyValue_var &
-Messaging::PolicyValue_var::operator= (const Messaging::PolicyValue_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new Messaging::PolicyValue (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const Messaging::PolicyValue *
-Messaging::PolicyValue_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::PolicyValue *
-Messaging::PolicyValue_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::PolicyValue_var::operator const Messaging::PolicyValue &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Messaging::PolicyValue_var::operator Messaging::PolicyValue &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Messaging::PolicyValue_var::operator Messaging::PolicyValue &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const Messaging::PolicyValue &
-Messaging::PolicyValue_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE Messaging::PolicyValue &
-Messaging::PolicyValue_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE Messaging::PolicyValue *&
-Messaging::PolicyValue_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::PolicyValue *
-Messaging::PolicyValue_var::_retn (void)
-{
-  Messaging::PolicyValue *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE Messaging::PolicyValue *
-Messaging::PolicyValue_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::PolicyValue_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::PolicyValue_out::PolicyValue_out (Messaging::PolicyValue *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Messaging::PolicyValue_out::PolicyValue_out (Messaging::PolicyValue_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Messaging::PolicyValue_out::PolicyValue_out (const Messaging::PolicyValue_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::PolicyValue_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::PolicyValue_out &
-Messaging::PolicyValue_out::operator= (const Messaging::PolicyValue_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::PolicyValue_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::PolicyValue_out &
-Messaging::PolicyValue_out::operator= (Messaging::PolicyValue *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::PolicyValue_out::operator Messaging::PolicyValue *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::PolicyValue *&
-Messaging::PolicyValue_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::PolicyValue *
-Messaging::PolicyValue_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::PolicyValueSeq_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::PolicyValueSeq_var::PolicyValueSeq_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-Messaging::PolicyValueSeq_var::PolicyValueSeq_var (Messaging::PolicyValueSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-Messaging::PolicyValueSeq_var::PolicyValueSeq_var (const Messaging::PolicyValueSeq_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new Messaging::PolicyValueSeq(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-Messaging::PolicyValueSeq_var::~PolicyValueSeq_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE Messaging::PolicyValueSeq_var &
-Messaging::PolicyValueSeq_var::operator= (Messaging::PolicyValueSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::PolicyValueSeq_var &
-Messaging::PolicyValueSeq_var::operator= (const Messaging::PolicyValueSeq_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new Messaging::PolicyValueSeq (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const Messaging::PolicyValueSeq *
-Messaging::PolicyValueSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::PolicyValueSeq *
-Messaging::PolicyValueSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::PolicyValueSeq_var::operator const Messaging::PolicyValueSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Messaging::PolicyValueSeq_var::operator Messaging::PolicyValueSeq &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Messaging::PolicyValueSeq_var::operator Messaging::PolicyValueSeq &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE Messaging::PolicyValue &
-Messaging::PolicyValueSeq_var::operator[] (CORBA::ULong slot)
-{
-  return this->ptr_->operator[] (slot);
-}
-
-ACE_INLINE const Messaging::PolicyValueSeq &
-Messaging::PolicyValueSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE Messaging::PolicyValueSeq &
-Messaging::PolicyValueSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE Messaging::PolicyValueSeq *&
-Messaging::PolicyValueSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::PolicyValueSeq *
-Messaging::PolicyValueSeq_var::_retn (void)
-{
-  Messaging::PolicyValueSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE Messaging::PolicyValueSeq *
-Messaging::PolicyValueSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::PolicyValueSeq_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::PolicyValueSeq_out::PolicyValueSeq_out (Messaging::PolicyValueSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Messaging::PolicyValueSeq_out::PolicyValueSeq_out (Messaging::PolicyValueSeq_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Messaging::PolicyValueSeq_out::PolicyValueSeq_out (const Messaging::PolicyValueSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::PolicyValueSeq_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::PolicyValueSeq_out &
-Messaging::PolicyValueSeq_out::operator= (const Messaging::PolicyValueSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::PolicyValueSeq_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::PolicyValueSeq_out &
-Messaging::PolicyValueSeq_out::operator= (Messaging::PolicyValueSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::PolicyValueSeq_out::operator Messaging::PolicyValueSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::PolicyValueSeq *&
-Messaging::PolicyValueSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::PolicyValueSeq *
-Messaging::PolicyValueSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::PolicyValue &
-Messaging::PolicyValueSeq_out::operator[] (CORBA::ULong slot)
-{
-  return this->ptr_->operator[] (slot);
-}
-
-#if defined(TAO_POLLER)
-// *************************************************************
-// Inline operations for class Messaging::ExceptionHolder_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::ExceptionHolder_var::ExceptionHolder_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-Messaging::ExceptionHolder_var::ExceptionHolder_var (Messaging::ExceptionHolder *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-Messaging::ExceptionHolder_var::ExceptionHolder_var (const Messaging::ExceptionHolder_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new Messaging::ExceptionHolder(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-Messaging::ExceptionHolder_var::~ExceptionHolder_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE Messaging::ExceptionHolder_var &
-Messaging::ExceptionHolder_var::operator= (Messaging::ExceptionHolder *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::ExceptionHolder_var &
-Messaging::ExceptionHolder_var::operator= (const Messaging::ExceptionHolder_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new Messaging::ExceptionHolder (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const Messaging::ExceptionHolder *
-Messaging::ExceptionHolder_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ExceptionHolder *
-Messaging::ExceptionHolder_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ExceptionHolder_var::operator const Messaging::ExceptionHolder &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ExceptionHolder_var::operator Messaging::ExceptionHolder &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ExceptionHolder_var::operator Messaging::ExceptionHolder &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const Messaging::ExceptionHolder &
-Messaging::ExceptionHolder_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE Messaging::ExceptionHolder &
-Messaging::ExceptionHolder_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE Messaging::ExceptionHolder *&
-Messaging::ExceptionHolder_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ExceptionHolder *
-Messaging::ExceptionHolder_var::_retn (void)
-{
-  Messaging::ExceptionHolder *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE Messaging::ExceptionHolder *
-Messaging::ExceptionHolder_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::ExceptionHolder_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::ExceptionHolder_out::ExceptionHolder_out (Messaging::ExceptionHolder *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Messaging::ExceptionHolder_out::ExceptionHolder_out (Messaging::ExceptionHolder_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Messaging::ExceptionHolder_out::ExceptionHolder_out (const Messaging::ExceptionHolder_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::ExceptionHolder_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::ExceptionHolder_out &
-Messaging::ExceptionHolder_out::operator= (const Messaging::ExceptionHolder_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::ExceptionHolder_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::ExceptionHolder_out &
-Messaging::ExceptionHolder_out::operator= (Messaging::ExceptionHolder *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::ExceptionHolder_out::operator Messaging::ExceptionHolder *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ExceptionHolder *&
-Messaging::ExceptionHolder_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ExceptionHolder *
-Messaging::ExceptionHolder_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-Messaging::ReplyHandler::ReplyHandler (void) // default constructor
-{}
-
-ACE_INLINE
-Messaging::ReplyHandler::ReplyHandler (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-Messaging::ReplyHandler::~ReplyHandler (void) // destructor
-{}
-
-ACE_INLINE Messaging::ReplyHandler_ptr
-Messaging::ReplyHandler::_duplicate (Messaging::ReplyHandler_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE Messaging::ReplyHandler_ptr
-Messaging::ReplyHandler::_nil (void)
-{
-  return (Messaging::ReplyHandler_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::ReplyHandler_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::ReplyHandler_var::ReplyHandler_var (void) // default constructor
-  : ptr_ (Messaging::ReplyHandler::_nil ())
-{}
-
-ACE_INLINE
-Messaging::ReplyHandler_var::ReplyHandler_var (Messaging::ReplyHandler_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE Messaging::ReplyHandler_ptr
-Messaging::ReplyHandler_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ReplyHandler_var::ReplyHandler_var (const Messaging::ReplyHandler_var &p) // copy constructor
-  : ptr_ (Messaging::ReplyHandler::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::ReplyHandler_var::~ReplyHandler_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::ReplyHandler_var &
-Messaging::ReplyHandler_var::operator= (Messaging::ReplyHandler_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::ReplyHandler_var &
-Messaging::ReplyHandler_var::operator= (const Messaging::ReplyHandler_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = Messaging::ReplyHandler::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::ReplyHandler_var::operator const Messaging::ReplyHandler_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ReplyHandler_var::operator Messaging::ReplyHandler_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyHandler_ptr
-Messaging::ReplyHandler_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyHandler_ptr
-Messaging::ReplyHandler_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyHandler_ptr &
-Messaging::ReplyHandler_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyHandler_ptr &
-Messaging::ReplyHandler_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::ReplyHandler::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyHandler_ptr
-Messaging::ReplyHandler_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  Messaging::ReplyHandler_ptr val = this->ptr_;
-  this->ptr_ = Messaging::ReplyHandler::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::ReplyHandler_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::ReplyHandler_out::ReplyHandler_out (Messaging::ReplyHandler_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = Messaging::ReplyHandler::_nil ();
-}
-
-ACE_INLINE
-Messaging::ReplyHandler_out::ReplyHandler_out (Messaging::ReplyHandler_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::ReplyHandler::_nil ();
-}
-
-ACE_INLINE
-Messaging::ReplyHandler_out::ReplyHandler_out (const Messaging::ReplyHandler_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::ReplyHandler_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::ReplyHandler_out &
-Messaging::ReplyHandler_out::operator= (const Messaging::ReplyHandler_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::ReplyHandler_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::ReplyHandler_out &
-Messaging::ReplyHandler_out::operator= (const Messaging::ReplyHandler_var &p)
-{
-  this->ptr_ = Messaging::ReplyHandler::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::ReplyHandler_out &
-Messaging::ReplyHandler_out::operator= (Messaging::ReplyHandler_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::ReplyHandler_out::operator Messaging::ReplyHandler_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyHandler_ptr &
-Messaging::ReplyHandler_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyHandler_ptr
-Messaging::ReplyHandler_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-#if defined(TAO_POLLER)
-ACE_INLINE
-Messaging::Poller::Poller (void) // default constructor
-{}
-
-ACE_INLINE
-Messaging::Poller::Poller (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-Messaging::Poller::~Poller (void) // destructor
-{}
-
-ACE_INLINE Messaging::Poller_ptr
-Messaging::Poller::_duplicate (Messaging::Poller_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE Messaging::Poller_ptr
-Messaging::Poller::_nil (void)
-{
-  return (Messaging::Poller_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::Poller_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::Poller_var::Poller_var (void) // default constructor
-  : ptr_ (Messaging::Poller::_nil ())
-{}
-
-ACE_INLINE
-Messaging::Poller_var::Poller_var (Messaging::Poller_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE Messaging::Poller_ptr
-Messaging::Poller_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::Poller_var::Poller_var (const Messaging::Poller_var &p) // copy constructor
-  : ptr_ (Messaging::Poller::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::Poller_var::~Poller_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::Poller_var &
-Messaging::Poller_var::operator= (Messaging::Poller_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::Poller_var &
-Messaging::Poller_var::operator= (const Messaging::Poller_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = Messaging::Poller::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::Poller_var::operator const Messaging::Poller_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::Poller_var::operator Messaging::Poller_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::Poller_ptr
-Messaging::Poller_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::Poller_ptr
-Messaging::Poller_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::Poller_ptr &
-Messaging::Poller_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::Poller_ptr &
-Messaging::Poller_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::Poller::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::Poller_ptr
-Messaging::Poller_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  Messaging::Poller_ptr val = this->ptr_;
-  this->ptr_ = Messaging::Poller::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::Poller_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::Poller_out::Poller_out (Messaging::Poller_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = Messaging::Poller::_nil ();
-}
-
-ACE_INLINE
-Messaging::Poller_out::Poller_out (Messaging::Poller_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::Poller::_nil ();
-}
-
-ACE_INLINE
-Messaging::Poller_out::Poller_out (const Messaging::Poller_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::Poller_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::Poller_out &
-Messaging::Poller_out::operator= (const Messaging::Poller_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::Poller_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::Poller_out &
-Messaging::Poller_out::operator= (const Messaging::Poller_var &p)
-{
-  this->ptr_ = Messaging::Poller::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::Poller_out &
-Messaging::Poller_out::operator= (Messaging::Poller_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::Poller_out::operator Messaging::Poller_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::Poller_ptr &
-Messaging::Poller_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::Poller_ptr
-Messaging::Poller_out::operator-> (void)
-{
-  return this->ptr_;
-}
-#endif
-
-// ****************************************************************
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const Messaging::PriorityRange &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.min) &&
-    (strm << _tao_aggregate.max)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Messaging::PriorityRange &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.min) &&
-    (strm >> _tao_aggregate.max)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-// ****************************************************************
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const Messaging::RoutingTypeRange &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.min) &&
-    (strm << _tao_aggregate.max)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Messaging::RoutingTypeRange &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.min) &&
-    (strm >> _tao_aggregate.max)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-// ****************************************************************
-
-ACE_INLINE CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const Messaging::PolicyValue::_tao_seq_Octet &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-
-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-    {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_dynamic_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (Messaging::PolicyValue::_tao_seq_Octet *)&_tao_sequence);
-      if (oseq->mb ())
-        return strm.write_octet_array_mb (oseq->mb ());
-      else
-        return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-
-#else /* TAO_NO_COPY_OCTET_SEQUENCES */
-    return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
-  }
-  return 0; // error
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Messaging::PolicyValue::_tao_seq_Octet &_tao_sequence)
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-
-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-    if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE))
-    {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_dynamic_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
-      oseq->replace (_tao_seq_len, strm.start ());
-      oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-      strm.skip_bytes (_tao_seq_len);
-      return 1;
-    }
-    else
-      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-
-#else /* TAO_NO_COPY_OCTET_SEQUENCES */
-    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
-  }
-  return 0; // error
-}
-
-// ****************************************************************
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const Messaging::PolicyValue &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.ptype) &&
-    (strm << _tao_aggregate.pvalue)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Messaging::PolicyValue &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.ptype) &&
-    (strm >> _tao_aggregate.pvalue)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-// ****************************************************************
-
-ACE_INLINE CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const Messaging::PolicyValueSeq &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Messaging::PolicyValueSeq &_tao_sequence)
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-// ****************************************************************
-
-ACE_INLINE CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const Messaging::ExceptionHolder::_tao_seq_Octet &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-
-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-    {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_dynamic_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (Messaging::ExceptionHolder::_tao_seq_Octet *)&_tao_sequence);
-      if (oseq->mb ())
-        return strm.write_octet_array_mb (oseq->mb ());
-      else
-        return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-
-#else /* TAO_NO_COPY_OCTET_SEQUENCES */
-    return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
-  }
-  return 0; // error
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Messaging::ExceptionHolder::_tao_seq_Octet &_tao_sequence)
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-
-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-    if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE))
-    {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_dynamic_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
-      oseq->replace (_tao_seq_len, strm.start ());
-      oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-      strm.skip_bytes (_tao_seq_len);
-      return 1;
-    }
-    else
-      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-
-#else /* TAO_NO_COPY_OCTET_SEQUENCES */
-    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
-  }
-  return 0; // error
-}
-
-// ****************************************************************
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const Messaging::ExceptionHolder &_tao_aggregate)
-{
-  if (
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_system_exception)) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.byte_order)) &&
-    (strm << _tao_aggregate.marshaled_exception)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Messaging::ExceptionHolder &_tao_aggregate)
-{
-  if (
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_system_exception)) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.byte_order)) &&
-    (strm >> _tao_aggregate.marshaled_exception)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-// ****************************************************************
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const Messaging::ReplyHandler_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    Messaging::ReplyHandler_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const Messaging::ReplyHandler_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    Messaging::ReplyHandler_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      Messaging::ReplyHandler::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-// ****************************************************************
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const Messaging::Poller_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    Messaging::Poller_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const Messaging::Poller_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    Messaging::Poller_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      Messaging::Poller::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-#endif
diff --git a/TAO/tao/MessagingS.cpp b/TAO/tao/MessagingS.cpp
deleted file mode 100644
index 920a0795a66..00000000000
--- a/TAO/tao/MessagingS.cpp
+++ /dev/null
@@ -1,1852 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-
-#include "tao/MessagingS.h"
-#include "tao/POA_CORBA.h"
-#include "tao/Operation_Table.h"
-#include "tao/Server_Request.h"
-
-#if !defined (__ACE_INLINE__)
-#include "MessagingS.i"
-#endif /* !defined INLINE */
-
-ACE_RCSID(tao, MessagingS, "$Id$")
-
-POA_Messaging::RebindPolicy::RebindPolicy (void)
-{
-}
-
-POA_Messaging::RebindPolicy::RebindPolicy (const RebindPolicy& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs),
-    TAO_ServantBase (rhs)
-{}
-
-POA_Messaging::RebindPolicy::~RebindPolicy (void)
-{
-}
-
-CORBA::Boolean POA_Messaging::RebindPolicy::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RebindPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_Messaging::RebindPolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/RebindPolicy:1.0") == 0)
-    return ACE_static_cast (POA_Messaging::RebindPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_Messaging::RebindPolicy::_dispatch (CORBA::ServerRequest & /* req */, void * /* context */, CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA_BAD_OPERATION ());
-}
-
-const char* POA_Messaging::RebindPolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/RebindPolicy:1.0";
-}
-
-POA_Messaging::_tao_collocated_RebindPolicy::_tao_collocated_RebindPolicy (
-    POA_Messaging::RebindPolicy_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (Messaging,RebindPolicy) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_Messaging::RebindPolicy_ptr POA_Messaging::_tao_collocated_RebindPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_Messaging::_tao_collocated_RebindPolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-Messaging::RebindMode POA_Messaging::_tao_collocated_RebindPolicy::rebind_mode  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->rebind_mode (
-    ACE_TRY_ENV
-  );
-}
-
-
-Messaging::RebindPolicy*
-POA_Messaging::RebindPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_Messaging::_tao_collocated_RebindPolicy (this, stub);
-}
-
-// ****************************************************************
-
-POA_Messaging::SyncScopePolicy::SyncScopePolicy (void)
-{
-}
-
-POA_Messaging::SyncScopePolicy::SyncScopePolicy (const SyncScopePolicy& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs),
-    TAO_ServantBase (rhs)
-{}
-
-POA_Messaging::SyncScopePolicy::~SyncScopePolicy (void)
-{
-}
-
-CORBA::Boolean POA_Messaging::SyncScopePolicy::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/SyncScopePolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_Messaging::SyncScopePolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/SyncScopePolicy:1.0") == 0)
-    return ACE_static_cast (POA_Messaging::SyncScopePolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_Messaging::SyncScopePolicy::_dispatch (CORBA::ServerRequest & /* req */, void * /* context */, CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA_BAD_OPERATION ());
-}
-
-const char* POA_Messaging::SyncScopePolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/SyncScopePolicy:1.0";
-}
-
-POA_Messaging::_tao_collocated_SyncScopePolicy::_tao_collocated_SyncScopePolicy (
-    POA_Messaging::SyncScopePolicy_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (Messaging,SyncScopePolicy) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_Messaging::SyncScopePolicy_ptr POA_Messaging::_tao_collocated_SyncScopePolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_Messaging::_tao_collocated_SyncScopePolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-Messaging::SyncScope POA_Messaging::_tao_collocated_SyncScopePolicy::synchronization  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->synchronization (
-    ACE_TRY_ENV
-  );
-}
-
-
-Messaging::SyncScopePolicy*
-POA_Messaging::SyncScopePolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_Messaging::_tao_collocated_SyncScopePolicy (this, stub);
-}
-
-// ****************************************************************
-
-POA_Messaging::RequestPriorityPolicy::RequestPriorityPolicy (void)
-{
-}
-
-POA_Messaging::RequestPriorityPolicy::RequestPriorityPolicy (const RequestPriorityPolicy& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs),
-    TAO_ServantBase (rhs)
-{}
-
-POA_Messaging::RequestPriorityPolicy::~RequestPriorityPolicy (void)
-{
-}
-
-CORBA::Boolean POA_Messaging::RequestPriorityPolicy::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RequestPriorityPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_Messaging::RequestPriorityPolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/RequestPriorityPolicy:1.0") == 0)
-    return ACE_static_cast (POA_Messaging::RequestPriorityPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_Messaging::RequestPriorityPolicy::_dispatch (CORBA::ServerRequest & /* req */, void * /* context */, CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA_BAD_OPERATION ());
-}
-
-const char* POA_Messaging::RequestPriorityPolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/RequestPriorityPolicy:1.0";
-}
-
-POA_Messaging::_tao_collocated_RequestPriorityPolicy::_tao_collocated_RequestPriorityPolicy (
-    POA_Messaging::RequestPriorityPolicy_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (Messaging,RequestPriorityPolicy) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_Messaging::RequestPriorityPolicy_ptr POA_Messaging::_tao_collocated_RequestPriorityPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_Messaging::_tao_collocated_RequestPriorityPolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-Messaging::PriorityRange POA_Messaging::_tao_collocated_RequestPriorityPolicy::priority_range  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->priority_range (
-    ACE_TRY_ENV
-  );
-}
-
-
-Messaging::RequestPriorityPolicy*
-POA_Messaging::RequestPriorityPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_Messaging::_tao_collocated_RequestPriorityPolicy (this, stub);
-}
-
-// ****************************************************************
-
-POA_Messaging::ReplyPriorityPolicy::ReplyPriorityPolicy (void)
-{
-}
-
-POA_Messaging::ReplyPriorityPolicy::ReplyPriorityPolicy (const ReplyPriorityPolicy& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs),
-    TAO_ServantBase (rhs)
-{}
-
-POA_Messaging::ReplyPriorityPolicy::~ReplyPriorityPolicy (void)
-{
-}
-
-CORBA::Boolean POA_Messaging::ReplyPriorityPolicy::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/ReplyPriorityPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_Messaging::ReplyPriorityPolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/ReplyPriorityPolicy:1.0") == 0)
-    return ACE_static_cast (POA_Messaging::ReplyPriorityPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_Messaging::ReplyPriorityPolicy::_dispatch (CORBA::ServerRequest & /* req */, void * /* context */, CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA_BAD_OPERATION ());
-}
-
-const char* POA_Messaging::ReplyPriorityPolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/ReplyPriorityPolicy:1.0";
-}
-
-POA_Messaging::_tao_collocated_ReplyPriorityPolicy::_tao_collocated_ReplyPriorityPolicy (
-    POA_Messaging::ReplyPriorityPolicy_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (Messaging,ReplyPriorityPolicy) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_Messaging::ReplyPriorityPolicy_ptr POA_Messaging::_tao_collocated_ReplyPriorityPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_Messaging::_tao_collocated_ReplyPriorityPolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-Messaging::PriorityRange POA_Messaging::_tao_collocated_ReplyPriorityPolicy::priority_range  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->priority_range (
-    ACE_TRY_ENV
-  );
-}
-
-
-Messaging::ReplyPriorityPolicy*
-POA_Messaging::ReplyPriorityPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_Messaging::_tao_collocated_ReplyPriorityPolicy (this, stub);
-}
-
-// ****************************************************************
-
-POA_Messaging::RequestStartTimePolicy::RequestStartTimePolicy (void)
-{
-}
-
-POA_Messaging::RequestStartTimePolicy::RequestStartTimePolicy (const RequestStartTimePolicy& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs),
-    TAO_ServantBase (rhs)
-{}
-
-POA_Messaging::RequestStartTimePolicy::~RequestStartTimePolicy (void)
-{
-}
-
-CORBA::Boolean POA_Messaging::RequestStartTimePolicy::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RequestStartTimePolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_Messaging::RequestStartTimePolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/RequestStartTimePolicy:1.0") == 0)
-    return ACE_static_cast (POA_Messaging::RequestStartTimePolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_Messaging::RequestStartTimePolicy::_dispatch (CORBA::ServerRequest & /* req */, void * /* context */, CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA_BAD_OPERATION ());
-}
-
-const char* POA_Messaging::RequestStartTimePolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/RequestStartTimePolicy:1.0";
-}
-
-POA_Messaging::_tao_collocated_RequestStartTimePolicy::_tao_collocated_RequestStartTimePolicy (
-    POA_Messaging::RequestStartTimePolicy_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (Messaging,RequestStartTimePolicy) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_Messaging::RequestStartTimePolicy_ptr POA_Messaging::_tao_collocated_RequestStartTimePolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_Messaging::_tao_collocated_RequestStartTimePolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-TimeBase::UtcT POA_Messaging::_tao_collocated_RequestStartTimePolicy::start_time  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->start_time (
-    ACE_TRY_ENV
-  );
-}
-
-
-Messaging::RequestStartTimePolicy*
-POA_Messaging::RequestStartTimePolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_Messaging::_tao_collocated_RequestStartTimePolicy (this, stub);
-}
-
-// ****************************************************************
-
-POA_Messaging::RequestEndTimePolicy::RequestEndTimePolicy (void)
-{
-}
-
-POA_Messaging::RequestEndTimePolicy::RequestEndTimePolicy (const RequestEndTimePolicy& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs),
-    TAO_ServantBase (rhs)
-{}
-
-POA_Messaging::RequestEndTimePolicy::~RequestEndTimePolicy (void)
-{
-}
-
-CORBA::Boolean POA_Messaging::RequestEndTimePolicy::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RequestEndTimePolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_Messaging::RequestEndTimePolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/RequestEndTimePolicy:1.0") == 0)
-    return ACE_static_cast (POA_Messaging::RequestEndTimePolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_Messaging::RequestEndTimePolicy::_dispatch (CORBA::ServerRequest & /* req */, void * /* context */, CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA_BAD_OPERATION ());
-}
-
-const char* POA_Messaging::RequestEndTimePolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/RequestEndTimePolicy:1.0";
-}
-
-POA_Messaging::_tao_collocated_RequestEndTimePolicy::_tao_collocated_RequestEndTimePolicy (
-    POA_Messaging::RequestEndTimePolicy_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (Messaging,RequestEndTimePolicy) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_Messaging::RequestEndTimePolicy_ptr POA_Messaging::_tao_collocated_RequestEndTimePolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_Messaging::_tao_collocated_RequestEndTimePolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-TimeBase::UtcT POA_Messaging::_tao_collocated_RequestEndTimePolicy::end_time  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->end_time (
-    ACE_TRY_ENV
-  );
-}
-
-
-Messaging::RequestEndTimePolicy*
-POA_Messaging::RequestEndTimePolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_Messaging::_tao_collocated_RequestEndTimePolicy (this, stub);
-}
-
-// ****************************************************************
-
-POA_Messaging::ReplyStartTimePolicy::ReplyStartTimePolicy (void)
-{
-}
-
-POA_Messaging::ReplyStartTimePolicy::ReplyStartTimePolicy (const ReplyStartTimePolicy& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs),
-    TAO_ServantBase (rhs)
-{}
-
-POA_Messaging::ReplyStartTimePolicy::~ReplyStartTimePolicy (void)
-{
-}
-
-CORBA::Boolean POA_Messaging::ReplyStartTimePolicy::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/ReplyStartTimePolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_Messaging::ReplyStartTimePolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/ReplyStartTimePolicy:1.0") == 0)
-    return ACE_static_cast (POA_Messaging::ReplyStartTimePolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_Messaging::ReplyStartTimePolicy::_dispatch (CORBA::ServerRequest & /* req */, void * /* context */, CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA_BAD_OPERATION ());
-}
-
-const char* POA_Messaging::ReplyStartTimePolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/ReplyStartTimePolicy:1.0";
-}
-
-POA_Messaging::_tao_collocated_ReplyStartTimePolicy::_tao_collocated_ReplyStartTimePolicy (
-    POA_Messaging::ReplyStartTimePolicy_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (Messaging,ReplyStartTimePolicy) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_Messaging::ReplyStartTimePolicy_ptr POA_Messaging::_tao_collocated_ReplyStartTimePolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_Messaging::_tao_collocated_ReplyStartTimePolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-TimeBase::UtcT POA_Messaging::_tao_collocated_ReplyStartTimePolicy::start_time  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->start_time (
-    ACE_TRY_ENV
-  );
-}
-
-
-Messaging::ReplyStartTimePolicy*
-POA_Messaging::ReplyStartTimePolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_Messaging::_tao_collocated_ReplyStartTimePolicy (this, stub);
-}
-
-// ****************************************************************
-
-POA_Messaging::ReplyEndTimePolicy::ReplyEndTimePolicy (void)
-{
-}
-
-POA_Messaging::ReplyEndTimePolicy::ReplyEndTimePolicy (const ReplyEndTimePolicy& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs),
-    TAO_ServantBase (rhs)
-{}
-
-POA_Messaging::ReplyEndTimePolicy::~ReplyEndTimePolicy (void)
-{
-}
-
-CORBA::Boolean POA_Messaging::ReplyEndTimePolicy::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/ReplyEndTimePolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_Messaging::ReplyEndTimePolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/ReplyEndTimePolicy:1.0") == 0)
-    return ACE_static_cast (POA_Messaging::ReplyEndTimePolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_Messaging::ReplyEndTimePolicy::_dispatch (CORBA::ServerRequest & /* req */, void * /* context */, CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA_BAD_OPERATION ());
-}
-
-const char* POA_Messaging::ReplyEndTimePolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/ReplyEndTimePolicy:1.0";
-}
-
-POA_Messaging::_tao_collocated_ReplyEndTimePolicy::_tao_collocated_ReplyEndTimePolicy (
-    POA_Messaging::ReplyEndTimePolicy_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (Messaging,ReplyEndTimePolicy) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_Messaging::ReplyEndTimePolicy_ptr POA_Messaging::_tao_collocated_ReplyEndTimePolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_Messaging::_tao_collocated_ReplyEndTimePolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-TimeBase::UtcT POA_Messaging::_tao_collocated_ReplyEndTimePolicy::end_time  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->end_time (
-    ACE_TRY_ENV
-  );
-}
-
-
-Messaging::ReplyEndTimePolicy*
-POA_Messaging::ReplyEndTimePolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_Messaging::_tao_collocated_ReplyEndTimePolicy (this, stub);
-}
-
-// ****************************************************************
-
-POA_Messaging::RelativeRequestTimeoutPolicy::RelativeRequestTimeoutPolicy (void)
-{
-}
-
-POA_Messaging::RelativeRequestTimeoutPolicy::RelativeRequestTimeoutPolicy (const RelativeRequestTimeoutPolicy& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs),
-    TAO_ServantBase (rhs)
-{}
-
-POA_Messaging::RelativeRequestTimeoutPolicy::~RelativeRequestTimeoutPolicy (void)
-{
-}
-
-CORBA::Boolean POA_Messaging::RelativeRequestTimeoutPolicy::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RelativeRequestTimeoutPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_Messaging::RelativeRequestTimeoutPolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/RelativeRequestTimeoutPolicy:1.0") == 0)
-    return ACE_static_cast (POA_Messaging::RelativeRequestTimeoutPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_Messaging::RelativeRequestTimeoutPolicy::_dispatch (CORBA::ServerRequest & /* req */, void * /* context */, CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA_BAD_OPERATION ());
-}
-
-const char* POA_Messaging::RelativeRequestTimeoutPolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/RelativeRequestTimeoutPolicy:1.0";
-}
-
-POA_Messaging::_tao_collocated_RelativeRequestTimeoutPolicy::_tao_collocated_RelativeRequestTimeoutPolicy (
-    POA_Messaging::RelativeRequestTimeoutPolicy_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (Messaging,RelativeRequestTimeoutPolicy) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_Messaging::RelativeRequestTimeoutPolicy_ptr POA_Messaging::_tao_collocated_RelativeRequestTimeoutPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_Messaging::_tao_collocated_RelativeRequestTimeoutPolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-TimeBase::TimeT POA_Messaging::_tao_collocated_RelativeRequestTimeoutPolicy::relative_expiry  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->relative_expiry (
-    ACE_TRY_ENV
-  );
-}
-
-
-Messaging::RelativeRequestTimeoutPolicy*
-POA_Messaging::RelativeRequestTimeoutPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_Messaging::_tao_collocated_RelativeRequestTimeoutPolicy (this, stub);
-}
-
-// ****************************************************************
-
-POA_Messaging::RelativeRoundtripTimeoutPolicy::RelativeRoundtripTimeoutPolicy (void)
-{
-}
-
-POA_Messaging::RelativeRoundtripTimeoutPolicy::RelativeRoundtripTimeoutPolicy (const RelativeRoundtripTimeoutPolicy& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs),
-    TAO_ServantBase (rhs)
-{}
-
-POA_Messaging::RelativeRoundtripTimeoutPolicy::~RelativeRoundtripTimeoutPolicy (void)
-{
-}
-
-CORBA::Boolean POA_Messaging::RelativeRoundtripTimeoutPolicy::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_Messaging::RelativeRoundtripTimeoutPolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0") == 0)
-    return ACE_static_cast (POA_Messaging::RelativeRoundtripTimeoutPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_Messaging::RelativeRoundtripTimeoutPolicy::_dispatch (CORBA::ServerRequest & /* req */, void * /* context */, CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA_BAD_OPERATION ());
-}
-
-const char* POA_Messaging::RelativeRoundtripTimeoutPolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0";
-}
-
-POA_Messaging::_tao_collocated_RelativeRoundtripTimeoutPolicy::_tao_collocated_RelativeRoundtripTimeoutPolicy (
-    POA_Messaging::RelativeRoundtripTimeoutPolicy_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (Messaging,RelativeRoundtripTimeoutPolicy) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_Messaging::RelativeRoundtripTimeoutPolicy_ptr POA_Messaging::_tao_collocated_RelativeRoundtripTimeoutPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_Messaging::_tao_collocated_RelativeRoundtripTimeoutPolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-TimeBase::TimeT POA_Messaging::_tao_collocated_RelativeRoundtripTimeoutPolicy::relative_expiry  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->relative_expiry (
-    ACE_TRY_ENV
-  );
-}
-
-
-Messaging::RelativeRoundtripTimeoutPolicy*
-POA_Messaging::RelativeRoundtripTimeoutPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_Messaging::_tao_collocated_RelativeRoundtripTimeoutPolicy (this, stub);
-}
-
-// ****************************************************************
-
-POA_Messaging::RoutingPolicy::RoutingPolicy (void)
-{
-}
-
-POA_Messaging::RoutingPolicy::RoutingPolicy (const RoutingPolicy& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs),
-    TAO_ServantBase (rhs)
-{}
-
-POA_Messaging::RoutingPolicy::~RoutingPolicy (void)
-{
-}
-
-CORBA::Boolean POA_Messaging::RoutingPolicy::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RoutingPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_Messaging::RoutingPolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/RoutingPolicy:1.0") == 0)
-    return ACE_static_cast (POA_Messaging::RoutingPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_Messaging::RoutingPolicy::_dispatch (CORBA::ServerRequest & /* req */, void * /* context */, CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA_BAD_OPERATION ());
-}
-
-const char* POA_Messaging::RoutingPolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/RoutingPolicy:1.0";
-}
-
-POA_Messaging::_tao_collocated_RoutingPolicy::_tao_collocated_RoutingPolicy (
-    POA_Messaging::RoutingPolicy_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (Messaging,RoutingPolicy) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_Messaging::RoutingPolicy_ptr POA_Messaging::_tao_collocated_RoutingPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_Messaging::_tao_collocated_RoutingPolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-Messaging::RoutingTypeRange POA_Messaging::_tao_collocated_RoutingPolicy::routing_range  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->routing_range (
-    ACE_TRY_ENV
-  );
-}
-
-
-Messaging::RoutingPolicy*
-POA_Messaging::RoutingPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_Messaging::_tao_collocated_RoutingPolicy (this, stub);
-}
-
-// ****************************************************************
-
-POA_Messaging::MaxHopsPolicy::MaxHopsPolicy (void)
-{
-}
-
-POA_Messaging::MaxHopsPolicy::MaxHopsPolicy (const MaxHopsPolicy& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs),
-    TAO_ServantBase (rhs)
-{}
-
-POA_Messaging::MaxHopsPolicy::~MaxHopsPolicy (void)
-{
-}
-
-CORBA::Boolean POA_Messaging::MaxHopsPolicy::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/MaxHopsPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_Messaging::MaxHopsPolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/MaxHopsPolicy:1.0") == 0)
-    return ACE_static_cast (POA_Messaging::MaxHopsPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_Messaging::MaxHopsPolicy::_dispatch (CORBA::ServerRequest & /* req */, void * /* context */, CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA_BAD_OPERATION ());
-}
-
-const char* POA_Messaging::MaxHopsPolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/MaxHopsPolicy:1.0";
-}
-
-POA_Messaging::_tao_collocated_MaxHopsPolicy::_tao_collocated_MaxHopsPolicy (
-    POA_Messaging::MaxHopsPolicy_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (Messaging,MaxHopsPolicy) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_Messaging::MaxHopsPolicy_ptr POA_Messaging::_tao_collocated_MaxHopsPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_Messaging::_tao_collocated_MaxHopsPolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-CORBA::UShort POA_Messaging::_tao_collocated_MaxHopsPolicy::max_hops  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->max_hops (
-    ACE_TRY_ENV
-  );
-}
-
-
-Messaging::MaxHopsPolicy*
-POA_Messaging::MaxHopsPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_Messaging::_tao_collocated_MaxHopsPolicy (this, stub);
-}
-
-// ****************************************************************
-
-POA_Messaging::QueueOrderPolicy::QueueOrderPolicy (void)
-{
-}
-
-POA_Messaging::QueueOrderPolicy::QueueOrderPolicy (const QueueOrderPolicy& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs),
-    TAO_ServantBase (rhs)
-{}
-
-POA_Messaging::QueueOrderPolicy::~QueueOrderPolicy (void)
-{
-}
-
-CORBA::Boolean POA_Messaging::QueueOrderPolicy::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/QueueOrderPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_Messaging::QueueOrderPolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/QueueOrderPolicy:1.0") == 0)
-    return ACE_static_cast (POA_Messaging::QueueOrderPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_Messaging::QueueOrderPolicy::_dispatch (CORBA::ServerRequest & /* req */, void * /* context */, CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA_BAD_OPERATION ());
-}
-
-const char* POA_Messaging::QueueOrderPolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/QueueOrderPolicy:1.0";
-}
-
-POA_Messaging::_tao_collocated_QueueOrderPolicy::_tao_collocated_QueueOrderPolicy (
-    POA_Messaging::QueueOrderPolicy_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (Messaging,QueueOrderPolicy) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_Messaging::QueueOrderPolicy_ptr POA_Messaging::_tao_collocated_QueueOrderPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_Messaging::_tao_collocated_QueueOrderPolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-Messaging::Ordering POA_Messaging::_tao_collocated_QueueOrderPolicy::allowed_orders  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->allowed_orders (
-    ACE_TRY_ENV
-  );
-}
-
-
-Messaging::QueueOrderPolicy*
-POA_Messaging::QueueOrderPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_Messaging::_tao_collocated_QueueOrderPolicy (this, stub);
-}
-
-// ****************************************************************
-
-#if defined (TAO_POLLER)
-POA_Messaging::ReplyHandler::ReplyHandler (void)
-{
-}
-
-POA_Messaging::ReplyHandler::ReplyHandler (const ReplyHandler& rhs)
-  :   TAO_ServantBase (rhs)
-{}
-
-POA_Messaging::ReplyHandler::~ReplyHandler (void)
-{
-}
-
-CORBA::Boolean POA_Messaging::ReplyHandler::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/ReplyHandler:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_Messaging::ReplyHandler::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/ReplyHandler:1.0") == 0)
-    return ACE_static_cast (POA_Messaging::ReplyHandler_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_Messaging::ReplyHandler::_dispatch (CORBA::ServerRequest & /* req */, void * /* context */, CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA_BAD_OPERATION ());
-}
-
-const char* POA_Messaging::ReplyHandler::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/ReplyHandler:1.0";
-}
-
-POA_Messaging::_tao_collocated_ReplyHandler::_tao_collocated_ReplyHandler (
-    POA_Messaging::ReplyHandler_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (Messaging,ReplyHandler) (),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_Messaging::ReplyHandler_ptr POA_Messaging::_tao_collocated_ReplyHandler::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_Messaging::_tao_collocated_ReplyHandler::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-
-Messaging::ReplyHandler*
-POA_Messaging::ReplyHandler::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_Messaging::_tao_collocated_ReplyHandler (this, stub);
-}
-
-// ****************************************************************
-
-class TAO_Messaging_Poller_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-{
-private:
-  unsigned int hash (const char *str, unsigned int len);
-public:
- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-};
-/* starting time is 12:37:20 */
-/* C++ code produced by gperf version 2.7 (GNU C++ version) */
-/* Command-line: /project/macarena/coryan/head/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_Messaging_Poller_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_Messaging_Poller_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-     30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-     30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-     30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-     30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-     30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-     30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-     30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-     30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-     30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-     30, 30, 30, 30, 30,  0, 30,  0, 30, 10,
-     30,  5, 30, 30, 30,  0, 30, 30, 30, 30,
-     30, 30, 30, 30,  0, 30,  0, 30, 30, 30,
-     30,  0, 30, 30, 30, 30, 30, 30,
-    };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
-}
-
-const class TAO_operation_db_entry *
-TAO_Messaging_Poller_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 11,
-      MIN_WORD_LENGTH = 5,
-      MAX_WORD_LENGTH = 23,
-      MIN_HASH_VALUE = 5,
-      MAX_HASH_VALUE = 29,
-      HASH_VALUE_RANGE = 25,
-      DUPLICATES = 2
-    };
-
-  static const class TAO_operation_db_entry  wordlist[] =
-    {
-      {"",0}, {"",0}, {"",0}, {"",0}, {"",0},
-      {"_is_a",  &POA_Messaging::Poller::_is_a_skel},
-      {"is_ready",      &POA_Messaging::Poller::is_ready_skel},
-      {"_get_target",   &POA_Messaging::Poller::_get_target_skel},
-      {"_non_existent",  &POA_Messaging::Poller::_non_existent_skel},
-      {"_get_op_name",  &POA_Messaging::Poller::_get_op_name_skel},
-      {"_get_is_from_poller",   &POA_Messaging::Poller::_get_is_from_poller_skel},
-      {"_get_operation_target",         &POA_Messaging::Poller::_get_operation_target_skel},
-      {"_get_associated_handler",       &POA_Messaging::Poller::_get_associated_handler_skel},
-      {"_set_associated_handler",       &POA_Messaging::Poller::_set_associated_handler_skel},
-      {"_get_operation_name",   &POA_Messaging::Poller::_get_operation_name_skel},
-      {"create_pollable_set",   &POA_Messaging::Poller::create_pollable_set_skel},
-    };
-
-  static const signed char lookup[] =
-    {
-       -1,  -1,  -1,  -1,  -1,   5,  -1,  -1,   6,  -1,  -1,   7,  -1,   8,
-       -1, -12,  -2,   9,  -1,  10,  -1,  11,  -1, -37,  14,  -1,  -1,  -1,
-       -1,  15,
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      unsigned int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-        {
-          int slot = lookup[key];
-
-          if (slot >= 0 && slot < MAX_HASH_VALUE)
-            {
-              const char *s = wordlist[slot].opname_;
-
-              if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-                return &wordlist[slot];
-            }
-          else if (slot < 0 && slot >= -MAX_HASH_VALUE)
-            return 0;
-          else
-            {
-              u_int offset = key + slot + (slot > 0 ? -MAX_HASH_VALUE : MAX_HASH_VALUE);
-              const TAO_operation_db_entry *base = &wordlist[-lookup[offset]];
-              const TAO_operation_db_entry *ptr = base + -lookup[offset + 1];
-
-              while (--ptr >= base)
-                if (*str == *ptr->opname_ && !strncmp (str + 1, ptr->opname_ + 1, len - 1))
-                  return ptr;
-            }
-        }
-    }
-  return 0;
-}
-/* ending time is 12:37:20 */
-TAO_Messaging_Poller_Perfect_Hash_OpTable tao_Messaging_Poller_optable;
-// skeleton constructor
-POA_Messaging::Poller::Poller (void)
-{
-  this->optable_ = &tao_Messaging_Poller_optable;
-}
-
-// copy ctor
-POA_Messaging::Poller::Poller (const Poller& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Pollable) (rhs),
-    TAO_ServantBase (rhs)
-{}
-// skeleton destructor
-POA_Messaging::Poller::~Poller (void)
-{
-}
-void POA_Messaging::Poller::_get_operation_target_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-)
-{
-  POA_Messaging::Poller *_tao_impl = (POA_Messaging::Poller *)_tao_object_reference;
-  CORBA::Object_var _tao_retval;
-  _tao_retval = _tao_impl->operation_target (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval.in ())
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_Messaging::Poller::_get_operation_name_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-)
-{
-  POA_Messaging::Poller *_tao_impl = (POA_Messaging::Poller *)_tao_object_reference;
-  CORBA::String_var _tao_retval;
-  _tao_retval = _tao_impl->operation_name (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval.in ())
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_Messaging::Poller::_get_associated_handler_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-)
-{
-  POA_Messaging::Poller *_tao_impl = (POA_Messaging::Poller *)_tao_object_reference;
-  Messaging::ReplyHandler_var _tao_retval;
-  _tao_retval = _tao_impl->associated_handler (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval.in ())
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_Messaging::Poller::_set_associated_handler_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-)
-{
-  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_Messaging::Poller *_tao_impl = (POA_Messaging::Poller *)_tao_object_reference;
-  Messaging::ReplyHandler_var associated_handler;
-  if (!(
-    (_tao_in >> associated_handler.out ())
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-  _tao_impl->associated_handler (
-    associated_handler.in (),
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-}
-
-void POA_Messaging::Poller::_get_is_from_poller_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-)
-{
-  POA_Messaging::Poller *_tao_impl = (POA_Messaging::Poller *)_tao_object_reference;
-  CORBA::Boolean _tao_retval = 0;
-  _tao_retval = _tao_impl->is_from_poller (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_Messaging::Poller::_get_target_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-)
-{
-  POA_Messaging::Poller *_tao_impl = (POA_Messaging::Poller *)_tao_object_reference;
-  CORBA::Object_var _tao_retval;
-  _tao_retval = _tao_impl->target (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval.in ())
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_Messaging::Poller::_get_op_name_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-)
-{
-  POA_Messaging::Poller *_tao_impl = (POA_Messaging::Poller *)_tao_object_reference;
-  CORBA::String_var _tao_retval;
-  _tao_retval = _tao_impl->op_name (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval.in ())
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_Messaging::Poller::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel Messaging_Poller_is_a_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0},
-    {CORBA::_tc_string, CORBA::ARG_IN, 0}
-  };
-  static const TAO_Call_Data_Skel Messaging_Poller_is_a_calldata =
-  {"_is_a", 1, 2, Messaging_Poller_is_a_paramdata};
-  POA_Messaging::Poller_ptr  _tao_impl = (POA_Messaging::Poller_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  CORBA::String_var _tao_value;
-  _tao_server_request.demarshal (
-    ACE_TRY_ENV,
-    &Messaging_Poller_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-  ACE_CHECK;
-  _tao_retval = _tao_impl->_is_a (_tao_value.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &Messaging_Poller_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-}
-
-CORBA::Boolean POA_Messaging::Poller::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/Poller:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Pollable:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void POA_Messaging::Poller::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * /* _tao_object_reference */ ,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel Messaging_Poller_non_existent_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0}
-  };
-  static const TAO_Call_Data_Skel Messaging_Poller_non_existent_calldata =
-  {"_non_existent", 1, 1, Messaging_Poller_non_existent_paramdata};
-  CORBA::Boolean _tao_retval = 0;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &Messaging_Poller_non_existent_calldata,
-    &_tao_retval
-  );
-}
-
-void* POA_Messaging::Poller::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/Poller:1.0") == 0)
-    return ACE_static_cast (POA_Messaging::Poller_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Pollable:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Pollable_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_Messaging::Poller::_dispatch (CORBA::ServerRequest &req, void * context, CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
-}
-
-const char* POA_Messaging::Poller::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/Poller:1.0";
-}
-
-POA_Messaging::_tao_collocated_Poller::_tao_collocated_Poller (
-    POA_Messaging::Poller_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (Messaging,Poller) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Pollable) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_Messaging::Poller_ptr POA_Messaging::_tao_collocated_Poller::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_Messaging::_tao_collocated_Poller::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-CORBA::Object_ptr POA_Messaging::_tao_collocated_Poller::operation_target  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->operation_target (
-    ACE_TRY_ENV
-  );
-}
-
-char * POA_Messaging::_tao_collocated_Poller::operation_name  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->operation_name (
-    ACE_TRY_ENV
-  );
-}
-
-Messaging::ReplyHandler_ptr POA_Messaging::_tao_collocated_Poller::associated_handler  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->associated_handler (
-    ACE_TRY_ENV
-  );
-}
-
-void POA_Messaging::_tao_collocated_Poller::associated_handler  (
-    Messaging::ReplyHandler_ptr associated_handler,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->servant_->associated_handler (
-    associated_handler,
-    ACE_TRY_ENV
-  );
-}
-
-CORBA::Boolean POA_Messaging::_tao_collocated_Poller::is_from_poller  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->is_from_poller (
-    ACE_TRY_ENV
-  );
-}
-
-CORBA::Object_ptr POA_Messaging::_tao_collocated_Poller::target  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->target (
-    ACE_TRY_ENV
-  );
-}
-
-char * POA_Messaging::_tao_collocated_Poller::op_name  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->op_name (
-    ACE_TRY_ENV
-  );
-}
-
-
-Messaging::Poller*
-POA_Messaging::Poller::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_Messaging::_tao_collocated_Poller (this, stub);
-}
-#endif /* TAO_POLLER */
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
diff --git a/TAO/tao/MessagingS.h b/TAO/tao/MessagingS.h
deleted file mode 100644
index 957c74c8064..00000000000
--- a/TAO/tao/MessagingS.h
+++ /dev/null
@@ -1,2016 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#ifndef TAO_IDL_MESSAGINGS_H
-#define TAO_IDL_MESSAGINGS_H
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-
-#include "TimeBaseS.h"
-#include "POA_CORBA.h"
-#include "MessagingC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-TAO_NAMESPACE  POA_Messaging
-{
-  class RebindPolicy;
-  typedef RebindPolicy *RebindPolicy_ptr;
-  class TAO_Export RebindPolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    RebindPolicy (void);
-  public:
-    RebindPolicy (const RebindPolicy& rhs);
-    virtual ~RebindPolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual Messaging::RebindMode rebind_mode (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    Messaging::RebindPolicy *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_RebindPolicy     : public virtual Messaging::RebindPolicy,
-      public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_RebindPolicy (
-        RebindPolicy_ptr  servant,
-        TAO_Stub *stub
-      );
-    RebindPolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual Messaging::RebindMode rebind_mode (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    RebindPolicy_ptr servant_;
-  };
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export RebindPolicy_tie : public RebindPolicy
-  {
-  public:
-    RebindPolicy_tie (T &t);
-    // the T& ctor
-    RebindPolicy_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    RebindPolicy_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    RebindPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~RebindPolicy_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    Messaging::RebindMode rebind_mode (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::PolicyType policy_type (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Policy_ptr copy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    void destroy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    RebindPolicy_tie (const RebindPolicy_tie &);
-    void operator= (const RebindPolicy_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-  class SyncScopePolicy;
-  typedef SyncScopePolicy *SyncScopePolicy_ptr;
-  class TAO_Export SyncScopePolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    SyncScopePolicy (void);
-  public:
-    SyncScopePolicy (const SyncScopePolicy& rhs);
-    virtual ~SyncScopePolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual Messaging::SyncScope synchronization (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    Messaging::SyncScopePolicy *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_SyncScopePolicy     : public virtual Messaging::SyncScopePolicy,
-      public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_SyncScopePolicy (
-        SyncScopePolicy_ptr  servant,
-        TAO_Stub *stub
-      );
-    SyncScopePolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual Messaging::SyncScope synchronization (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    SyncScopePolicy_ptr servant_;
-  };
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export SyncScopePolicy_tie : public SyncScopePolicy
-  {
-  public:
-    SyncScopePolicy_tie (T &t);
-    // the T& ctor
-    SyncScopePolicy_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    SyncScopePolicy_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    SyncScopePolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~SyncScopePolicy_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    Messaging::SyncScope synchronization (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::PolicyType policy_type (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Policy_ptr copy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    void destroy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    SyncScopePolicy_tie (const SyncScopePolicy_tie &);
-    void operator= (const SyncScopePolicy_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-  class RequestPriorityPolicy;
-  typedef RequestPriorityPolicy *RequestPriorityPolicy_ptr;
-  class TAO_Export RequestPriorityPolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    RequestPriorityPolicy (void);
-  public:
-    RequestPriorityPolicy (const RequestPriorityPolicy& rhs);
-    virtual ~RequestPriorityPolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual Messaging::PriorityRange priority_range (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    Messaging::RequestPriorityPolicy *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_RequestPriorityPolicy     : public virtual Messaging::RequestPriorityPolicy,
-      public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_RequestPriorityPolicy (
-        RequestPriorityPolicy_ptr  servant,
-        TAO_Stub *stub
-      );
-    RequestPriorityPolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual Messaging::PriorityRange priority_range (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    RequestPriorityPolicy_ptr servant_;
-  };
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export RequestPriorityPolicy_tie : public RequestPriorityPolicy
-  {
-  public:
-    RequestPriorityPolicy_tie (T &t);
-    // the T& ctor
-    RequestPriorityPolicy_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    RequestPriorityPolicy_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    RequestPriorityPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~RequestPriorityPolicy_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    Messaging::PriorityRange priority_range (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::PolicyType policy_type (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Policy_ptr copy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    void destroy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    RequestPriorityPolicy_tie (const RequestPriorityPolicy_tie &);
-    void operator= (const RequestPriorityPolicy_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-  class ReplyPriorityPolicy;
-  typedef ReplyPriorityPolicy *ReplyPriorityPolicy_ptr;
-  class TAO_Export ReplyPriorityPolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    ReplyPriorityPolicy (void);
-  public:
-    ReplyPriorityPolicy (const ReplyPriorityPolicy& rhs);
-    virtual ~ReplyPriorityPolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual Messaging::PriorityRange priority_range (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    Messaging::ReplyPriorityPolicy *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_ReplyPriorityPolicy     : public virtual Messaging::ReplyPriorityPolicy,
-      public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_ReplyPriorityPolicy (
-        ReplyPriorityPolicy_ptr  servant,
-        TAO_Stub *stub
-      );
-    ReplyPriorityPolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual Messaging::PriorityRange priority_range (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    ReplyPriorityPolicy_ptr servant_;
-  };
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export ReplyPriorityPolicy_tie : public ReplyPriorityPolicy
-  {
-  public:
-    ReplyPriorityPolicy_tie (T &t);
-    // the T& ctor
-    ReplyPriorityPolicy_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    ReplyPriorityPolicy_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    ReplyPriorityPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~ReplyPriorityPolicy_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    Messaging::PriorityRange priority_range (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::PolicyType policy_type (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Policy_ptr copy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    void destroy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    ReplyPriorityPolicy_tie (const ReplyPriorityPolicy_tie &);
-    void operator= (const ReplyPriorityPolicy_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-  class RequestStartTimePolicy;
-  typedef RequestStartTimePolicy *RequestStartTimePolicy_ptr;
-  class TAO_Export RequestStartTimePolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    RequestStartTimePolicy (void);
-  public:
-    RequestStartTimePolicy (const RequestStartTimePolicy& rhs);
-    virtual ~RequestStartTimePolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual TimeBase::UtcT start_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    Messaging::RequestStartTimePolicy *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_RequestStartTimePolicy     : public virtual Messaging::RequestStartTimePolicy,
-      public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_RequestStartTimePolicy (
-        RequestStartTimePolicy_ptr  servant,
-        TAO_Stub *stub
-      );
-    RequestStartTimePolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual TimeBase::UtcT start_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    RequestStartTimePolicy_ptr servant_;
-  };
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export RequestStartTimePolicy_tie : public RequestStartTimePolicy
-  {
-  public:
-    RequestStartTimePolicy_tie (T &t);
-    // the T& ctor
-    RequestStartTimePolicy_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    RequestStartTimePolicy_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    RequestStartTimePolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~RequestStartTimePolicy_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    TimeBase::UtcT start_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::PolicyType policy_type (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Policy_ptr copy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    void destroy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    RequestStartTimePolicy_tie (const RequestStartTimePolicy_tie &);
-    void operator= (const RequestStartTimePolicy_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-  class RequestEndTimePolicy;
-  typedef RequestEndTimePolicy *RequestEndTimePolicy_ptr;
-  class TAO_Export RequestEndTimePolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    RequestEndTimePolicy (void);
-  public:
-    RequestEndTimePolicy (const RequestEndTimePolicy& rhs);
-    virtual ~RequestEndTimePolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual TimeBase::UtcT end_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    Messaging::RequestEndTimePolicy *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_RequestEndTimePolicy     : public virtual Messaging::RequestEndTimePolicy,
-      public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_RequestEndTimePolicy (
-        RequestEndTimePolicy_ptr  servant,
-        TAO_Stub *stub
-      );
-    RequestEndTimePolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual TimeBase::UtcT end_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    RequestEndTimePolicy_ptr servant_;
-  };
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export RequestEndTimePolicy_tie : public RequestEndTimePolicy
-  {
-  public:
-    RequestEndTimePolicy_tie (T &t);
-    // the T& ctor
-    RequestEndTimePolicy_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    RequestEndTimePolicy_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    RequestEndTimePolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~RequestEndTimePolicy_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    TimeBase::UtcT end_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::PolicyType policy_type (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Policy_ptr copy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    void destroy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    RequestEndTimePolicy_tie (const RequestEndTimePolicy_tie &);
-    void operator= (const RequestEndTimePolicy_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-  class ReplyStartTimePolicy;
-  typedef ReplyStartTimePolicy *ReplyStartTimePolicy_ptr;
-  class TAO_Export ReplyStartTimePolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    ReplyStartTimePolicy (void);
-  public:
-    ReplyStartTimePolicy (const ReplyStartTimePolicy& rhs);
-    virtual ~ReplyStartTimePolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual TimeBase::UtcT start_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    Messaging::ReplyStartTimePolicy *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_ReplyStartTimePolicy     : public virtual Messaging::ReplyStartTimePolicy,
-      public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_ReplyStartTimePolicy (
-        ReplyStartTimePolicy_ptr  servant,
-        TAO_Stub *stub
-      );
-    ReplyStartTimePolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual TimeBase::UtcT start_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    ReplyStartTimePolicy_ptr servant_;
-  };
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export ReplyStartTimePolicy_tie : public ReplyStartTimePolicy
-  {
-  public:
-    ReplyStartTimePolicy_tie (T &t);
-    // the T& ctor
-    ReplyStartTimePolicy_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    ReplyStartTimePolicy_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    ReplyStartTimePolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~ReplyStartTimePolicy_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    TimeBase::UtcT start_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::PolicyType policy_type (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Policy_ptr copy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    void destroy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    ReplyStartTimePolicy_tie (const ReplyStartTimePolicy_tie &);
-    void operator= (const ReplyStartTimePolicy_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-  class ReplyEndTimePolicy;
-  typedef ReplyEndTimePolicy *ReplyEndTimePolicy_ptr;
-  class TAO_Export ReplyEndTimePolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    ReplyEndTimePolicy (void);
-  public:
-    ReplyEndTimePolicy (const ReplyEndTimePolicy& rhs);
-    virtual ~ReplyEndTimePolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual TimeBase::UtcT end_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    Messaging::ReplyEndTimePolicy *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_ReplyEndTimePolicy     : public virtual Messaging::ReplyEndTimePolicy,
-      public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_ReplyEndTimePolicy (
-        ReplyEndTimePolicy_ptr  servant,
-        TAO_Stub *stub
-      );
-    ReplyEndTimePolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual TimeBase::UtcT end_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    ReplyEndTimePolicy_ptr servant_;
-  };
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export ReplyEndTimePolicy_tie : public ReplyEndTimePolicy
-  {
-  public:
-    ReplyEndTimePolicy_tie (T &t);
-    // the T& ctor
-    ReplyEndTimePolicy_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    ReplyEndTimePolicy_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    ReplyEndTimePolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~ReplyEndTimePolicy_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    TimeBase::UtcT end_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::PolicyType policy_type (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Policy_ptr copy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    void destroy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    ReplyEndTimePolicy_tie (const ReplyEndTimePolicy_tie &);
-    void operator= (const ReplyEndTimePolicy_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-  class RelativeRequestTimeoutPolicy;
-  typedef RelativeRequestTimeoutPolicy *RelativeRequestTimeoutPolicy_ptr;
-  class TAO_Export RelativeRequestTimeoutPolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    RelativeRequestTimeoutPolicy (void);
-  public:
-    RelativeRequestTimeoutPolicy (const RelativeRequestTimeoutPolicy& rhs);
-    virtual ~RelativeRequestTimeoutPolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual TimeBase::TimeT relative_expiry (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    Messaging::RelativeRequestTimeoutPolicy *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_RelativeRequestTimeoutPolicy     : public virtual Messaging::RelativeRequestTimeoutPolicy,
-      public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_RelativeRequestTimeoutPolicy (
-        RelativeRequestTimeoutPolicy_ptr  servant,
-        TAO_Stub *stub
-      );
-    RelativeRequestTimeoutPolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual TimeBase::TimeT relative_expiry (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    RelativeRequestTimeoutPolicy_ptr servant_;
-  };
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export RelativeRequestTimeoutPolicy_tie : public RelativeRequestTimeoutPolicy
-  {
-  public:
-    RelativeRequestTimeoutPolicy_tie (T &t);
-    // the T& ctor
-    RelativeRequestTimeoutPolicy_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    RelativeRequestTimeoutPolicy_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    RelativeRequestTimeoutPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~RelativeRequestTimeoutPolicy_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    TimeBase::TimeT relative_expiry (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::PolicyType policy_type (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Policy_ptr copy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    void destroy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    RelativeRequestTimeoutPolicy_tie (const RelativeRequestTimeoutPolicy_tie &);
-    void operator= (const RelativeRequestTimeoutPolicy_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-  class RelativeRoundtripTimeoutPolicy;
-  typedef RelativeRoundtripTimeoutPolicy *RelativeRoundtripTimeoutPolicy_ptr;
-  class TAO_Export RelativeRoundtripTimeoutPolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    RelativeRoundtripTimeoutPolicy (void);
-  public:
-    RelativeRoundtripTimeoutPolicy (const RelativeRoundtripTimeoutPolicy& rhs);
-    virtual ~RelativeRoundtripTimeoutPolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual TimeBase::TimeT relative_expiry (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    Messaging::RelativeRoundtripTimeoutPolicy *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_RelativeRoundtripTimeoutPolicy     : public virtual Messaging::RelativeRoundtripTimeoutPolicy,
-      public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_RelativeRoundtripTimeoutPolicy (
-        RelativeRoundtripTimeoutPolicy_ptr  servant,
-        TAO_Stub *stub
-      );
-    RelativeRoundtripTimeoutPolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual TimeBase::TimeT relative_expiry (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    RelativeRoundtripTimeoutPolicy_ptr servant_;
-  };
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export RelativeRoundtripTimeoutPolicy_tie : public RelativeRoundtripTimeoutPolicy
-  {
-  public:
-    RelativeRoundtripTimeoutPolicy_tie (T &t);
-    // the T& ctor
-    RelativeRoundtripTimeoutPolicy_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    RelativeRoundtripTimeoutPolicy_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    RelativeRoundtripTimeoutPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~RelativeRoundtripTimeoutPolicy_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    TimeBase::TimeT relative_expiry (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::PolicyType policy_type (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Policy_ptr copy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    void destroy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    RelativeRoundtripTimeoutPolicy_tie (const RelativeRoundtripTimeoutPolicy_tie &);
-    void operator= (const RelativeRoundtripTimeoutPolicy_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-  class RoutingPolicy;
-  typedef RoutingPolicy *RoutingPolicy_ptr;
-  class TAO_Export RoutingPolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    RoutingPolicy (void);
-  public:
-    RoutingPolicy (const RoutingPolicy& rhs);
-    virtual ~RoutingPolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual Messaging::RoutingTypeRange routing_range (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    Messaging::RoutingPolicy *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_RoutingPolicy     : public virtual Messaging::RoutingPolicy,
-      public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_RoutingPolicy (
-        RoutingPolicy_ptr  servant,
-        TAO_Stub *stub
-      );
-    RoutingPolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual Messaging::RoutingTypeRange routing_range (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    RoutingPolicy_ptr servant_;
-  };
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export RoutingPolicy_tie : public RoutingPolicy
-  {
-  public:
-    RoutingPolicy_tie (T &t);
-    // the T& ctor
-    RoutingPolicy_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    RoutingPolicy_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    RoutingPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~RoutingPolicy_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    Messaging::RoutingTypeRange routing_range (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::PolicyType policy_type (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Policy_ptr copy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    void destroy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    RoutingPolicy_tie (const RoutingPolicy_tie &);
-    void operator= (const RoutingPolicy_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-  class MaxHopsPolicy;
-  typedef MaxHopsPolicy *MaxHopsPolicy_ptr;
-  class TAO_Export MaxHopsPolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    MaxHopsPolicy (void);
-  public:
-    MaxHopsPolicy (const MaxHopsPolicy& rhs);
-    virtual ~MaxHopsPolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual CORBA::UShort max_hops (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    Messaging::MaxHopsPolicy *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_MaxHopsPolicy     : public virtual Messaging::MaxHopsPolicy,
-      public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_MaxHopsPolicy (
-        MaxHopsPolicy_ptr  servant,
-        TAO_Stub *stub
-      );
-    MaxHopsPolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::UShort max_hops (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    MaxHopsPolicy_ptr servant_;
-  };
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export MaxHopsPolicy_tie : public MaxHopsPolicy
-  {
-  public:
-    MaxHopsPolicy_tie (T &t);
-    // the T& ctor
-    MaxHopsPolicy_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    MaxHopsPolicy_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    MaxHopsPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~MaxHopsPolicy_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::UShort max_hops (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::PolicyType policy_type (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Policy_ptr copy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    void destroy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    MaxHopsPolicy_tie (const MaxHopsPolicy_tie &);
-    void operator= (const MaxHopsPolicy_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-  class QueueOrderPolicy;
-  typedef QueueOrderPolicy *QueueOrderPolicy_ptr;
-  class TAO_Export QueueOrderPolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    QueueOrderPolicy (void);
-  public:
-    QueueOrderPolicy (const QueueOrderPolicy& rhs);
-    virtual ~QueueOrderPolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual Messaging::Ordering allowed_orders (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    Messaging::QueueOrderPolicy *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_QueueOrderPolicy     : public virtual Messaging::QueueOrderPolicy,
-      public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_QueueOrderPolicy (
-        QueueOrderPolicy_ptr  servant,
-        TAO_Stub *stub
-      );
-    QueueOrderPolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual Messaging::Ordering allowed_orders (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    QueueOrderPolicy_ptr servant_;
-  };
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export QueueOrderPolicy_tie : public QueueOrderPolicy
-  {
-  public:
-    QueueOrderPolicy_tie (T &t);
-    // the T& ctor
-    QueueOrderPolicy_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    QueueOrderPolicy_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    QueueOrderPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~QueueOrderPolicy_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    Messaging::Ordering allowed_orders (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::PolicyType policy_type (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Policy_ptr copy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    void destroy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    QueueOrderPolicy_tie (const QueueOrderPolicy_tie &);
-    void operator= (const QueueOrderPolicy_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (TAO_POLLER)
-  class ReplyHandler;
-  typedef ReplyHandler *ReplyHandler_ptr;
-  class TAO_Export ReplyHandler :  public virtual PortableServer::ServantBase
-  {
-  protected:
-    ReplyHandler (void);
-  public:
-    ReplyHandler (const ReplyHandler& rhs);
-    virtual ~ReplyHandler (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    CORBA::Boolean in_mult_inheritance (void);
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    Messaging::ReplyHandler *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_ReplyHandler     : public virtual Messaging::ReplyHandler
-  {
-  public:
-    _tao_collocated_ReplyHandler (
-        ReplyHandler_ptr  servant,
-        TAO_Stub *stub
-      );
-    ReplyHandler_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    ReplyHandler_ptr servant_;
-  };
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export ReplyHandler_tie : public ReplyHandler
-  {
-  public:
-    ReplyHandler_tie (T &t);
-    // the T& ctor
-    ReplyHandler_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    ReplyHandler_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    ReplyHandler_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~ReplyHandler_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    ReplyHandler_tie (const ReplyHandler_tie &);
-    void operator= (const ReplyHandler_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-  class Poller;
-  typedef Poller *Poller_ptr;
-  class TAO_Export Poller : public virtual POA_CORBA::Pollable
-  {
-  protected:
-    Poller (void);
-  public:
-    Poller (const Poller& rhs);
-    virtual ~Poller (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual CORBA::Object_ptr operation_target (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void _get_operation_target_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual char * operation_name (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void _get_operation_name_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual Messaging::ReplyHandler_ptr associated_handler (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void _get_associated_handler_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual void associated_handler (
-        Messaging::ReplyHandler_ptr associated_handler,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void _set_associated_handler_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual CORBA::Boolean is_from_poller (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void _get_is_from_poller_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual CORBA::Object_ptr target (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void _get_target_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual char * op_name (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void _get_op_name_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    CORBA::Boolean in_mult_inheritance (void);
-
-    static void is_ready_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void create_pollable_set_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    Messaging::Poller *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_Poller     : public virtual Messaging::Poller,
-      public virtual POA_CORBA::_tao_collocated_Pollable
-  {
-  public:
-    _tao_collocated_Poller (
-        Poller_ptr  servant,
-        TAO_Stub *stub
-      );
-    Poller_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::Object_ptr operation_target (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual char * operation_name (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual Messaging::ReplyHandler_ptr associated_handler (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void associated_handler (
-        Messaging::ReplyHandler_ptr associated_handler,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::Boolean is_from_poller (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::Object_ptr target (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual char * op_name (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    Poller_ptr servant_;
-  };
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export Poller_tie : public Poller
-  {
-  public:
-    Poller_tie (T &t);
-    // the T& ctor
-    Poller_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    Poller_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    Poller_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~Poller_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Object_ptr operation_target (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    char * operation_name (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    Messaging::ReplyHandler_ptr associated_handler (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    void associated_handler (
-        Messaging::ReplyHandler_ptr associated_handler,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Boolean is_from_poller (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Object_ptr target (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    char * op_name (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Boolean is_ready (
-        CORBA::ULong timeout,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::PollableSet_ptr create_pollable_set (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    Poller_tie (const Poller_tie &);
-    void operator= (const Poller_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-#endif /* TAO_POLLER */
-
-};
-
-// #include "MessagingS_T.h"
-
-#if defined (__ACE_INLINE__)
-#include "MessagingS.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
-#endif /* TAO_IDL_MESSAGINGS_H */
diff --git a/TAO/tao/MessagingS.i b/TAO/tao/MessagingS.i
deleted file mode 100644
index f5d5493117d..00000000000
--- a/TAO/tao/MessagingS.i
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#if defined (TAO_POLLER)
-ACE_INLINE void POA_Messaging::Poller::is_ready_skel (
-    CORBA::ServerRequest &req,
-    void *obj,
-    void *context,
-    CORBA::Environment &env
-  )
-{
-  POA_CORBA::Pollable_ptr impl = (POA_Messaging::Poller_ptr) obj;
-  POA_CORBA::Pollable::is_ready_skel (
-      req,
-      (POA_CORBA::Pollable_ptr) impl,
-      context,
-       env
-    );
-}
-ACE_INLINE void POA_Messaging::Poller::create_pollable_set_skel (
-    CORBA::ServerRequest &req,
-    void *obj,
-    void *context,
-    CORBA::Environment &env
-  )
-{
-  POA_CORBA::Pollable_ptr impl = (POA_Messaging::Poller_ptr) obj;
-  POA_CORBA::Pollable::create_pollable_set_skel (
-      req,
-      (POA_CORBA::Pollable_ptr) impl,
-      context,
-       env
-    );
-}
-#endif /* TAO_POLLER */
diff --git a/TAO/tao/MessagingS_T.cpp b/TAO/tao/MessagingS_T.cpp
deleted file mode 100644
index 0ae3a1f8db0..00000000000
--- a/TAO/tao/MessagingS_T.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#ifndef _TAO_IDL_MESSAGINGS_T_CPP_
-#define _TAO_IDL_MESSAGINGS_T_CPP_
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#include "MessagingS_T.h"
-#include "tao/POA.h"
-#include "tao/ORB_Core.h"
-
-#if !defined (__ACE_INLINE__)
-#include "MessagingS_T.i"
-#endif /* !defined INLINE */
-
-template <class T> PortableServer::POA_ptr
-POA_Messaging::RebindPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-
-  return this->RebindPolicy::_default_POA (ACE_TRY_ENV);
-}
-
-template <class T> PortableServer::POA_ptr
-POA_Messaging::SyncScopePolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-
-  return this->SyncScopePolicy::_default_POA (ACE_TRY_ENV);
-}
-
-template <class T> PortableServer::POA_ptr
-POA_Messaging::RequestPriorityPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-
-  return this->RequestPriorityPolicy::_default_POA (ACE_TRY_ENV);
-}
-
-template <class T> PortableServer::POA_ptr
-POA_Messaging::ReplyPriorityPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-
-  return this->ReplyPriorityPolicy::_default_POA (ACE_TRY_ENV);
-}
-
-template <class T> PortableServer::POA_ptr
-POA_Messaging::RequestStartTimePolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-
-  return this->RequestStartTimePolicy::_default_POA (ACE_TRY_ENV);
-}
-
-template <class T> PortableServer::POA_ptr
-POA_Messaging::RequestEndTimePolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-
-  return this->RequestEndTimePolicy::_default_POA (ACE_TRY_ENV);
-}
-
-template <class T> PortableServer::POA_ptr
-POA_Messaging::ReplyStartTimePolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-
-  return this->ReplyStartTimePolicy::_default_POA (ACE_TRY_ENV);
-}
-
-template <class T> PortableServer::POA_ptr
-POA_Messaging::ReplyEndTimePolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-
-  return this->ReplyEndTimePolicy::_default_POA (ACE_TRY_ENV);
-}
-
-template <class T> PortableServer::POA_ptr
-POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-
-  return this->RelativeRequestTimeoutPolicy::_default_POA (ACE_TRY_ENV);
-}
-
-template <class T> PortableServer::POA_ptr
-POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-
-  return this->RelativeRoundtripTimeoutPolicy::_default_POA (ACE_TRY_ENV);
-}
-
-template <class T> PortableServer::POA_ptr
-POA_Messaging::RoutingPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-
-  return this->RoutingPolicy::_default_POA (ACE_TRY_ENV);
-}
-
-template <class T> PortableServer::POA_ptr
-POA_Messaging::MaxHopsPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-
-  return this->MaxHopsPolicy::_default_POA (ACE_TRY_ENV);
-}
-
-template <class T> PortableServer::POA_ptr
-POA_Messaging::QueueOrderPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-
-  return this->QueueOrderPolicy::_default_POA (ACE_TRY_ENV);
-}
-
-#if defined (TAO_POLLER)
-
-template <class T> PortableServer::POA_ptr
-POA_Messaging::ReplyHandler_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-
-  return this->ReplyHandler::_default_POA (ACE_TRY_ENV);
-}
-
-template <class T> PortableServer::POA_ptr
-POA_Messaging::Poller_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-
-  return this->Poller::_default_POA (ACE_TRY_ENV);
-}
-#endif /* TAO_POLLER */
-
-#endif /* ifndef */
diff --git a/TAO/tao/MessagingS_T.h b/TAO/tao/MessagingS_T.h
deleted file mode 100644
index 825a6d869da..00000000000
--- a/TAO/tao/MessagingS_T.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#ifndef _TAO_IDL_MESSAGINGS_T_H_
-#define _TAO_IDL_MESSAGINGS_T_H_
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-#if defined (__ACE_INLINE__)
-#include "MessagingS_T.i"
-#endif /* defined INLINE */
-
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "MessagingS_T.cpp"
-#endif /* defined REQUIRED SOURCE */
-
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("MessagingS_T.cpp")
-#endif /* defined REQUIRED PRAGMA */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* ifndef */
diff --git a/TAO/tao/MessagingS_T.i b/TAO/tao/MessagingS_T.i
deleted file mode 100644
index fd4a7cf99c9..00000000000
--- a/TAO/tao/MessagingS_T.i
+++ /dev/null
@@ -1,1691 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_Messaging::RebindPolicy_tie<T>::RebindPolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RebindPolicy_tie<T>::RebindPolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RebindPolicy_tie<T>::RebindPolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RebindPolicy_tie<T>::RebindPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RebindPolicy_tie<T>::~RebindPolicy_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_Messaging::RebindPolicy_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RebindPolicy_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RebindPolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_Messaging::RebindPolicy_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RebindPolicy_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE
-Messaging::RebindMode POA_Messaging::RebindPolicy_tie<T>::rebind_mode  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->rebind_mode (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::PolicyType POA_Messaging::RebindPolicy_tie<T>::policy_type  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->policy_type (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Policy_ptr POA_Messaging::RebindPolicy_tie<T>::copy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->copy (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-void POA_Messaging::RebindPolicy_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->destroy (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_Messaging::SyncScopePolicy_tie<T>::SyncScopePolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::SyncScopePolicy_tie<T>::SyncScopePolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::SyncScopePolicy_tie<T>::SyncScopePolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::SyncScopePolicy_tie<T>::SyncScopePolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::SyncScopePolicy_tie<T>::~SyncScopePolicy_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_Messaging::SyncScopePolicy_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::SyncScopePolicy_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::SyncScopePolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_Messaging::SyncScopePolicy_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::SyncScopePolicy_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE
-Messaging::SyncScope POA_Messaging::SyncScopePolicy_tie<T>::synchronization  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->synchronization (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::PolicyType POA_Messaging::SyncScopePolicy_tie<T>::policy_type  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->policy_type (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Policy_ptr POA_Messaging::SyncScopePolicy_tie<T>::copy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->copy (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-void POA_Messaging::SyncScopePolicy_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->destroy (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_Messaging::RequestPriorityPolicy_tie<T>::RequestPriorityPolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RequestPriorityPolicy_tie<T>::RequestPriorityPolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RequestPriorityPolicy_tie<T>::RequestPriorityPolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RequestPriorityPolicy_tie<T>::RequestPriorityPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RequestPriorityPolicy_tie<T>::~RequestPriorityPolicy_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_Messaging::RequestPriorityPolicy_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RequestPriorityPolicy_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RequestPriorityPolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_Messaging::RequestPriorityPolicy_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RequestPriorityPolicy_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE
-Messaging::PriorityRange POA_Messaging::RequestPriorityPolicy_tie<T>::priority_range  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->priority_range (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::PolicyType POA_Messaging::RequestPriorityPolicy_tie<T>::policy_type  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->policy_type (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Policy_ptr POA_Messaging::RequestPriorityPolicy_tie<T>::copy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->copy (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-void POA_Messaging::RequestPriorityPolicy_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->destroy (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_Messaging::ReplyPriorityPolicy_tie<T>::ReplyPriorityPolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyPriorityPolicy_tie<T>::ReplyPriorityPolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyPriorityPolicy_tie<T>::ReplyPriorityPolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyPriorityPolicy_tie<T>::ReplyPriorityPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyPriorityPolicy_tie<T>::~ReplyPriorityPolicy_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_Messaging::ReplyPriorityPolicy_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::ReplyPriorityPolicy_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::ReplyPriorityPolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_Messaging::ReplyPriorityPolicy_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::ReplyPriorityPolicy_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE
-Messaging::PriorityRange POA_Messaging::ReplyPriorityPolicy_tie<T>::priority_range  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->priority_range (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::PolicyType POA_Messaging::ReplyPriorityPolicy_tie<T>::policy_type  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->policy_type (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Policy_ptr POA_Messaging::ReplyPriorityPolicy_tie<T>::copy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->copy (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-void POA_Messaging::ReplyPriorityPolicy_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->destroy (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_Messaging::RequestStartTimePolicy_tie<T>::RequestStartTimePolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RequestStartTimePolicy_tie<T>::RequestStartTimePolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RequestStartTimePolicy_tie<T>::RequestStartTimePolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RequestStartTimePolicy_tie<T>::RequestStartTimePolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RequestStartTimePolicy_tie<T>::~RequestStartTimePolicy_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_Messaging::RequestStartTimePolicy_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RequestStartTimePolicy_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RequestStartTimePolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_Messaging::RequestStartTimePolicy_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RequestStartTimePolicy_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE
-TimeBase::UtcT POA_Messaging::RequestStartTimePolicy_tie<T>::start_time  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->start_time (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::PolicyType POA_Messaging::RequestStartTimePolicy_tie<T>::policy_type  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->policy_type (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Policy_ptr POA_Messaging::RequestStartTimePolicy_tie<T>::copy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->copy (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-void POA_Messaging::RequestStartTimePolicy_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->destroy (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_Messaging::RequestEndTimePolicy_tie<T>::RequestEndTimePolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RequestEndTimePolicy_tie<T>::RequestEndTimePolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RequestEndTimePolicy_tie<T>::RequestEndTimePolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RequestEndTimePolicy_tie<T>::RequestEndTimePolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RequestEndTimePolicy_tie<T>::~RequestEndTimePolicy_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_Messaging::RequestEndTimePolicy_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RequestEndTimePolicy_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RequestEndTimePolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_Messaging::RequestEndTimePolicy_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RequestEndTimePolicy_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE
-TimeBase::UtcT POA_Messaging::RequestEndTimePolicy_tie<T>::end_time  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->end_time (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::PolicyType POA_Messaging::RequestEndTimePolicy_tie<T>::policy_type  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->policy_type (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Policy_ptr POA_Messaging::RequestEndTimePolicy_tie<T>::copy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->copy (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-void POA_Messaging::RequestEndTimePolicy_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->destroy (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_Messaging::ReplyStartTimePolicy_tie<T>::ReplyStartTimePolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyStartTimePolicy_tie<T>::ReplyStartTimePolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyStartTimePolicy_tie<T>::ReplyStartTimePolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyStartTimePolicy_tie<T>::ReplyStartTimePolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyStartTimePolicy_tie<T>::~ReplyStartTimePolicy_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_Messaging::ReplyStartTimePolicy_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::ReplyStartTimePolicy_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::ReplyStartTimePolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_Messaging::ReplyStartTimePolicy_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::ReplyStartTimePolicy_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE
-TimeBase::UtcT POA_Messaging::ReplyStartTimePolicy_tie<T>::start_time  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->start_time (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::PolicyType POA_Messaging::ReplyStartTimePolicy_tie<T>::policy_type  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->policy_type (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Policy_ptr POA_Messaging::ReplyStartTimePolicy_tie<T>::copy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->copy (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-void POA_Messaging::ReplyStartTimePolicy_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->destroy (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_Messaging::ReplyEndTimePolicy_tie<T>::ReplyEndTimePolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyEndTimePolicy_tie<T>::ReplyEndTimePolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyEndTimePolicy_tie<T>::ReplyEndTimePolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyEndTimePolicy_tie<T>::ReplyEndTimePolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyEndTimePolicy_tie<T>::~ReplyEndTimePolicy_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_Messaging::ReplyEndTimePolicy_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::ReplyEndTimePolicy_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::ReplyEndTimePolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_Messaging::ReplyEndTimePolicy_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::ReplyEndTimePolicy_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE
-TimeBase::UtcT POA_Messaging::ReplyEndTimePolicy_tie<T>::end_time  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->end_time (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::PolicyType POA_Messaging::ReplyEndTimePolicy_tie<T>::policy_type  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->policy_type (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Policy_ptr POA_Messaging::ReplyEndTimePolicy_tie<T>::copy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->copy (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-void POA_Messaging::ReplyEndTimePolicy_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->destroy (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::RelativeRequestTimeoutPolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::RelativeRequestTimeoutPolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::RelativeRequestTimeoutPolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::RelativeRequestTimeoutPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::~RelativeRequestTimeoutPolicy_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE
-TimeBase::TimeT POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::relative_expiry  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->relative_expiry (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::PolicyType POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::policy_type  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->policy_type (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Policy_ptr POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::copy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->copy (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-void POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->destroy (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::RelativeRoundtripTimeoutPolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::RelativeRoundtripTimeoutPolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::RelativeRoundtripTimeoutPolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::RelativeRoundtripTimeoutPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::~RelativeRoundtripTimeoutPolicy_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE
-TimeBase::TimeT POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::relative_expiry  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->relative_expiry (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::PolicyType POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::policy_type  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->policy_type (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Policy_ptr POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::copy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->copy (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-void POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->destroy (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_Messaging::RoutingPolicy_tie<T>::RoutingPolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RoutingPolicy_tie<T>::RoutingPolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RoutingPolicy_tie<T>::RoutingPolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RoutingPolicy_tie<T>::RoutingPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RoutingPolicy_tie<T>::~RoutingPolicy_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_Messaging::RoutingPolicy_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RoutingPolicy_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RoutingPolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_Messaging::RoutingPolicy_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RoutingPolicy_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE
-Messaging::RoutingTypeRange POA_Messaging::RoutingPolicy_tie<T>::routing_range  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->routing_range (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::PolicyType POA_Messaging::RoutingPolicy_tie<T>::policy_type  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->policy_type (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Policy_ptr POA_Messaging::RoutingPolicy_tie<T>::copy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->copy (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-void POA_Messaging::RoutingPolicy_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->destroy (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_Messaging::MaxHopsPolicy_tie<T>::MaxHopsPolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::MaxHopsPolicy_tie<T>::MaxHopsPolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::MaxHopsPolicy_tie<T>::MaxHopsPolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::MaxHopsPolicy_tie<T>::MaxHopsPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::MaxHopsPolicy_tie<T>::~MaxHopsPolicy_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_Messaging::MaxHopsPolicy_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::MaxHopsPolicy_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::MaxHopsPolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_Messaging::MaxHopsPolicy_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::MaxHopsPolicy_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE
-CORBA::UShort POA_Messaging::MaxHopsPolicy_tie<T>::max_hops  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->max_hops (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::PolicyType POA_Messaging::MaxHopsPolicy_tie<T>::policy_type  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->policy_type (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Policy_ptr POA_Messaging::MaxHopsPolicy_tie<T>::copy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->copy (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-void POA_Messaging::MaxHopsPolicy_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->destroy (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_Messaging::QueueOrderPolicy_tie<T>::QueueOrderPolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::QueueOrderPolicy_tie<T>::QueueOrderPolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::QueueOrderPolicy_tie<T>::QueueOrderPolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::QueueOrderPolicy_tie<T>::QueueOrderPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::QueueOrderPolicy_tie<T>::~QueueOrderPolicy_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_Messaging::QueueOrderPolicy_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::QueueOrderPolicy_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::QueueOrderPolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_Messaging::QueueOrderPolicy_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::QueueOrderPolicy_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE
-Messaging::Ordering POA_Messaging::QueueOrderPolicy_tie<T>::allowed_orders  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->allowed_orders (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::PolicyType POA_Messaging::QueueOrderPolicy_tie<T>::policy_type  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->policy_type (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Policy_ptr POA_Messaging::QueueOrderPolicy_tie<T>::copy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->copy (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-void POA_Messaging::QueueOrderPolicy_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->destroy (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined(TAO_POLLER)
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyHandler_tie<T>::~ReplyHandler_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_Messaging::ReplyHandler_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::ReplyHandler_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::ReplyHandler_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_Messaging::ReplyHandler_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::ReplyHandler_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_Messaging::Poller_tie<T>::Poller_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::Poller_tie<T>::Poller_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::Poller_tie<T>::Poller_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::Poller_tie<T>::Poller_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::Poller_tie<T>::~Poller_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_Messaging::Poller_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::Poller_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::Poller_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_Messaging::Poller_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::Poller_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE
-CORBA::Object_ptr POA_Messaging::Poller_tie<T>::operation_target  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->operation_target (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-char * POA_Messaging::Poller_tie<T>::operation_name  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->operation_name (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-Messaging::ReplyHandler_ptr POA_Messaging::Poller_tie<T>::associated_handler  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->associated_handler (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-void POA_Messaging::Poller_tie<T>::associated_handler  (
-    Messaging::ReplyHandler_ptr associated_handler,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->associated_handler (
-    associated_handler,
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_Messaging::Poller_tie<T>::is_from_poller  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->is_from_poller (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Object_ptr POA_Messaging::Poller_tie<T>::target  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->target (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-char * POA_Messaging::Poller_tie<T>::op_name  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->op_name (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_Messaging::Poller_tie<T>::is_ready  (
-    CORBA::ULong timeout,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->is_ready (
-    timeout,
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::PollableSet_ptr POA_Messaging::Poller_tie<T>::create_pollable_set  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->create_pollable_set (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-#endif /* TAO_POLLER */
diff --git a/TAO/tao/Messaging_Policy_i.cpp b/TAO/tao/Messaging_Policy_i.cpp
deleted file mode 100644
index 29f728742e7..00000000000
--- a/TAO/tao/Messaging_Policy_i.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-// $Id$
-
-#include "Messaging_Policy_i.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-
-#if ! defined (__ACE_INLINE__)
-#include "Messaging_Policy_i.i"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/Auto_Ptr.h"
-
-ACE_RCSID(TAO, Messaging_Policy_i, "$Id$")
-
-TimeBase::TimeT
-TAO_RelativeRoundtripTimeoutPolicy_i::relative_expiry (
-      CORBA::Environment &
-    )
-{
-  return this->relative_expiry_;
-}
-
-CORBA::PolicyType
-TAO_RelativeRoundtripTimeoutPolicy_i::policy_type (
-      CORBA_Environment &
-    )
-{
-  // Future policy implementors: notice how this minimizes the
-  // footprint of the class.
-  return TAO_MESSAGING_RELATIVE_RT_TIMEOUT_POLICY_TYPE;
-}
-
-CORBA::Policy_ptr
-TAO_RelativeRoundtripTimeoutPolicy_i::create (
-      PortableServer::POA_ptr poa,
-      const CORBA::Any& val,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-{
-  // Future policy implementors: notice how the following code is
-  // exception safe!
-
-  TimeBase::TimeT value;
-  if ((val >>= value) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
-                      CORBA::Policy::_nil ());
-
-  TAO_RelativeRoundtripTimeoutPolicy_i *tmp;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_RelativeRoundtripTimeoutPolicy_i (poa,
-                                                        value),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  auto_ptr<TAO_RelativeRoundtripTimeoutPolicy_i> clone (tmp);
-
-  CORBA::Policy_var result = clone->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  clone->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  clone.release ();
-
-  return result._retn ();
-}
-
-CORBA::Policy_ptr
-TAO_RelativeRoundtripTimeoutPolicy_i::copy (
-      CORBA_Environment &ACE_TRY_ENV
-    )
-{
-  // Future policy implementors: notice how the following code is
-  // exception safe!
-
-  TAO_RelativeRoundtripTimeoutPolicy_i* tmp;
-  ACE_NEW_THROW_EX (tmp, TAO_RelativeRoundtripTimeoutPolicy_i (*this),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  auto_ptr<TAO_RelativeRoundtripTimeoutPolicy_i> clone (tmp);
-
-  CORBA::Policy_var result = clone->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  clone->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  clone.release ();
-
-  return result._retn ();
-}
-
-void
-TAO_RelativeRoundtripTimeoutPolicy_i::destroy (
-      CORBA_Environment &ACE_TRY_ENV
-    )
-{
-  PortableServer::ObjectId_var id =
-    this->poa_->servant_to_id (this, ACE_TRY_ENV);
-  ACE_CHECK;
-  this->poa_->deactivate_object (id.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-PortableServer::POA_ptr
-TAO_RelativeRoundtripTimeoutPolicy_i::_default_POA (
-      CORBA_Environment &
-    )
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class auto_ptr<TAO_RelativeRoundtripTimeoutPolicy_i>;
-template class ACE_Auto_Basic_Ptr<TAO_RelativeRoundtripTimeoutPolicy_i>;
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate auto_ptr<TAO_RelativeRoundtripTimeoutPolicy_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_RelativeRoundtripTimeoutPolicy_i>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
diff --git a/TAO/tao/Messaging_Policy_i.h b/TAO/tao/Messaging_Policy_i.h
deleted file mode 100644
index 3207c8f0da5..00000000000
--- a/TAO/tao/Messaging_Policy_i.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = DESCRIPTION
-//   Implementation classes for the Messaging related policies
-//
-// = FILENAME
-//   Messaging_Policy_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
-
-#ifndef TAO_MESSAGING_POLICY_I_H
-#define TAO_MESSAGING_POLICY_I_H
-
-#include "MessagingS.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class TAO_Export TAO_RelativeRoundtripTimeoutPolicy_i : public virtual PortableServer::RefCountServantBase,
-                                                        public virtual POA_Messaging::RelativeRoundtripTimeoutPolicy
-
-{
-  // = TITLE
-  //   Messaging::RelativeRoundtripTimeoutPolicy implementation
-  //
-  // = DESCRIPTION
-  //   This policy controls the total (round-trip) timeout time for a
-  //   request.
-  //
-public:
-  TAO_RelativeRoundtripTimeoutPolicy_i (PortableServer::POA_ptr poa,
-                                        const TimeBase::TimeT& relative_expiry);
-  // Constructor
-
-  static CORBA::Policy_ptr create (
-      PortableServer::POA_ptr poa,
-      const CORBA::Any& val,
-      CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-    );
-  // Helper method for the implementation of CORBA::ORB::create_policy
-
-  // = The Messaging::RelativeRoundtripTimeoutPolicy methods
-  virtual TimeBase::TimeT relative_expiry (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-  virtual CORBA::PolicyType policy_type (
-      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-    );
-  virtual CORBA::Policy_ptr copy (
-      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-    );
-  virtual void destroy (
-      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-    );
-  virtual PortableServer::POA_ptr _default_POA (
-      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-    );
-
-private:
-  PortableServer::POA_var poa_;
-  // The default poa
-
-  TimeBase::TimeT relative_expiry_;
-  // The attribute
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao/Messaging_Policy_i.i"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#endif /* __ACE_INLINE__ */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
-#endif /* TAO_MESSAGING_POLICY_I_H */
diff --git a/TAO/tao/Messaging_Policy_i.i b/TAO/tao/Messaging_Policy_i.i
deleted file mode 100644
index 9b622cfe47d..00000000000
--- a/TAO/tao/Messaging_Policy_i.i
+++ /dev/null
@@ -1,10 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_RelativeRoundtripTimeoutPolicy_i::TAO_RelativeRoundtripTimeoutPolicy_i (
-    PortableServer::POA_ptr poa,
-    const TimeBase::TimeT& relative_expiry)
-  :  poa_ (PortableServer::POA::_duplicate (poa)),
-     relative_expiry_ (relative_expiry)
-{
-}
diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp
deleted file mode 100644
index 386f3aa5f35..00000000000
--- a/TAO/tao/NVList.cpp
+++ /dev/null
@@ -1,274 +0,0 @@
-// $Id$
-
-// Implementation of Named Value List and NamedValue classes
-
-#include "tao/NVList.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#include "tao/Exception.h"
-#include "tao/Environment.h"
-#include "tao/ORB.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)
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0);
-  return this->refcount_++;
-}
-
-CORBA::ULong
-CORBA_NamedValue::_decr_refcnt (void)
-{
-  {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0);
-    this->refcount_--;
-    if (this->refcount_ != 0)
-      return this->refcount_;
-  }
-
-  delete this;
-  return 0;
-}
-
-CORBA_NamedValue::~CORBA_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)
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0);
-  return this->refcount_++;
-}
-
-CORBA::ULong
-CORBA_NVList::_decr_refcnt (void)
-{
-  {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0);
-    this->refcount_--;
-    if (this->refcount_ != 0)
-      return this->refcount_;
-  }
-
-  delete this;
-  return 0;
-}
-
-CORBA_NVList::~CORBA_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;
-}
-
-// add an element and just initialize its flags
-CORBA::NamedValue_ptr
-CORBA_NVList::add (CORBA::Flags flags,
-                   CORBA::Environment &ACE_TRY_ENV)
-{
-  // call the helper to allocate a NamedValue element (if necessary)
-  return this->add_element (flags, ACE_TRY_ENV);
-}
-
-// add an element and just initialize its flags and name
-CORBA::NamedValue_ptr
-CORBA_NVList::add_item (const char *name,
-                        CORBA::Flags flags,
-                        CORBA::Environment &ACE_TRY_ENV)
-{
-  // call the helper to allocate a NamedValue element
-  CORBA::NamedValue_ptr nv = this->add_element (flags, ACE_TRY_ENV);
-  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,
-                         CORBA::Environment &ACE_TRY_ENV)
-{
-  // call the helper to allocate a NamedValue element
-  CORBA::NamedValue_ptr nv = this->add_element (flags, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  if (nv)
-    {
-      // now initialize the fields
-      nv->name_ = CORBA::string_dup (name);
-      if (ACE_BIT_ENABLED (flags, CORBA::IN_COPY_VALUE))
-        // IN_COPY_VALUE means that the parameter is not "borrowed" by
-        // the ORB, but rather that the ORB copies its value.
-        //
-        // Initialize the newly allocated memory using a copy
-        // constructor that places the new "Any" value at just the right
-        // place, and makes a "deep copy" of the data.
-        nv->any_ = value;
-      else
-        {
-          // The normal behaviour for parameters is that the ORB "borrows"
-          // their memory for the duration of calls.
-          //
-          if (value.value_)
-            {
-              nv->any_.replace (value.type_,
-                                value.value_,
-                                0,
-                                ACE_TRY_ENV);
-            }
-          else
-            {
-              nv->any_._tao_replace (value.type_,
-                                     value.cdr_,
-                                     ACE_TRY_ENV);
-            }
-          ACE_CHECK_RETURN (0);
-        }
-      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,
-                                CORBA::Environment &ACE_TRY_ENV)
-{
-
-  // call the helper to allocate a NamedValue element
-  CORBA::NamedValue_ptr nv = this->add_element (flags, ACE_TRY_ENV);
-  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,
-                                 CORBA::Environment & ACE_TRY_ENV)
-{
-  // call the helper to allocate a NamedValue element
-  CORBA::NamedValue_ptr nv = this->add_element (flags, ACE_TRY_ENV);
-  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*/, CORBA::Environment &/*env*/)
-{
-  // not implemented
-  // @@ (ASG) - TODO
-}
-
-// Helper method
-CORBA::NamedValue_ptr
-CORBA_NVList::add_element (CORBA::Flags flags,
-                           CORBA::Environment &ACE_TRY_ENV)
-{
-  if (ACE_BIT_DISABLED (flags,
-                        CORBA::ARG_IN | CORBA::ARG_OUT | CORBA::ARG_INOUT))
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
-
-  CORBA::NamedValue_ptr nv;
-
-  // allocate a new NamedValue
-  ACE_NEW_RETURN (nv, CORBA::NamedValue, 0);
-
-  // 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, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (n >= this->max_) // 0 based indexing
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-  CORBA::NamedValue_ptr *nv;
-
-  this->values_.get (nv, n);
-  return *nv;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Node<CORBA::NamedValue_ptr>;
-template class ACE_Unbounded_Queue<CORBA::NamedValue_ptr>;
-template class ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Node<CORBA::NamedValue_ptr>
-#pragma instantiate ACE_Unbounded_Queue<CORBA::NamedValue_ptr>
-#pragma instantiate ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/NVList.h b/TAO/tao/NVList.h
deleted file mode 100644
index 4e73cfa7bb1..00000000000
--- a/TAO/tao/NVList.h
+++ /dev/null
@@ -1,333 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    NVList.h
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//     and
-//     Aniruddha Gokhale (additions, missing operations)
-//
-// ============================================================================
-
-#ifndef TAO_NVLIST_H
-#define TAO_NVLIST_H
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#include "ace/Containers_T.h"
-#include "tao/Any.h"
-
-class TAO_Export CORBA_NamedValue
-{
-  // = TITLE
-  // NamedValue ... 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.
-public:
-  const char *name (void) const;
-  // optional name
-
-  CORBA::Any_ptr value (void) const;
-  // return the value
-
-  CORBA::Flags flags (void) const;
-  // return the parameter mode flag
-
-  ~CORBA_NamedValue (void);
-  // destructor - manages the name and value
-
-  // The pseudo object static methods..
-  static CORBA_NamedValue* _duplicate (CORBA_NamedValue*);
-  static CORBA_NamedValue* _nil (void);
-
-  // = Reference counting.
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
-
-  // Useful for template programming.
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_NamedValue_ptr _ptr_type;
-  typedef CORBA_NamedValue_var _var_type;
-#endif /* __GNUC__ */
-
-private:
-  CORBA::ULong refcount_;
-  // maintains how many references exist to this object
-
-  ACE_SYNCH_MUTEX refcount_lock_;
-  // Protects the reference count.
-
-  CORBA::Any any_;
-  // holds the value
-
-  CORBA::Flags flags_;
-  // parameter mode flags
-
-  char *name_;
-  // optional IDL name of the parameter
-
-  CORBA_NamedValue (void);
-  // private constructor. Cannot be directly instantiated other than by its
-  // friends.
-
-  friend class CORBA_ORB;
-  friend class CORBA_NVList;
-  friend class CORBA_Request;
-};
-
-class TAO_Export CORBA_NamedValue_var
-{
-  // = TITLE
-  //   The T_var class for NamedValue
-  //
-  // = DESCRIPTION
-  //   As any other pseudo object NamedValue must have a T_var class,
-  //   the interface an semantics are specified in the CORBA spec.
-  //
-  // = NOTE
-  //   We use CORBA_NamedValue_ptr as the _ptr type instead of
-  //   CORBA::NamedValue_ptr, this is an attempt to reduced the cyclic
-  //   dependencies in TAO.
-  //
-public:
-  CORBA_NamedValue_var (void); // default constructor
-  CORBA_NamedValue_var (CORBA_NamedValue_ptr);
-  CORBA_NamedValue_var (const CORBA_NamedValue_var &); // copy constructor
-  ~CORBA_NamedValue_var (void); // destructor
-
-  CORBA_NamedValue_var &operator= (CORBA_NamedValue_ptr);
-  CORBA_NamedValue_var &operator= (const CORBA_NamedValue_var &);
-  CORBA_NamedValue_ptr operator-> (void) const;
-
-  operator const CORBA_NamedValue_ptr &() const;
-  operator CORBA_NamedValue_ptr &();
-  // in, inout, out, _retn
-  CORBA_NamedValue_ptr in (void) const;
-  CORBA_NamedValue_ptr &inout (void);
-  CORBA_NamedValue_ptr &out (void);
-  CORBA_NamedValue_ptr _retn (void);
-  CORBA_NamedValue_ptr ptr (void) const;
-
-private:
-  CORBA_NamedValue_ptr ptr_;
-};
-
-class TAO_Export CORBA_NamedValue_out
-{
-  // = TITLE
-  //   The T_out class for NamedValue
-  //
-  // = DESCRIPTION
-  //   As any other pseudo object NamedValue must have a T_out class,
-  //   the interface an semantics are specified in the CORBA spec.
-  //
-  // = NOTE
-  //   We use CORBA_NamedValue_ptr as the _ptr type instead of
-  //   CORBA::NamedValue_ptr, this is an attempt to reduced the cyclic
-  //   dependencies in TAO.
-  //
-public:
-  CORBA_NamedValue_out (CORBA_NamedValue_ptr &);
-  CORBA_NamedValue_out (CORBA_NamedValue_var &);
-  CORBA_NamedValue_out (CORBA_NamedValue_out &);
-  CORBA_NamedValue_out &operator= (CORBA_NamedValue_out &);
-  CORBA_NamedValue_out &operator= (const CORBA_NamedValue_var &);
-  CORBA_NamedValue_out &operator= (CORBA_NamedValue_ptr);
-  operator CORBA_NamedValue_ptr &();
-  CORBA_NamedValue_ptr &ptr (void);
-  CORBA_NamedValue_ptr operator-> (void);
-
-private:
-  CORBA_NamedValue_ptr &ptr_;
-};
-
-// ****************************************************************
-
-class TAO_Export CORBA_NVList
-{
-  // = TITLE
-  //   NVList ... 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).
-  //
-  // = DESCRIPTION
-  //   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.
-public:
-  ~CORBA_NVList (void);
-  // destructor
-
-  CORBA::ULong count (void) const;
-  // return the current number of elements in the list
-
-  CORBA_NamedValue_ptr add (CORBA::Flags,
-                             CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // add an element and just initialize the flags
-
-  CORBA_NamedValue_ptr add_item (const char *,
-                                  CORBA::Flags,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // add an element and initialize its name and flags
-
-  CORBA_NamedValue_ptr add_value (const char *,
-                                   const CORBA::Any &,
-                                   CORBA::Flags,
-                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // initializes a value, name, and flags
-
-  CORBA_NamedValue_ptr add_item_consume (char *,
-                                          CORBA::Flags,
-                                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // just like add_item. In addition, memory management of char * name is taken
-  // over by the NVList
-
-  CORBA_NamedValue_ptr add_value_consume (char *,
-                                           CORBA::Any_ptr,
-                                           CORBA::Flags,
-                                           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // just like add_value. In addition, the NVList controls the memory
-  // management of the char *name and Any *value parameter
-
-  CORBA_NamedValue_ptr item (CORBA::ULong n, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // retrieve the item at the nth location. Raises Bounds
-
-  //  CORBA::Status
-  void remove (CORBA::ULong n, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // remove element at index n. Raises Bounds
-
-  // The pseudo object static methods..
-  static CORBA_NVList* _duplicate (CORBA_NVList*);
-  static CORBA_NVList* _nil (void);
-
-  // = Reference counting.
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
-
-  // Useful for template programming.
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_NVList_ptr _ptr_type;
-  typedef CORBA_NVList_var _var_type;
-#endif /* __GNUC__ */
-
-private:
-  CORBA_NVList (void);
-  // constructor - cannot be instantiated directly other than through the
-  // ORB::create_list method
-
-  CORBA_NamedValue_ptr add_element (CORBA::Flags, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // helper to increase the list size. This is used by all the add_ methods of
-  // the NVList class
-
-  ACE_Unbounded_Queue<CORBA_NamedValue_ptr> values_;
-  // internal list of parameters stored as NamedValues
-
-  CORBA::ULong max_;
-  // maximum length of list
-
-  CORBA::ULong refcount_;
-  // maintains how many references exist to this object
-
-  ACE_SYNCH_MUTEX refcount_lock_;
-  // Protects the reference count.
-
-  friend class CORBA_ORB;
-  friend class CORBA_Request;
-};
-
-class TAO_Export CORBA_NVList_var
-{
-  // = TITLE
-  //   The T_var class for NVList
-  //
-  // = DESCRIPTION
-  //   As any other pseudo object NVList must have a T_var class,
-  //   the interface an semantics are specified in the CORBA spec.
-  //
-  // = NOTE
-  //   We use CORBA_NVList_ptr as the _ptr type instead of
-  //   CORBA::NVList_ptr, this is an attempt to reduced the cyclic
-  //   dependencies in TAO.
-  //
-public:
-  CORBA_NVList_var (void);
-  CORBA_NVList_var (CORBA_NVList_ptr);
-  CORBA_NVList_var (const CORBA_NVList_var &);
-  ~CORBA_NVList_var (void);
-
-  CORBA_NVList_var &operator= (CORBA_NVList_ptr);
-  CORBA_NVList_var &operator= (const CORBA_NVList_var &);
-  CORBA_NVList_ptr operator-> (void) const;
-
-  operator const CORBA_NVList_ptr &() const;
-  operator CORBA_NVList_ptr &();
-  // in, inout, out, _retn
-  CORBA_NVList_ptr in (void) const;
-  CORBA_NVList_ptr &inout (void);
-  CORBA_NVList_ptr &out (void);
-  CORBA_NVList_ptr _retn (void);
-  CORBA_NVList_ptr ptr (void) const;
-
-private:
-  CORBA_NVList_ptr ptr_;
-};
-
-class TAO_Export CORBA_NVList_out
-{
-  // = TITLE
-  //   The T_out class for NVList
-  //
-  // = DESCRIPTION
-  //   As any other pseudo object NVList must have a T_out class,
-  //   the interface an semantics are specified in the CORBA spec.
-  //
-  // = NOTE
-  //   We use CORBA_NVList_ptr as the _ptr type instead of
-  //   CORBA::NVList_ptr, this is an attempt to reduced the cyclic
-  //   dependencies in TAO.
-  //
-public:
-  CORBA_NVList_out (CORBA_NVList_ptr &);
-  CORBA_NVList_out (CORBA_NVList_var &);
-  CORBA_NVList_out (CORBA_NVList_out &);
-  CORBA_NVList_out &operator= (CORBA_NVList_out &);
-  CORBA_NVList_out &operator= (const CORBA_NVList_var &);
-  CORBA_NVList_out &operator= (CORBA_NVList_ptr);
-  operator CORBA_NVList_ptr &();
-  CORBA_NVList_ptr &ptr (void);
-  CORBA_NVList_ptr operator-> (void);
-
-private:
-  CORBA_NVList_ptr &ptr_;
-};
-
-// ****************************************************************
-
-#if defined (__ACE_INLINE__)
-# include "tao/NVList.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#endif /* TAO_NVLIST_H */
diff --git a/TAO/tao/NVList.i b/TAO/tao/NVList.i
deleted file mode 100644
index 81124ec47a0..00000000000
--- a/TAO/tao/NVList.i
+++ /dev/null
@@ -1,426 +0,0 @@
-// $Id$
-// This may look like C, but it's really -*- C++ -*-
-
-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 ();
-}
-
-// constructor
-ACE_INLINE
-CORBA_NamedValue::CORBA_NamedValue (void)
-  : refcount_ (1),
-    flags_ (0),
-    name_ (0)
-{
-}
-
-// return the name
-ACE_INLINE const char*
-CORBA_NamedValue::name (void) const
-{
-  return this->name_;
-}
-
-// return the value
-ACE_INLINE CORBA::Any_ptr
-CORBA_NamedValue::value (void) const
-{
-  return ACE_const_cast (CORBA::Any_ptr, &this->any_);
-}
-
-// return the flags
-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;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_NamedValue_var
-// *************************************************************
-
-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_NamedValue_var::CORBA_NamedValue_var (void)
-  : ptr_ (CORBA_NamedValue::_nil ())
-{
-}
-
-ACE_INLINE
-CORBA_NamedValue_var::CORBA_NamedValue_var (CORBA_NamedValue_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_NamedValue_var::~CORBA_NamedValue_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_NamedValue_ptr
-CORBA_NamedValue_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_NamedValue_var::CORBA_NamedValue_var (const CORBA_NamedValue_var &p)
-  : ptr_ (CORBA_NamedValue::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE CORBA_NamedValue_var &
-CORBA_NamedValue_var::operator= (CORBA_NamedValue_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_NamedValue_var &
-CORBA_NamedValue_var::operator= (const CORBA_NamedValue_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_NamedValue::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_NamedValue_var::operator const CORBA_NamedValue_ptr &() const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_NamedValue_var::operator CORBA_NamedValue_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_NamedValue_ptr
-CORBA_NamedValue_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_NamedValue_ptr
-CORBA_NamedValue_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_NamedValue_ptr &
-CORBA_NamedValue_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_NamedValue_ptr &
-CORBA_NamedValue_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_NamedValue::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_NamedValue_ptr
-CORBA_NamedValue_var::_retn (void)
-{
-  // yield ownership
-  CORBA_NamedValue_ptr val = this->ptr_;
-  this->ptr_ = CORBA_NamedValue::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_NamedValue_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_NamedValue_out::CORBA_NamedValue_out (CORBA_NamedValue_ptr &p)
-        : ptr_ (p)
-{
-  this->ptr_ = CORBA_NamedValue::_nil ();
-}
-
-ACE_INLINE
-CORBA_NamedValue_out::CORBA_NamedValue_out (CORBA_NamedValue_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_NamedValue::_nil ();
-}
-
-ACE_INLINE
-CORBA_NamedValue_out::CORBA_NamedValue_out (CORBA_NamedValue_out &p)
-  : ptr_ (p.ptr_)
-{}
-
-ACE_INLINE CORBA_NamedValue_out &
-CORBA_NamedValue_out::operator= (CORBA_NamedValue_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_NamedValue_out &
-CORBA_NamedValue_out::operator= (const CORBA_NamedValue_var &p)
-{
-  this->ptr_ = CORBA_NamedValue::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_NamedValue_out &
-CORBA_NamedValue_out::operator= (CORBA_NamedValue_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_NamedValue_out::operator CORBA_NamedValue_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_NamedValue_ptr &
-CORBA_NamedValue_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_NamedValue_ptr
-CORBA_NamedValue_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// ****************************************************************
-
-// = methods for the NVList class
-
-// constructor
-ACE_INLINE
-CORBA_NVList::CORBA_NVList (void)
-  : max_ (0),
-    refcount_ (1)
-{
-}
-
-ACE_INLINE CORBA::ULong
-CORBA_NVList::count (void) const
-{
-  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;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_NVList_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_NVList_var::CORBA_NVList_var (void)
-  : ptr_ (CORBA_NVList::_nil ())
-{
-}
-
-ACE_INLINE
-CORBA_NVList_var::CORBA_NVList_var (CORBA_NVList_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_NVList_var::~CORBA_NVList_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_NVList_ptr
-CORBA_NVList_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_NVList_var::CORBA_NVList_var (const CORBA_NVList_var &p)
-  : ptr_ (CORBA_NVList::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE CORBA_NVList_var &
-CORBA_NVList_var::operator= (CORBA_NVList_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_NVList_var &
-CORBA_NVList_var::operator= (const CORBA_NVList_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_NVList::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_NVList_var::operator const CORBA_NVList_ptr &() const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_NVList_var::operator CORBA_NVList_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_NVList_ptr
-CORBA_NVList_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_NVList_ptr
-CORBA_NVList_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_NVList_ptr &
-CORBA_NVList_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_NVList_ptr &
-CORBA_NVList_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_NVList::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_NVList_ptr
-CORBA_NVList_var::_retn (void)
-{
-  // yield ownership
-  CORBA_NVList_ptr val = this->ptr_;
-  this->ptr_ = CORBA_NVList::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_NVList_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_NVList_out::CORBA_NVList_out (CORBA_NVList_ptr &p)
-        : ptr_ (p)
-{
-  this->ptr_ = CORBA_NVList::_nil ();
-}
-
-ACE_INLINE
-CORBA_NVList_out::CORBA_NVList_out (CORBA_NVList_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_NVList::_nil ();
-}
-
-ACE_INLINE
-CORBA_NVList_out::CORBA_NVList_out (CORBA_NVList_out &p)
-  : ptr_ (p.ptr_)
-{}
-
-ACE_INLINE CORBA_NVList_out &
-CORBA_NVList_out::operator= (CORBA_NVList_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_NVList_out &
-CORBA_NVList_out::operator= (const CORBA_NVList_var &p)
-{
-  this->ptr_ = CORBA_NVList::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_NVList_out &
-CORBA_NVList_out::operator= (CORBA_NVList_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_NVList_out::operator CORBA_NVList_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_NVList_ptr &
-CORBA_NVList_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_NVList_ptr
-CORBA_NVList_out::operator-> (void)
-{
-  return this->ptr_;
-}
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
deleted file mode 100644
index 4c2230541fc..00000000000
--- a/TAO/tao/ORB.cpp
+++ /dev/null
@@ -1,1968 +0,0 @@
-// $Id$
-
-// @@ as with TAO, this has a strong coupling to the Internet ORB
-// (IIOP) code.  We should make it know less about that protocol
-// component and have a loose table-driven coupling to ORB/protocol
-// library components.
-
-#include "tao/ORB.h"
-#include "tao/Acceptor_Registry.h"
-#include "tao/Connector_Registry.h"
-
-#include "ace/Dynamic_Service.h"
-#include "ace/Service_Repository.h"
-#include "ace/Object_Manager.h"
-#include "ace/SOCK_Dgram_Mcast.h"
-#include "ace/SOCK_Acceptor.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Read_Buffer.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Arg_Shifter.h"
-
-#include "tao/Object.h"
-#include "tao/Typecode.h"
-#include "tao/NVList.h"
-#include "tao/Stub.h"
-#include "tao/DynAny_i.h"
-#include "tao/ORB_Core.h"
-#include "tao/Server_Strategy_Factory.h"
-#include "tao/CDR_Interpreter.h"
-#include "tao/debug.h"
-#include "tao/TAO_Internal.h"
-#include "tao/CDR.h"
-#include "tao/Marshal.h"
-#include "tao/IOR_LookupTable.h"
-#include "tao/GIOP.h"
-#include "tao/Object_Adapter.h"
-#include "tao/POA.h"
-#include "tao/Request.h"
-#include "tao/MProfile.h"
-
-#if defined (TAO_HAS_VALUETYPE)
-#  include "tao/ValueFactory_Map.h"
-#endif /* TAO_HAS_VALUETYPE */
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-#include "tao/Messaging_Policy_i.h"
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
-#if defined (ACE_HAS_EXCEPTIONS)
-# if defined (ACE_MVS)
-#   include /**/ <unexpect.h>
-# else
-#  if defined (ACE_HAS_STANDARD_CPP_LIBRARY)
-#   include /**/ <exception>
-#   if !defined (ACE_WIN32)
-using std::set_unexpected;
-#   endif /* !ACE_WIN32 */
-#  else
-#   include /**/ <exception.h>
-#  endif /* ACE_HAS_STANDARD_CPP_LIBRARY */
-# endif /* ACE_MVS */
-#endif /* ACE_HAS_EXCEPTIONS */
-
-#if !defined (__ACE_INLINE__)
-# include "tao/ORB.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, ORB, "$Id$")
-
-static const char ior_prefix [] = "IOR:";
-static const char file_prefix[] = "file://";
-
-// = Static initialization.
-
-// Count of the number of ORBs.
-int CORBA_ORB::orb_init_count_ = 0;
-
-CORBA::Boolean
-operator<< (TAO_OutputCDR &strm,
-            const CORBA::ORB::InvalidName &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-CORBA::Boolean operator>> (TAO_InputCDR &strm,
-                           CORBA::ORB::InvalidName &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-
-CORBA_ORB::InvalidName::InvalidName (void)
-  : CORBA_UserException (CORBA::ORB::_tc_InvalidName)
-{
-}
-
-CORBA::ORB::InvalidName::~InvalidName (void)
-{
-}
-
-CORBA::ORB::InvalidName::InvalidName (const CORBA::ORB::InvalidName &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-}
-
-// assignment operator
-CORBA::ORB::InvalidName&
-CORBA::ORB::InvalidName::operator= (const CORBA::ORB::InvalidName &_tao_excp)
-{
-
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-CORBA_ORB::InvalidName*
-CORBA_ORB::InvalidName::_narrow (CORBA_Exception *ex)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/ORB/InvalidName:1.0", ex->_id ()))
-    return ACE_dynamic_cast (CORBA::ORB::InvalidName*, ex);
-  else
-    return 0;
-}
-
-void
-CORBA_ORB::InvalidName::_raise (void)
-{
-  TAO_RAISE(*this);
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *CORBA::ORB::InvalidName::_alloc (void)
-{
-  return new CORBA::ORB::InvalidName;
-}
-
-CORBA_ORB::CORBA_ORB (TAO_ORB_Core *orb_core)
-  : refcount_ (1),
-    open_called_ (0),
-    shutdown_lock_ (0),
-    should_shutdown_ (0),
-    name_service_ (CORBA_Object::_nil ()),
-    schedule_service_ (CORBA_Object::_nil ()),
-    event_service_ (CORBA_Object::_nil ()),
-    trading_service_ (CORBA_Object::_nil ()),
-    implrepo_service_ (CORBA_Object::_nil ()),
-    orb_core_ (orb_core),
-# ifdef TAO_HAS_VALUETYPE
-    valuetype_factory_map_ (0),
-# endif /* TAO_HAS_VALUETYPE */
-    use_omg_ior_format_ (1)
-{
-}
-
-CORBA_ORB::~CORBA_ORB (void)
-{
-  if (!CORBA::is_nil (this->name_service_))
-    CORBA::release (this->name_service_);
-  if (!CORBA::is_nil (this->schedule_service_))
-    CORBA::release (this->schedule_service_);
-  if (!CORBA::is_nil (this->event_service_))
-    CORBA::release (this->event_service_);
-  if (!CORBA::is_nil (this->trading_service_))
-    CORBA::release (this->trading_service_);
-  if (!CORBA::is_nil (this->implrepo_service_))
-    CORBA::release (this->implrepo_service_);
-
-  this->orb_core_->fini ();
-
-  ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, tao_mon, *ACE_Static_Object_Lock::instance ()));
-
-  CORBA_ORB::orb_init_count_--;
-
-  if (CORBA_ORB::orb_init_count_ == 0)
-    {
-      // free up all the ORB owned Exceptions
-      TAO_Exceptions::fini ();
-
-      // free up all the ORB owned TypeCodes
-      TAO_TypeCodes::fini ();
-    }
-
-  delete this->shutdown_lock_;
-  this->shutdown_lock_ = 0;
-
-# ifdef TAO_HAS_VALUETYPE
-  // delete valuetype_factory_map_;
-  // not really, its a singleton
-# endif /* TAO_HAS_VALUETYPE */
-}
-
-// Set up listening endpoints.
-
-int
-CORBA_ORB::open (void)
-{
-  // Double check pattern
-  if (this->open_called_ == 1)
-    return 1;
-
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, tao_mon, this->open_lock_, -1);
-
-  if (this->open_called_ == 1)
-    return 1;
-
-  this->open_called_ = 1;
-
-  TAO_Acceptor_Registry *ar = this->orb_core_->acceptor_registry ();
-  // get a reference to the acceptor_registry!
-
-  // Initialize all the endpoints ... the registry will use the
-  // orb_core_ to obtain a list of endpoints and strategies!
-
-  if (ar->open (this->orb_core_) == -1)
-    // Need to return an error somehow!!  Maybe set do_exit?
-    return -1;
-
-  return 0;
-}
-
-void
-CORBA_ORB::shutdown (CORBA::Boolean wait_for_completion,
-                     CORBA::Environment &ACE_TRY_ENV)
-{
-  // Is the <wait_for_completion> semantics for this thread correct?
-  TAO_POA::check_for_valid_wait_for_completions (wait_for_completion,
-                                                 ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // If the ORB::shutdown operation is called, it makes a call on
-  // deactivate with a TRUE etherealize_objects parameter for each POA
-  // manager known in the process; the wait_for_completion parameter
-  // to deactivate will be the same as the similarly named parameter
-  // of ORB::shutdown.
-  this->orb_core_->object_adapter ()->deactivate (wait_for_completion,
-                                                  ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // Set the shutdown flag
-  this->should_shutdown (1);
-
-  // Grab the thread manager
-  ACE_Thread_Manager *tm = this->orb_core_->thr_mgr ();
-
-  // Try to cancel all the threads in the ORB.
-  tm->cancel_all ();
-
-  // Wake up all waiting threads in the reactor.
-  this->orb_core_->reactor ()->wakeup_all_threads ();
-
-  // If <wait_for_completion> is set, wait for all threads to exit.
-  if (wait_for_completion != 0)
-    tm->wait ();
-
-  return;
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-void
-CORBA_ORB::create_list (CORBA::Long count,
-                        CORBA::NVList_ptr &new_list,
-                        CORBA_Environment &)
-{
-  assert (CORBA::ULong (count) <= UINT_MAX);
-
-  // Create an empty list
-  new_list = new CORBA::NVList;
-
-  // If count is greater than 0, create a list of NamedValues.
-  if (count != 0)
-    {
-      new_list->max_ = (CORBA::ULong) count;
-
-      for (CORBA::Long i=0; i < count; i++)
-        {
-          CORBA::NamedValue_ptr nv = new CORBA::NamedValue;
-          new_list->values_.enqueue_tail (nv);
-        }
-    }
-}
-
-int
-CORBA_ORB::perform_work (const ACE_Time_Value &tv)
-{
-  ACE_Reactor *r = this->orb_core_->reactor ();
-
-  // Set the owning thread of the Reactor to the one which we're
-  // currently in.  This is necessary b/c it's possible that the
-  // application is calling us from a thread other than that in which
-  // the Reactor's CTOR (which sets the owner) was called.
-  r->owner (ACE_Thread::self ());
-
-  ACE_Time_Value tmp_tv (tv);
-
-  return r->handle_events (tmp_tv);
-}
-
-CORBA::Boolean
-CORBA_ORB::work_pending (void)
-{
-  // There's ALWAYS work to do ;-)
-  return 1;
-}
-
-// The following functions are not implemented - they just throw
-// CORBA::NO_IMPLEMENT.
-
-void
-CORBA_ORB::create_exception_list (CORBA::ExceptionList_ptr &,
-                                  CORBA_Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                  CORBA::COMPLETED_NO));
-}
-
-void
-CORBA_ORB::create_environment (CORBA::Environment_ptr &,
-                               CORBA_Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                  CORBA::COMPLETED_NO));
-}
-
-CORBA::Boolean
-CORBA_ORB::get_service_information (CORBA::ServiceType /* service_type */,
-                                    CORBA::ServiceInformation_out /* service_information */,
-                                    CORBA::Environment &)
-{
-  return 0;
-}
-
-void
-CORBA_ORB::create_named_value (CORBA::NamedValue_ptr &,
-                               CORBA_Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                  CORBA::COMPLETED_NO));
-}
-
-void
-CORBA_ORB::create_context_list (CORBA::ContextList_ptr &,
-                                CORBA_Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                  CORBA::COMPLETED_NO));
-}
-
-void
-CORBA_ORB::get_default_context (CORBA::Context_ptr &,
-                                CORBA_Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                  CORBA::COMPLETED_NO));
-}
-
-void
-CORBA_ORB::send_multiple_requests_oneway (const CORBA_ORB_RequestSeq,
-                                          CORBA_Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                  CORBA::COMPLETED_NO));
-}
-
-void
-CORBA_ORB::send_multiple_requests_deferred (const CORBA_ORB_RequestSeq,
-                                            CORBA_Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                  CORBA::COMPLETED_NO));
-}
-
-void
-CORBA_ORB::get_next_response (CORBA_Request_ptr &,
-                              CORBA_Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                  CORBA::COMPLETED_NO));
-}
-
-CORBA::Boolean
-CORBA_ORB::poll_next_response (CORBA_Environment &ACE_TRY_ENV)
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                         CORBA::COMPLETED_NO),
-                    0);
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-int
-CORBA_ORB::run (ACE_Time_Value *tv,
-                int break_on_timeouts)
-{
-  return this->orb_core_->run (tv, break_on_timeouts);
-}
-
-int
-CORBA_ORB::run (ACE_Time_Value &tv)
-{
-  return this->run (&tv, 1);
-}
-
-int
-CORBA_ORB::run (ACE_Time_Value *tv)
-{
-  return this->run (tv, 1);
-}
-
-int
-CORBA_ORB::run (void)
-{
-  return this->run (0, 0);
-}
-
-CORBA_Object_ptr
-CORBA_ORB::resolve_root_poa (CORBA::Environment &ACE_TRY_ENV,
-                             const char *adapter_name,
-                             TAO_POA_Manager *poa_manager,
-                             const TAO_POA_Policies *policies)
-{
-  return this->orb_core_->root_poa_reference (ACE_TRY_ENV,
-                                              adapter_name,
-                                              poa_manager,
-                                              policies);
-}
-
-CORBA_Object_ptr
-CORBA_ORB::resolve_poa_current (CORBA::Environment &ACE_TRY_ENV)
-{
-  // Return the pointer to the POA Current.
-  return this->orb_core_->poa_current ()._this (ACE_TRY_ENV);
-}
-
-CORBA_Object_ptr
-CORBA_ORB::resolve_policy_manager (CORBA::Environment& ACE_TRY_ENV)
-{
-#if defined (TAO_HAS_CORBA_MESSAGING)
-  TAO_Policy_Manager *policy_manager =
-    this->orb_core_->policy_manager ();
-  if (policy_manager == 0)
-    return CORBA_Object::_nil ();
-
-  return policy_manager->_this (ACE_TRY_ENV);
-#else
-  return CORBA_Object::_nil ();
-#endif /* TAO_HAS_CORBA_MESSAGING */
-}
-
-CORBA_Object_ptr
-CORBA_ORB::resolve_policy_current (CORBA::Environment& ACE_TRY_ENV)
-{
-#if defined (TAO_HAS_CORBA_MESSAGING)
-  TAO_Policy_Current &policy_current = this->orb_core_->policy_current ();
-  return policy_current._this (ACE_TRY_ENV);
-#else
-  return CORBA_Object::_nil ();
-#endif /* TAO_HAS_CORBA_MESSAGING */
-}
-
-CORBA_Object_ptr
-CORBA_ORB::resolve_ior_manipulation (CORBA::Environment& ACE_TRY_ENV)
-{
-  return this->ior_manipulation_._this (ACE_TRY_ENV);
-}
-
-CORBA_Object_ptr
-CORBA_ORB::resolve_service (const char *service_name,
-                            ACE_Time_Value *timeout,
-                            CORBA::Environment& ACE_TRY_ENV)
-{
-  CORBA_Object_var return_value = CORBA_Object::_nil ();
-
-  // First check to see if we've already initialized this.
-  if (!CORBA::is_nil (this->name_service_))
-    {
-      return_value = CORBA::Object::_duplicate (this->name_service_);
-    }
-  else
-    {
-      ACE_CString name_service_ior =
-        this->orb_core_->orb_params ()->name_service_ior ();
-
-      // Second, check to see if the user has give us a parameter on
-      // the command-line.
-      if (name_service_ior.length () == 0)
-        // Third, check to see if the user has an environment variable.
-        name_service_ior = ACE_OS::getenv ("NameServiceIOR");
-
-      if (name_service_ior.length () != 0)
-        {
-          return_value =
-            this->string_to_object (name_service_ior.c_str (),
-                                    ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA_Object::_nil ());
-        }
-      else
-        {
-          // First, determine if the port was supplied on the command line
-          u_short port =
-            this->orb_core_->orb_params ()->name_service_port ();
-
-          if (port == 0)
-            {
-              // Look for the port among our environment variables.
-              const char *port_number =
-                ACE_OS::getenv ("NameServicePort");
-
-              if (port_number != 0)
-                port = ACE_OS::atoi (port_number);
-              else
-                port = TAO_DEFAULT_NAME_SERVER_REQUEST_PORT;
-            }
-
-          return_value =
-            this->multicast_to_service (service_name,
-                                        port,
-                                        timeout,
-                                        ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA_Object::_nil ());
-        }
-      this->name_service_ = CORBA::Object::_duplicate (return_value.ptr ());
-    }
-
-  // Return ior.
-  return return_value._retn ();
-}
-
-CORBA_Object_ptr
-CORBA_ORB::resolve_trading_service (ACE_Time_Value *timeout,
-                                    CORBA::Environment& ACE_TRY_ENV)
-{
-  CORBA_Object_var return_value = CORBA_Object::_nil ();
-
-  // First check to see if we've already initialized this.
-  if (this->trading_service_ != CORBA_Object::_nil ())
-    {
-      // @@ Someone please double-check this ;-)
-      return_value = this->trading_service_;
-    }
-  else
-    {
-      ACE_CString trading_service_ior =
-        this->orb_core_->orb_params ()->trading_service_ior ();
-
-      // Second, check to see if the user has give us a parameter on
-      // the command-line.
-      if (trading_service_ior.length () == 0)
-        // Third, check to see if the user has an environment variable.
-        trading_service_ior = ACE_OS::getenv ("TradingServiceIOR");
-
-      if (trading_service_ior.length () != 0)
-        {
-          return_value =
-            this->string_to_object (trading_service_ior.c_str (), ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA_Object::_nil ());
-        }
-      else
-        {
-          // First, determine if the port was supplied on the command line
-          // @@ FRED: need a generic rep for this!
-          u_short port =
-            this->orb_core_->orb_params ()->trading_service_port ();
-
-          if (port == 0)
-            {
-              // Look for the port among our environment variables.
-              const char *port_number = ACE_OS::getenv ("TradingServicePort");
-
-              if (port_number != 0)
-                port = ACE_OS::atoi (port_number);
-              else
-                port = TAO_DEFAULT_TRADING_SERVER_REQUEST_PORT;
-            }
-
-          return_value =
-            this->multicast_to_service ("TradingService",
-                                        port,
-                                        timeout,
-                                        ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA_Object::_nil ());
-        }
-      this->trading_service_ = return_value.ptr ();
-    }
-
-  return CORBA_Object::_duplicate (return_value._retn ());
-}
-
-CORBA_Object_ptr
-CORBA_ORB::resolve_implrepo_service (ACE_Time_Value *timeout,
-                                     CORBA::Environment& ACE_TRY_ENV)
-{
-    CORBA_Object_var return_value = CORBA_Object::_nil ();
-
-    // First check to see if we've already initialized this.
-    if (this->implrepo_service_ != CORBA_Object::_nil ())
-      {
-        return_value = this->implrepo_service_;
-      }
-    else
-      {
-        ACE_CString implrepo_service_ior =
-          this->orb_core_->orb_params ()->implrepo_service_ior ();
-
-        // Second, check to see if the user has give us a parameter on
-        // the command-line.
-        if (implrepo_service_ior.length () == 0)
-          // Third, check to see if the user has an environment variable.
-          implrepo_service_ior = ACE_OS::getenv ("ImplRepoServiceIOR");
-
-        if (implrepo_service_ior.length () != 0)
-          {
-            return_value =
-              this->string_to_object (implrepo_service_ior.c_str (), ACE_TRY_ENV);
-            ACE_CHECK_RETURN (CORBA_Object::_nil ());
-          }
-        else
-          {
-            // First, determine if the port was supplied on the command line
-            // @@ FRED: need a generic rep for this!
-            u_short port =
-              this->orb_core_->orb_params ()->implrepo_service_port ();
-
-            if (port == 0)
-              {
-                // Look for the port among our environment variables.
-                const char *port_number = ACE_OS::getenv ("ImplRepoServicePort");
-
-                if (port_number != 0)
-                  port = ACE_OS::atoi (port_number);
-                else
-                  port = TAO_DEFAULT_IMPLREPO_SERVER_REQUEST_PORT;
-              }
-
-            return_value =
-              this->multicast_to_service ("ImplRepoService",
-                                          port,
-                                          timeout,
-                                          ACE_TRY_ENV);
-            ACE_CHECK_RETURN (CORBA_Object::_nil ());
-          }
-        this->implrepo_service_ = return_value.ptr ();
-      }
-
-    return CORBA_Object::_duplicate (return_value._retn ());
-}
-
-int
-CORBA_ORB::multicast_query (char *&buf,
-                            const char *service_name,
-                            u_short port,
-                            ACE_Time_Value *timeout)
-{
-  ACE_INET_Addr my_addr;
-  ACE_SOCK_Acceptor acceptor;
-  ACE_SOCK_Stream stream;
-  ACE_SOCK_Dgram dgram;
-
-  ssize_t result = 0;
-
-  // Bind listener to any port and then find out what the port was.
-  if (acceptor.open (ACE_Addr::sap_any) == -1
-      || acceptor.get_local_addr (my_addr) == -1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "acceptor.open () || "
-                  "acceptor.get_local_addr () failed"));
-      result = -1;
-    }
-  else
-    {
-      ACE_INET_Addr multicast_addr (port,
-                                    ACE_DEFAULT_MULTICAST_ADDR);
-      // Open the datagram.
-      if (dgram.open (ACE_Addr::sap_any) == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "Unable to open the Datagram!\n"));
-          result = -1;
-        }
-      else
-        {
-          // Convert the acceptor port into network byte order.
-          ACE_UINT16 response_port =
-            ACE_HTONS (my_addr.get_port_number ());
-
-          // Length of service name we will send.
-          CORBA::Short data_len =
-            ACE_HTONS (ACE_OS::strlen (service_name) + 1);
-
-          // Vector we will send.  It contains: 1) length of service
-          // name string, 2)port on which we are listening for
-          // replies, and 3) name of service we are looking for.
-          const int iovcnt = 3;
-          iovec iovp[iovcnt];
-
-          // The length of service name string.
-          iovp[0].iov_base = (char *) &data_len;
-          iovp[0].iov_len  = sizeof (CORBA::Short);
-
-          // The port at which we are listening.
-          iovp[1].iov_base = (char *) &response_port;
-          iovp[1].iov_len  = sizeof (ACE_UINT16);
-
-          // The service name string.
-          iovp[2].iov_base = (char *) service_name;
-          iovp[2].iov_len  = ACE_OS::strlen (service_name) + 1;
-
-          // Send the multicast.
-          result = dgram.send (iovp,
-                               iovcnt,
-                               multicast_addr);
-
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "\nsent multicast request."));
-
-          // Check for errors.
-          if (result == -1)
-            ACE_ERROR ((LM_ERROR,
-                        "%p\n",
-                        "error sending IIOP multicast"));
-          else
-            {
-              if (TAO_debug_level > 0)
-                ACE_DEBUG ((LM_DEBUG,
-                            "\n%s; Sent multicast."
-                            "# of bytes sent is %d.\n",
-                            __FILE__,
-                            result));
-              // Wait for response until timeout.
-              ACE_Time_Value tv (timeout == 0
-                                 ? ACE_Time_Value (TAO_DEFAULT_SERVICE_RESOLUTION_TIMEOUT)
-                                 : *timeout);
-
-              // Accept reply connection from server.
-              if (acceptor.accept (stream,
-                                   0,
-                                   &tv) == -1)
-                {
-                  ACE_ERROR ((LM_ERROR,
-                              "%p\n",
-                              "multicast_query: unable to accept"));
-                  result = -1;
-                }
-              else
-                {
-                  // Receive the IOR.
-
-                  // IOR length.
-                  CORBA::Short ior_len;
-                  result = stream.recv_n (&ior_len,
-                                          sizeof ior_len,
-                                          0,
-                                          &tv);
-                  if (result != sizeof (ior_len))
-                    {
-                      ACE_ERROR ((LM_ERROR,
-                                  "%p\n",
-                                  "multicast_query: unable to receive ior length"));
-                      result = -1;
-                    }
-                  else
-                    {
-                      // Allocate more space for the ior if we don't
-                      // have enough.
-                      ior_len = ACE_NTOHS (ior_len);
-                      if (ior_len > TAO_DEFAULT_IOR_SIZE)
-                        {
-                          buf = CORBA::string_alloc (ior_len);
-                          if (buf == 0)
-                            {
-                              ACE_ERROR ((LM_ERROR,
-                                          "%p\n",
-                                          "multicast_query: unable to allocate memory"));
-                              result = -1;
-                            }
-                        }
-
-                      if (result != -1)
-                        {
-                          // Receive the ior.
-                          result = stream.recv_n (buf,
-                                                  ior_len,
-                                                  0,
-                                                  &tv);
-                          if (result == -1)
-                            ACE_ERROR ((LM_ERROR,
-                                        "%p\n",
-                                        "error reading ior"));
-                          else if (TAO_debug_level > 0)
-                            ACE_DEBUG ((LM_DEBUG,
-                                        "%s: service resolved to IOR <%s>\n",
-                                        __FILE__,
-                                        buf));
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-  // Clean up.
-  stream.close ();
-  dgram.close ();
-  acceptor.close ();
-
-  return result == -1 ? -1 : 0;
-}
-// @@ This will have to be sanitized of transport specific calls
-//    in order to support pluggable protocols!  But, it does use
-//    UDP and multicast.  Not all transport protocols may support
-//    this, connectionless and multicast. fredk
-// @@ FRED: Should define a flag, something like Protocol_Has_Multicast
-//    If there is no multicast, then this functionality is not available
-//    and we return NULL.
-
-CORBA_Object_ptr
-CORBA_ORB::multicast_to_service (const char *service_name,
-                                 u_short port,
-                                 ACE_Time_Value *timeout,
-                                 CORBA::Environment& ACE_TRY_ENV)
-{
-  char buf[TAO_DEFAULT_IOR_SIZE];
-  char *ior = buf;
-  CORBA::String_var cleaner;
-
-  CORBA_Object_var return_value =
-    CORBA_Object::_nil ();
-
-  // Use UDP multicast to locate the  service.
-  int result = this->multicast_query (ior,
-                                      service_name,
-                                      port,
-                                      timeout);
-
-  // If the IOR didn't fit into <buf>, memory for it was dynamically
-  // allocated - make sure it gets deallocated.
-  if (ior != buf)
-    cleaner = ior;
-
-  if (result == 0)
-    {
-      // Convert IOR to an object reference.
-      return_value =
-        this->string_to_object ((CORBA::String) ior,
-                                ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA_Object::_nil ());
-    }
-
-  // Return object reference.
-  return return_value._retn ();
-}
-
-CORBA_Object_ptr
-CORBA_ORB::resolve_initial_references (const char *name,
-                                       CORBA_Environment &ACE_TRY_ENV)
-{
-  return this->resolve_initial_references (name,
-                                           0,
-                                           ACE_TRY_ENV);
-}
-
-CORBA_Object_ptr
-CORBA_ORB::resolve_initial_references (const char *name,
-                                       ACE_Time_Value *timeout,
-                                       CORBA_Environment &ACE_TRY_ENV)
-{
-  if (ACE_OS::strcmp (name, TAO_OBJID_ROOTPOA) == 0)
-    return this->resolve_root_poa (ACE_TRY_ENV);
-
-  else if (ACE_OS::strcmp (name, TAO_OBJID_POACURRENT) == 0)
-    return this->resolve_poa_current (ACE_TRY_ENV);
-
-  else if (ACE_OS::strcmp (name, TAO_OBJID_POLICYMANAGER) == 0)
-    return this->resolve_policy_manager (ACE_TRY_ENV);
-
-  else if (ACE_OS::strcmp (name, TAO_OBJID_POLICYCURRENT) == 0)
-    return this->resolve_policy_current (ACE_TRY_ENV);
-  else if (ACE_OS::strcmp (name, TAO_OBJID_IORMANIPULATION) == 0)
-    return this->resolve_ior_manipulation (ACE_TRY_ENV);
-
-  // Is not one of the well known services, try to find it in the
-  // InitRef table....
-
-  // Get the table of initial references specified through
-  // -ORBInitRef.
-  TAO_IOR_LookupTable *table =
-    this->orb_core_->orb_params ()->ior_lookup_table ();
-
-  ACE_CString ior;
-  ACE_CString object_id ((const char *) name);
-
-  // Is the service name in the IOR Table.
-  if (table->find_ior (object_id, ior) == 0)
-    return this->string_to_object (ior.c_str (), ACE_TRY_ENV);
-  else
-    {
-      // Get the list of initial reference prefixes specified through
-      // -ORBDefaultInitRef.
-      char * default_init_ref =
-        this->orb_core_->orb_params ()->default_init_ref ();
-
-      // Check if a DefaultInitRef was specified.
-      if (ACE_OS::strlen (default_init_ref) != 0)
-        {
-          ACE_CString list_of_profiles (default_init_ref);
-
-          // Clean up.
-          delete [] default_init_ref;
-
-          // Obtain the appropriate object key delimiter for the
-          // specified protocol.
-          const char object_key_delimiter =
-            this->orb_core_->connector_registry ()->object_key_delimiter (
-                                                  list_of_profiles.c_str ());
-
-          // Make sure that the default initial reference doesn't end
-          // with the object key delimiter character.
-          if (list_of_profiles[list_of_profiles.length() - 1] !=
-              object_key_delimiter)
-            list_of_profiles += ACE_CString (object_key_delimiter);
-
-          list_of_profiles += object_id;
-
-          return this->string_to_object (list_of_profiles.c_str (),
-                                         ACE_TRY_ENV);
-        }
-
-      // Clean up.
-      delete [] default_init_ref;
-    }
-
-  // Did not find it in the InitRef table, or in the DefaultInitRef
-  // entry.... Try the hard-coded ways to find the basic services...
-
-  if (ACE_OS::strcmp (name, TAO_OBJID_NAMESERVICE) == 0)
-    return this->resolve_service ("NameService", timeout, ACE_TRY_ENV);
-
-  else if (ACE_OS::strcmp (name, TAO_OBJID_TRADINGSERVICE) == 0)
-    return this->resolve_trading_service (timeout, ACE_TRY_ENV);
-
-  else if (ACE_OS::strcmp (name, TAO_OBJID_IMPLREPOSERVICE) == 0)
-    return this->resolve_implrepo_service (timeout, ACE_TRY_ENV);
-
-  else
-    ACE_THROW_RETURN (CORBA::ORB::InvalidName (), 0);
-
-}
-
-// Unimplemented at this time.
-CORBA_ORB_ObjectIdList_ptr
-CORBA_ORB::list_initial_services (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                         CORBA::COMPLETED_NO),
-                    0);
-}
-
-TAO_Stub *
-CORBA_ORB::create_stub_object (const TAO_ObjectKey &key,
-                               const char *type_id,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  if (this->open () == -1)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-  CORBA::String id = 0;
-
-  if (type_id)
-    id = CORBA::string_dup (type_id);
-
-  TAO_Stub *stub = 0;
-
-  size_t pfile_count =
-    this->orb_core_->acceptor_registry ()->endpoint_count ();
-
-  // First we create a profile list, well actually the empty container
-  TAO_MProfile mp (pfile_count);
-
-  this->orb_core_->acceptor_registry ()->make_mprofile (key, mp);
-
-  ACE_NEW_THROW_EX (stub,
-                    TAO_Stub (id, mp, this->orb_core_),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
-                                      CORBA::COMPLETED_MAYBE));
-  ACE_CHECK_RETURN (stub);
-
-  return stub;
-}
-
-// Create an objref
-
-CORBA::Object_ptr
-CORBA_ORB::key_to_object (const TAO_ObjectKey &key,
-                          const char *type_id,
-                          TAO_ServantBase *servant,
-                          CORBA::Boolean collocated,
-                          CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *data = this->create_stub_object (key, type_id, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  // Create the CORBA level proxy
-  CORBA_Object *new_obj = new CORBA_Object (data, servant, collocated);
-
-  // Clean up in case of errors.
-  if (CORBA::is_nil (new_obj))
-    {
-      data->_decr_refcnt ();
-      ACE_THROW_RETURN (CORBA::INTERNAL (), CORBA::Object::_nil ());
-    }
-
-  data->servant_orb (CORBA::ORB::_duplicate (this));
-  return new_obj;
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-// Dynamic Any factory functions.
-
-CORBA_DynAny_ptr
-CORBA_ORB::create_dyn_any       (const CORBA_Any& any,
-                                 CORBA::Environment& ACE_TRY_ENV)
-{
-  return TAO_DynAny_i::create_dyn_any (any, ACE_TRY_ENV);
-}
-
-CORBA_DynAny_ptr
-CORBA_ORB::create_basic_dyn_any (CORBA_TypeCode_ptr tc,
-                                 CORBA::Environment& ACE_TRY_ENV)
-{
-  return TAO_DynAny_i::create_dyn_any (tc, ACE_TRY_ENV);
-}
-
-CORBA_DynStruct_ptr
-CORBA_ORB::create_dyn_struct    (CORBA_TypeCode_ptr tc,
-                                 CORBA::Environment& ACE_TRY_ENV)
-{
-  return TAO_DynAny_i::create_dyn_struct (tc, ACE_TRY_ENV);
-}
-
-CORBA_DynSequence_ptr
-CORBA_ORB::create_dyn_sequence  (CORBA_TypeCode_ptr tc,
-                                 CORBA::Environment& ACE_TRY_ENV)
-{
-  return TAO_DynAny_i::create_dyn_sequence (tc, ACE_TRY_ENV);
-}
-
-CORBA_DynArray_ptr
-CORBA_ORB::create_dyn_array     (CORBA_TypeCode_ptr tc,
-                                 CORBA::Environment& ACE_TRY_ENV)
-{
-  return TAO_DynAny_i::create_dyn_array (tc, ACE_TRY_ENV);
-}
-
-CORBA_DynUnion_ptr
-CORBA_ORB::create_dyn_union     (CORBA_TypeCode_ptr tc,
-                                 CORBA::Environment& ACE_TRY_ENV)
-{
-  return TAO_DynAny_i::create_dyn_union (tc, ACE_TRY_ENV);
-}
-
-CORBA_DynEnum_ptr
-CORBA_ORB::create_dyn_enum      (CORBA_TypeCode_ptr tc,
-                                 CORBA::Environment& ACE_TRY_ENV)
-{
-  return TAO_DynAny_i::create_dyn_enum (tc, ACE_TRY_ENV);
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-// ****************************************************************
-
-// String utility support; this needs to be integrated with the ORB's
-// own memory allocation subsystem.
-
-CORBA::Char*
-CORBA::string_copy (const CORBA::Char *str)
-{
-  return CORBA::string_dup (str);
-}
-
-CORBA_String_var::CORBA_String_var (char *p)
-  : ptr_ (p)
-{
-  // NOTE: According to the CORBA spec this string must *not* be
-  // copied, but it is non-compliant to use it/release it in the
-  // calling code.  argument is consumed. p should never be NULL
-}
-
-CORBA_String_var::CORBA_String_var (const CORBA_String_var& r)
-{
-  this->ptr_ = CORBA::string_dup (r.ptr_);
-}
-
-CORBA_String_var::~CORBA_String_var (void)
-{
-  CORBA::string_free (this->ptr_);
-  this->ptr_ = 0;
-}
-
-CORBA_String_var &
-CORBA_String_var::operator= (char *p)
-{
-  if (this->ptr_ != p)
-    {
-      CORBA::string_free (this->ptr_);
-      this->ptr_ = p;
-    }
-  return *this;
-}
-
-CORBA_String_var &
-CORBA_String_var::operator= (const char *p)
-{
-  CORBA::string_free (this->ptr_);
-
-  this->ptr_ = CORBA::string_dup (p);
-  return *this;
-}
-
-CORBA_String_var &
-CORBA_String_var::operator= (const CORBA_String_var& r)
-{
-  if (this != &r)
-    {
-      CORBA::string_free (this->ptr_);
-      this->ptr_ = CORBA::string_dup (r.ptr_);
-    }
-  return *this;
-}
-
-// ****************************************************************
-
-CORBA_WString_var::CORBA_WString_var (CORBA::WChar *p)
-  : ptr_ (p)
-{
-  // NOTE: According to the CORBA spec this string must *not* be
-  // copied, but it is non-compliant to use it/release it in the
-  // calling code.  argument is consumed. p should never be NULL
-}
-
-CORBA_WString_var::CORBA_WString_var (const CORBA_WString_var& r)
-{
-  this->ptr_ = CORBA::wstring_dup (r.ptr_);
-}
-
-CORBA_WString_var::~CORBA_WString_var (void)
-{
-  CORBA::wstring_free (this->ptr_);
-  this->ptr_ = 0;
-}
-
-CORBA_WString_var &
-CORBA_WString_var::operator= (CORBA::WChar *p)
-{
-  if (this->ptr_ != p)
-    {
-      CORBA::wstring_free (this->ptr_);
-      this->ptr_ = p;
-    }
-  return *this;
-}
-
-CORBA_WString_var &
-CORBA_WString_var::operator= (const CORBA::WChar *p)
-{
-  CORBA::wstring_free (this->ptr_);
-
-  this->ptr_ = CORBA::wstring_dup (p);
-  return *this;
-}
-
-CORBA_WString_var &
-CORBA_WString_var::operator= (const CORBA_WString_var& r)
-{
-  if (this != &r)
-    {
-      CORBA::wstring_free (this->ptr_);
-      this->ptr_ = CORBA::wstring_dup (r.ptr_);
-    }
-  return *this;
-}
-
-// ****************************************************************
-
-void
-CORBA_ORB::init_orb_globals (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, tao_mon,
-                     *ACE_Static_Object_Lock::instance ()));
-
-  // Put these initializations here so that exceptions are enabled
-  // immediately.
-
-  if (CORBA_ORB::orb_init_count_ == 0)
-    {
-#if defined(ACE_HAS_EXCEPTIONS)
-      set_unexpected (CORBA_ORB::_tao_unexpected_exception);
-#endif /* ACE_HAS_EXCEPTIONS */
-
-      // initialize the system TypeCodes
-      TAO_TypeCodes::init ();
-
-      // initialize the factory for marshaling
-      TAO_Marshal::init ();
-
-      // initialize the interpreter
-      TAO_CDR_Interpreter::init ();
-
-      // initialize the system exceptions
-      TAO_Exceptions::init (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      // Verify some of the basic implementation requirements.  This
-      // test gets optimized away by a decent compiler (or else the
-      // rest of the routine does).
-      //
-      // NOTE:  we still "just" assume that native floating point is
-      // IEEE.
-
-      if (sizeof (CORBA::Short) != 2
-          || sizeof (CORBA::Long) != 4
-          || sizeof (CORBA::LongLong) != 8
-          || sizeof (CORBA::Float) != 4
-          || sizeof (CORBA::Double) != 8
-          || sizeof (CORBA::LongDouble) != 16
-          || sizeof (CORBA::WChar) < 2
-          || sizeof (void *) != ACE_SIZEOF_VOID_P)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "%s; ERROR: unexpected basic type size; "
-                      "s:%d l:%d ll:%d f:%d d:%d ld:%d wc:%d v:%d\n"
-                      "please reconfigure TAO\n",
-                      __FILE__,
-                      sizeof (CORBA::Short),
-                      sizeof (CORBA::Long),
-                      sizeof (CORBA::LongLong),
-                      sizeof (CORBA::Float),
-                      sizeof (CORBA::Double),
-                      sizeof (CORBA::LongDouble),
-                      sizeof (CORBA::WChar),
-                      sizeof (void *)));
-
-          ACE_THROW (CORBA::INITIALIZE ());
-        }
-    }
-  CORBA_ORB::orb_init_count_++;
-}
-
-void CORBA_ORB::_tao_unexpected_exception (void)
-{
-#if defined(ACE_HAS_EXCEPTIONS)
-  throw CORBA::UNKNOWN ();
-#else
-  // Nothing to do, this will be handled by the ORB core when sending
-  // the exception back to the client...
-#endif /* ACE_HAS_EXCEPTIONS */
-}
-
-// ****************************************************************
-
-// ORB initialisation, per OMG document 94-9-46.
-//
-
-CORBA::ORB_ptr
-CORBA::ORB_init (int &argc,
-                 char *argv[],
-                 const char * orb_name)
-{
-  return CORBA::ORB_init (argc, argv, orb_name,
-                          TAO_default_environment ());
-}
-
-CORBA::ORB_ptr
-CORBA::ORB_init (int &argc,
-                 char *argv[],
-                 const char * orbid,
-                 CORBA::Environment &ACE_TRY_ENV)
-{
-  // Using ACE_Static_Object_Lock::instance() precludes <ORB_init>
-  // from being called within a static object CTOR.
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard,
-                            *ACE_Static_Object_Lock::instance (), 0));
-
-  // Make sure initialization of TAO globals only occurs once.
-  CORBA_ORB::init_orb_globals (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  if (orbid == 0 || ACE_OS::strcmp (orbid, "") == 0)
-    {
-      orbid = "";
-      ACE_Arg_Shifter arg_shifter (argc, argv);
-      while (arg_shifter.is_anything_left ())
-        {
-          char *current_arg = arg_shifter.get_current ();
-
-          const char orbid_opt[] = "-ORBId";
-          const int orbid_len = sizeof (orbid_opt) - 1;
-          if (ACE_OS::strcmp (current_arg,
-                              orbid_opt) == 0)
-            {
-              arg_shifter.consume_arg ();
-              if (arg_shifter.is_parameter_next ())
-                {
-                  orbid = arg_shifter.get_current ();
-                  arg_shifter.consume_arg ();
-                }
-            }
-          else if (ACE_OS::strncmp (current_arg, orbid_opt,
-                                    orbid_len) == 0)
-            {
-              arg_shifter.consume_arg ();
-              // The rest of the argument is the ORB id...
-              orbid = orbid_opt + orbid_len;
-              // but we should skip an optional space...
-              if (orbid[0] == ' ')
-                orbid++;
-            }
-          else
-            arg_shifter.ignore_arg ();
-        }
-    }
-
-  // Get ORB Core
-  TAO_ORB_Core *oc =
-    TAO_ORB_Table::instance ()->find (orbid);
-
-  // The ORB was initialized already, just return that one!
-  if (oc != 0)
-    return CORBA::ORB::_duplicate (oc->orb ());
-
-  // @@ As part of the ORB re-architecture this will the point where
-  //    we locate the right ORB (from a table) and use that one
-  //    instead of just creating a new one every time.
-  ACE_NEW_RETURN (oc, TAO_ORB_Core (orbid), CORBA::ORB::_nil ());
-
-  // Initialize the ORB Core instance.
-  int result = oc->init (argc, argv);
-
-  if (TAO_debug_level >= 3)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO (%P|%t) created new ORB <%s>\n",
-                orbid));
-
-  // Check for errors and return 0 if error.
-  if (result == -1)
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
-    }
-
-  // Before returning remember to store the ORB into the table...
-  if (TAO_ORB_Table::instance ()->bind (orbid, oc) != 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE,
-                                       CORBA::COMPLETED_NO), 0);
-
-  return oc->orb ();
-}
-
-// ****************************************************************
-
-// Objref stringification.
-CORBA::String
-CORBA_ORB::object_to_string (CORBA::Object_ptr obj,
-                             CORBA::Environment &ACE_TRY_ENV)
-{
-  // Application writer controls what kind of objref strings they get,
-  // maybe along with other things, by how they initialize the ORB.
-
-  if (use_omg_ior_format_)
-    {
-      // By default, orbs use IOR strings; these are ugly (and error
-      // prone) but specified by CORBA.
-      //
-      // XXX there should be a simple way to reuse this code in other
-      // ORB implementations ...
-
-      char buf [ACE_CDR::DEFAULT_BUFSIZE];
-#if defined(ACE_HAS_PURIFY)
-      (void) ACE_OS::memset (buf, '\0', sizeof(buf));
-#endif /* ACE_HAS_PURIFY */
-
-      TAO_OutputCDR cdr (buf,  sizeof buf,
-                         TAO_ENCAP_BYTE_ORDER,
-                         this->orb_core_->output_cdr_buffer_allocator (),
-                         this->orb_core_->output_cdr_dblock_allocator (),
-                         this->orb_core_->orb_params ()->cdr_memcpy_tradeoff (),
-                         this->orb_core_->to_iso8859 (),
-                         this->orb_core_->to_unicode ());
-
-      // support limited oref ACE_OS::strcmp.
-      (void) ACE_OS::memset (buf, 0, sizeof(buf));
-
-      // Marshal the objref into an encapsulation bytestream.
-      (void) cdr.write_octet (TAO_ENCAP_BYTE_ORDER);
-      if ((cdr << obj) == 0)
-        return 0;
-
-      // Now hexify the encapsulated CDR data into a string, and
-      // return that string.
-
-      CORBA::String cp;
-      size_t len = cdr.length ();
-
-      CORBA::String string;
-      ACE_ALLOCATOR_RETURN (string,
-                            CORBA::string_alloc (sizeof ior_prefix + 2 * len),
-                            0);
-
-      ACE_OS::strcpy ((char *) string,
-                      ior_prefix);
-
-      const char *bytes = cdr.buffer ();
-
-      for (cp = (CORBA::String) ACE_OS::strchr ((char *) string, ':') + 1;
-           len--;
-           bytes++)
-        {
-          *cp++ = ACE::nibble2hex ((*bytes) >> 4);
-          *cp++ = ACE::nibble2hex (*bytes);
-        }
-
-      *cp = 0;
-      return string;
-    }
-  else
-    {
-      if (obj->_stubobj () == 0)
-        ACE_THROW_RETURN (CORBA::INV_OBJREF (), 0);
-
-      return obj->_stubobj ()->profile_in_use ()->to_string (ACE_TRY_ENV);
-    }
-}
-
-// Destringify arbitrary objrefs.  This method is called from
-// <resolve_name_service> with an IOR <multicast_to_service>.
-
-CORBA::Object_ptr
-CORBA_ORB::string_to_object (const char *str,
-                             CORBA::Environment &ACE_TRY_ENV)
-{
-  if (ACE_OS::strncmp (str,
-                       file_prefix,
-                       sizeof file_prefix - 1) == 0)
-    return this->file_string_to_object (str + sizeof file_prefix - 1,
-                                        ACE_TRY_ENV);
-  else if (ACE_OS::strncmp (str,
-                            ior_prefix,
-                            sizeof ior_prefix - 1) == 0)
-    return this->ior_string_to_object (str + sizeof ior_prefix - 1,
-                                       ACE_TRY_ENV);
-  else
-    return this->url_ior_string_to_object (str, ACE_TRY_ENV);
-}
-
-// ****************************************************************
-
-#if defined(TAO_HAS_CORBA_MESSAGING)
-
-CORBA::Policy_ptr
-CORBA_ORB::create_policy (CORBA::PolicyType type,
-                          const CORBA::Any& val,
-                          CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError))
-{
-  PortableServer::POA_var root_poa =
-    this->orb_core_->root_poa_reference (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  switch (type)
-    {
-    case TAO_MESSAGING_RELATIVE_RT_TIMEOUT_POLICY_TYPE:
-      return TAO_RelativeRoundtripTimeoutPolicy_i::create (root_poa.in (),
-                                                           val,
-                                                           ACE_TRY_ENV);
-
-    case TAO_MESSAGING_REBIND_POLICY_TYPE:
-    case TAO_MESSAGING_SYNC_SCOPE_POLICY_TYPE:
-    case TAO_MESSAGING_REQUEST_PRIORITY_POLICY_TYPE:
-    case TAO_MESSAGING_REPLY_PRIORITY_POLICY_TYPE:
-    case TAO_MESSAGING_REQUEST_START_TIME_POLICY_TYPE:
-    case TAO_MESSAGING_REQUEST_END_TIME_POLICY_TYPE:
-    case TAO_MESSAGING_REPLY_START_TIME_POLICY_TYPE:
-    case TAO_MESSAGING_REPLY_END_TIME_POLICY_TYPE:
-    case TAO_MESSAGING_RELATIVE_REQ_TIMEOUT_POLICY_TYPE:
-    case TAO_MESSAGING_ROUTING_POLICY_TYPE:
-    case TAO_MESSAGING_MAX_HOPS_POLICY_TYPE:
-    case TAO_MESSAGING_QUEUE_ORDER_POLICY_TYPE:
-      ACE_THROW_RETURN (CORBA::PolicyError (CORBA::UNSUPPORTED_POLICY),
-                        CORBA::Policy::_nil ());
-
-    default:
-      break;
-    }
-  ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY),
-                    CORBA::Policy::_nil ());
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
-// ****************************************************************
-
-// Destringify OMG-specified "IOR" string.
-//
-// XXX there should be a simple way to reuse this code in other ORB
-// implementations ...
-
-CORBA::Object_ptr
-CORBA_ORB::ior_string_to_object (const char *str,
-                                 CORBA::Environment &ACE_TRY_ENV)
-{
-  // Unhex the bytes, and make a CDR deencapsulation stream from the
-  // resulting data.
-  ACE_Message_Block mb (ACE_OS::strlen ((char *) str) / 2 + 1
-                        + ACE_CDR::MAX_ALIGNMENT + 1);
-
-  ACE_CDR::mb_align (&mb);
-
-  char *buffer = mb.rd_ptr ();
-
-  const char *tmp = str;
-  size_t len = 0;
-
-  while (tmp [0] && tmp [1])
-    {
-      u_char byte;
-
-      if (!(isxdigit (tmp [0]) && isxdigit (tmp [1])))
-        break;
-
-      byte = (u_char) (ACE::hex2byte (tmp [0]) << 4);
-      byte |= ACE::hex2byte (tmp [1]);
-
-      buffer [len++] = byte;
-      tmp += 2;
-    }
-
-  if (tmp [0] && !isspace (tmp [0]))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                        CORBA::Object::_nil ());
-    }
-
-  // Create deencapsulation stream ... then unmarshal objref from that
-  // stream.
-
-  int byte_order = *(mb.rd_ptr ());
-  mb.rd_ptr (1);
-  mb.wr_ptr (len);
-  TAO_InputCDR stream (&mb, byte_order, this->orb_core_);
-
-  CORBA::Object_ptr objref = CORBA::Object::_nil ();
-  stream >> objref;
-
-  return objref;
-}
-
-CORBA::Object_ptr
-CORBA_ORB::file_string_to_object (const char* filename,
-                                  CORBA::Environment& ACE_TRY_ENV)
-{
-  FILE* file = ACE_OS::fopen (filename, "r");
-
-  if (file == 0)
-    return CORBA::Object::_nil ();
-
-  ACE_Read_Buffer reader (file, 1);
-
-  char* string = reader.read ();
-
-  if (string == 0)
-    return CORBA::Object::_nil ();
-
-  CORBA::Object_ptr object = CORBA::Object::_nil ();
-  ACE_TRY
-    {
-      object = this->string_to_object (string, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      reader.alloc ()->free (string);
-    }
-  ACE_CATCHANY
-    {
-      reader.alloc ()->free (string);
-      ACE_RETHROW;
-    }
-  ACE_ENDTRY;
-
-  return object;
-}
-
-// Convert an URL style IOR in an object
-
-CORBA::Object_ptr
-CORBA_ORB::url_ior_string_to_object (const char* str,
-                                     CORBA::Environment& ACE_TRY_ENV)
-{
-  CORBA::Object_ptr obj = CORBA::Object::_nil ();
-
-  TAO_MProfile mprofile;
-  // It is safe to declare this on the stack since the contents of
-  // mprofile get copied.  No memory is allocated for profile storage
-  // here.  The Connector Registry will determine the exact number
-  // of profiles and tell the MProfile object to allocate enough memory
-  // to hold them all.
-
-  int retv =
-    this->orb_core_->connector_registry ()->make_mprofile (str,
-                                                           mprofile,
-                                                           ACE_TRY_ENV);
-
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());   // Return nil.
-
-  if (retv != 0)
-    {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (
-        CORBA_SystemException::_tao_minor_code (
-          TAO_NULL_POINTER_MINOR_CODE,
-          0),
-        CORBA::COMPLETED_NO),
-        CORBA::Object::_nil ());
-    }
-
-  // Now make the TAO_Stub.
-  TAO_Stub *data = 0;
-  ACE_NEW_THROW_EX (data,
-                    TAO_Stub ((char *) 0, mprofile, this->orb_core_),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  // Figure out if the servant is collocated.
-  TAO_ServantBase *servant = 0;
-  TAO_SERVANT_LOCATION servant_location =
-    this->_get_collocated_servant (data,
-                                   servant);
-
-  int collocated = 0;
-  if (servant_location != TAO_SERVANT_NOT_FOUND)
-    collocated = 1;
-
-  // Create the CORBA level proxy.  This will increase the ref_count
-  // on data by one
-  ACE_NEW_THROW_EX (obj,
-                    CORBA_Object (data,
-                                  servant,
-                                  collocated),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  return obj;
-}
-
-// ****************************************************************
-
-void
-CORBA_ORB::_optimize_collocation_objects (CORBA::Boolean opt)
-{
-  this->orb_core_->optimize_collocation_objects (opt);
-}
-
-CORBA::Boolean
-CORBA_ORB::_optimize_collocation_objects (void) const
-{
-  return this->orb_core_->optimize_collocation_objects ();
-}
-
-TAO_SERVANT_LOCATION
-CORBA_ORB::_get_collocated_servant (TAO_Stub *sobj,
-                                    TAO_ServantBase *&servant)
-{
-  if (sobj == 0 || !this->_optimize_collocation_objects ())
-    return TAO_SERVANT_NOT_FOUND;
-
-  // @@ What about forwarding.  Which this approach we are never forwarded
-  //    when we use collocation!
-
-  const TAO_MProfile &mprofile = sobj->get_base_profiles ();
-
-  if (this->orb_core_->use_global_collocation ())
-    {
-      // @@ Ossama: maybe we need another lock for the table, to
-      //    reduce contention on the Static_Object_Lock below, if so
-      //    then we need to use that lock in the ORB_init() function.
-
-      ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard,
-                                *ACE_Static_Object_Lock::instance (), TAO_SERVANT_NOT_FOUND));
-
-      TAO_ORB_Table *table = TAO_ORB_Table::instance ();
-      TAO_ORB_Table::Iterator end = table->end ();
-      for (TAO_ORB_Table::Iterator i = table->begin ();
-           i != end;
-           ++i)
-        {
-          TAO_SERVANT_LOCATION servant_location =
-            this->_find_collocated_servant (sobj,
-                                            (*i).int_id_,
-                                            servant,
-                                            mprofile);
-          if (servant_location != TAO_SERVANT_NOT_FOUND)
-            return servant_location;
-        }
-
-      // If we don't find one by this point, we return 0.
-      return TAO_SERVANT_NOT_FOUND;
-    }
-  else
-    {
-      return this->_find_collocated_servant (sobj,
-                                             this->orb_core_,
-                                             servant,
-                                             mprofile);
-    }
-}
-
-TAO_SERVANT_LOCATION
-CORBA_ORB::_find_collocated_servant (TAO_Stub *sobj,
-                                     TAO_ORB_Core *orb_core,
-                                     TAO_ServantBase *&servant,
-                                     const TAO_MProfile &mprofile)
-{
-  if (!orb_core->is_collocated (mprofile))
-    return TAO_SERVANT_NOT_FOUND;
-
-  TAO_Object_Adapter *oa = orb_core->object_adapter ();
-
-  for (TAO_PHandle j = 0;
-       j != mprofile.profile_count ();
-       ++j)
-    {
-      const TAO_Profile *profile = mprofile.get_profile (j);
-      TAO_ObjectKey_var objkey = profile->_key ();
-
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
-        {
-          TAO_SERVANT_LOCATION servant_location =
-            oa->find_servant (objkey.in (),
-                              servant,
-                              ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          if (servant_location != TAO_SERVANT_NOT_FOUND)
-            {
-              // Found collocated object.  Perhaps we can get around
-              // by simply setting the servant_orb, but let get this
-              // to work first.
-
-              // There could only be one ORB which is us.
-              sobj->servant_orb (CORBA::ORB::_duplicate (orb_core->orb ()));
-
-              return servant_location;
-            }
-        }
-      ACE_CATCHANY
-        {
-          // Ignore the exception and continue with the next one.
-        }
-      ACE_ENDTRY;
-    }
-
-  return TAO_SERVANT_NOT_FOUND;
-}
-
-// ****************************************************************
-
-// Add a mapping ObjectID->IOR to the table.
-int
-CORBA_ORB::_tao_add_to_IOR_table (const ACE_CString &object_id,
-                                  CORBA::Object_ptr obj)
-{
-  if (CORBA::is_nil (obj))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "TAO (%P|%t): Cannot add nil object to table <%s>\n",
-                       object_id.c_str ()),
-                      -1);
-
-  CORBA::String_var string =
-    this->object_to_string (obj);
-
-  if (string.in () == 0 || string[0u] == '\0')
-    return -1;
-
-  ACE_CString ior (string.in ());
-
-  if (this->lookup_table_.add_ior (object_id, ior) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "TAO (%P|%t): Unable to add IOR to table <%s>\n",
-                       object_id.c_str ()),
-                      -1);
-
-  return 0;
-}
-
-// Find an IOR in the table for the given ObjectID.
-int
-CORBA_ORB::_tao_find_in_IOR_table (const ACE_CString &object_id,
-                                   CORBA::Object_ptr &obj)
-{
-  // @@ This debugging output should *NOT* be used since the
-  //    object key string is not null terminated, nor can it
-  //    be null terminated without copying.  No copying should
-  //    be done since performance is somewhat important here.
-  //    So, just remove the debugging output entirely.
-  //
-  //   if (TAO_debug_level > 0)
-  //     ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t): lookup service ID <%s>\n",
-  //                 object_id.c_str ()));
-
-  ACE_CString ior;
-
-  if (this->lookup_table_.find_ior (object_id, ior) != 0)
-    {
-      // @@ This debugging output should *NOT* be used since the
-      //    object key string is not null terminated, nor can it
-      //    be null terminated without copying.  No copying should
-      //    be done since performance is somewhat important here.
-      //    So, just remove the debugging output entirely.
-      //
-      //       ACE_ERROR_RETURN ((LM_ERROR,
-      //                          "TAO (%P|%t) cannot find IOR for <%s>\n",
-      //                          object_id.c_str ()),
-      //                         -1);
-      return -1;
-    }
-
-  obj = this->string_to_object (ior.c_str ());
-
-  return 0;
-}
-
-// *************************************************************
-// Inline operators for TAO_opaque encoding and decoding
-// *************************************************************
-
-CORBA::Boolean
-operator<< (TAO_OutputCDR& cdr, const TAO_opaque& x)
-{
-  CORBA::ULong length = x.length ();
-  cdr.write_ulong (length);
-#if !defined (TAO_NO_COPY_OCTET_SEQUENCES)
-  cdr.write_octet_array (x.get_buffer (), length);
-#else
-  if (x.mb () == 0)
-    cdr.write_octet_array (x.get_buffer (), length);
-  else
-    cdr.write_octet_array_mb (x.mb ());
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
-  return cdr.good_bit ();
-}
-
-CORBA::Boolean
-operator>>(TAO_InputCDR& cdr, TAO_opaque& x)
-{
-  CORBA::ULong length;
-  cdr.read_ulong (length);
-#if !defined (TAO_NO_COPY_OCTET_SEQUENCES)
-  x.length (length);
-  cdr.read_octet_array (x.get_buffer (), length);
-#else
-  x.replace (length, cdr.start ());
-  x.mb ()->wr_ptr (x.mb ()->rd_ptr () + length);
-  cdr.skip_bytes (length);
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
-  return cdr.good_bit ();
-}
-
-// *************************************************************
-// Valuetype factory operations
-// *************************************************************
-
-#ifdef TAO_HAS_VALUETYPE
-
-CORBA::ValueFactory_ptr
-CORBA_ORB::register_value_factory (
-                            const char *repository_id,
-                            CORBA::ValueFactory_ptr factory,
-                            CORBA_Environment &ACE_TRY_ENV)
-{
-// %! guard, and ACE_Null_Mutex in the map
-// do _add_ref here not in map->rebind
-
-  if (valuetype_factory_map_ == 0)
-    {
-      // currently the ValueFactory_Map is a singleton and not per ORB
-      // as in the OMG specs
-      valuetype_factory_map_ = TAO_VALUEFACTORY_MAP::instance ();
-      if (valuetype_factory_map_ == 0)
-        ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-    }
-
-  int result = valuetype_factory_map_->rebind (repository_id, factory);
-  if (result == -1)
-    {
-      // Error on bind.
-      ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-    }
-  if (result == 1)
-    {
-      return factory;    // previous factory was found
-    }
-  return 0;
-}
-
-void
-CORBA_ORB::unregister_value_factory (const char * /* repository_id */,
-                                     CORBA_Environment &)
-{
-  ACE_ERROR((LM_ERROR, "(%N:%l) function not implemented\n"));
-  // %! TODO
-}
-
-CORBA::ValueFactory_ptr
-CORBA_ORB::lookup_value_factory (const char *repository_id,
-                                 CORBA_Environment &)
-{
-// %! guard
-// do _add_ref here not in map->find
-  if (valuetype_factory_map_)
-    {
-      CORBA::ValueFactory_ptr factory;
-      int result = valuetype_factory_map_->find (repository_id, factory);
-      if (result == -1)
-        factory = 0;  // %! raise exception !
-      return factory;
-    }
-  else
-    {
-      return 0; // %! raise exception !
-    }
-}
-
-#endif /* TAO_HAS_VALUETYPE */
-
-
-// ****************************************************************
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#if !defined (TAO_NO_COPY_OCTET_SEQUENCES)
-template class TAO_Unbounded_Sequence<CORBA::Octet>;
-#endif /* defined (TAO_NO_COPY_OCTET_SEQUENCES) */
-
-template class ACE_Dynamic_Service<TAO_Server_Strategy_Factory>;
-template class ACE_Dynamic_Service<TAO_Client_Strategy_Factory>;
-template class ACE_Guard<TAO_Cached_Connector_Lock>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#if !defined (TAO_NO_COPY_OCTET_SEQUENCES)
-#pragma instantiate TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* defined (TAO_NO_COPY_OCTET_SEQUENCES) */
-
-#pragma instantiate ACE_Dynamic_Service<TAO_Server_Strategy_Factory>
-#pragma instantiate ACE_Dynamic_Service<TAO_Client_Strategy_Factory>
-#pragma instantiate ACE_Guard<TAO_Cached_Connector_Lock>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
deleted file mode 100644
index 8772c308e5a..00000000000
--- a/TAO/tao/ORB.h
+++ /dev/null
@@ -1,834 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    ORB.h
-//
-// = DESCRIPTION
-//     Header file for CORBA's <ORB> type and type.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc. and Douglas C. Schmidt.
-//
-// ============================================================================
-
-#ifndef TAO_ORB_H
-#define TAO_ORB_H
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Exception.h"
-#include "tao/IOR_LookupTable.h"
-#include "tao/Services.h"
-#include "tao/IORManipulation.h"
-
-// IRIX needs this for the throw specs
-#include "tao/PolicyC.h"
-
-typedef enum
-{
-  TAO_SERVICEID_NAMESERVICE,
-  TAO_SERVICEID_TRADINGSERVICE
-} TAO_Service_ID;
-
-
-// @@ NW: Disable messing with the alignment for now.
-// For some reason, PC compilers don't implement "natural" alignment,
-// but only use fixed alignment policies.  The following #pragmas
-// configure fixed one-byte alignment policy, since some fixed policy
-// needs to apply throughout an ORB.
-
-#if defined (_MSC_VER)
-//# pragma  pack (push, 1)          // VC++, stack 1-byte alignment policy
-# ifdef   _DEBUG                  // convert from VC++ convention ...
-#   define  DEBUG           // ... to normal convention
-# endif
-#elif defined (__BORLANDC__)
-# pragma option -a                // BC++, use 1 byte alignment
-#endif
-
-// = Forward declarations.
-class TAO_MProfile;
-class TAO_POA_Manager;
-class TAO_POA_Policies;
-struct TAO_Dispatch_Context;
-class TAO_Operation_Table;
-class TAO_Client_Strategy_Factory;
-class TAO_Server_Strategy_Factory;
-class TAO_ORB_Parameters;
-class TAO_InputCDR;
-class TAO_OutputCDR;
-class CORBA_ORB_InconsistentTypeCode;
-class TAO_ServantBase;
-class TAO_Stub;
-
-#ifdef TAO_HAS_VALUETYPE
-class TAO_ValueFactory_Map;
-#endif /* TAO_HAS_VALUETYPE */
-
-typedef CORBA_ORB_InconsistentTypeCode InconsistentTypeCode;
-typedef CORBA_ORB_InconsistentTypeCode *InconsistentTypeCode_ptr;
-
-class TAO_Export CORBA_String_var
-{
-  // = TITLE
-  //   CORBA_String var class. Provides automatic deallocation of storage
-  //   for the string once it goes out of scope.
-public:
-  CORBA_String_var (void);
-  // default constructor.
-
-  CORBA_String_var (char *p);
-  // constructor, owns p.
-
-  CORBA_String_var (const char *p);
-  // constructor. Makes a copy of p.
-
-  CORBA_String_var (const CORBA_String_var &s);
-  // copy constructor.
-
-  ~CORBA_String_var (void);
-  // destructor.
-
-  CORBA_String_var &operator= (char *p);
-  // assignment operator.
-
-  CORBA_String_var &operator= (const char *p);
-  // assignment to a const char*.  Makes a copy.
-
-  CORBA_String_var &operator= (const CORBA_String_var &s);
-  // assignment operator.
-
-  operator char *();
-  // access and modify.
-
-  operator const char *() const;
-  // only read privileges.
-
-  char &operator[] (CORBA::ULong slot);
-  // allows access and modification using an slot.
-
-  char operator[] (CORBA::ULong slot) const;
-  // allows only accessing thru an slot.
-
-    // = in, out, out, and _retn operations.
-    // ORBOS/97-05-15, Appendix C.2
-
-  const char *in (void) const;
-  // for in parameter.
-
-  char *&inout (void);
-  // for inout parameter.
-
-  char *&out (void);
-  // for out parameter.
-
-  char *_retn (void);
-  // for string of return type.
-
-private:
-  char *ptr_;
-  // instance.
-};
-
-class TAO_Export CORBA_String_out
-{
-  // = TITLE
-  //   CORBA_String_out
-  //
-  // = DESCRIPTION
-  //   To support the memory management for "out" parameter passing
-  //   mode.  ORBOS/97-05-15, Appendix C.2 defines a CORBA_String_out class
-public:
-  // = operations.
-
-  CORBA_String_out (char *&p);
-  // Construction from a reference to a string.
-
-  CORBA_String_out (CORBA_String_var &p);
-  // Construction from a var.
-
-  CORBA_String_out (const CORBA_String_out &s);
-  // Copy constructor.
-
-  CORBA_String_out &operator= (const CORBA_String_out &s);
-  // Assignment from a string_out.
-
-  CORBA_String_out &operator= (char *p);
-  // Assignment from a string.
-
-  operator char *&();
-  // Cast.
-
-  char *&ptr (void);
-  // Return underlying instance.
-
-private:
-  char *&ptr_;
-  // Instance.
-
-  // assignment from _var disallowed
-  void operator= (const CORBA_String_var &);
-};
-
-// ****************************************************************
-
-class TAO_Export CORBA_WString_var
-{
-  // = TITLE
-  //   CORBA_WString var class. Provides automatic deallocation of
-  //   storage for wide strings
-  //
-public:
-  CORBA_WString_var (void);
-  // default constructor.
-
-  CORBA_WString_var (CORBA::WChar *p);
-  // constructor, owns p.
-
-  CORBA_WString_var (const CORBA::WChar *p);
-  // constructor. Makes a copy of p.
-
-  CORBA_WString_var (const CORBA_WString_var &s);
-  // copy constructor.
-
-  ~CORBA_WString_var (void);
-  // destructor.
-
-  CORBA_WString_var &operator= (CORBA::WChar *p);
-  // assignment operator.
-
-  CORBA_WString_var &operator= (const CORBA::WChar *p);
-  // assignment to a const char*.  Makes a copy.
-
-  CORBA_WString_var &operator= (const CORBA_WString_var &s);
-  // assignment operator.
-
-  operator CORBA::WChar *();
-  // access and modify.
-
-  operator const CORBA::WChar *() const;
-  // only read privileges.
-
-  CORBA::WChar &operator[] (CORBA::ULong slot);
-  // allows access and modification using an slot.
-
-  CORBA::WChar operator[] (CORBA::ULong slot) const;
-  // allows only accessing thru an slot.
-
-    // = in, out, out, and _retn operations.
-    // ORBOS/97-05-15, Appendix C.2
-
-  const CORBA::WChar *in (void) const;
-  // for in parameter.
-
-  CORBA::WChar *&inout (void);
-  // for inout parameter.
-
-  CORBA::WChar *&out (void);
-  // for out parameter.
-
-  CORBA::WChar *_retn (void);
-  // for string of return type.
-
-private:
-  CORBA::WChar *ptr_;
-  // instance.
-};
-
-class TAO_Export CORBA_WString_out
-{
-  // = TITLE
-  //   CORBA_WString_out
-  //
-  // = DESCRIPTION
-  //   To support the memory management for "out" parameter passing
-  //   mode.  ORBOS/97-05-15, Appendix C.2 defines a CORBA_WString_out
-  //   class
-  //
-public:
-  // = operations.
-
-  CORBA_WString_out (CORBA::WChar *&p);
-  // Construction from a reference to a string.
-
-  CORBA_WString_out (CORBA_WString_var &p);
-  // Construction from a var.
-
-  CORBA_WString_out (const CORBA_WString_out &s);
-  // Copy constructor.
-
-  CORBA_WString_out &operator= (const CORBA_WString_out &s);
-  // Assignment from a string_out.
-
-  CORBA_WString_out &operator= (CORBA::WChar *p);
-  // Assignment from a string.
-
-  operator CORBA::WChar *&();
-  // Cast.
-
-  CORBA::WChar *&ptr (void);
-  // Return underlying instance.
-
-private:
-  CORBA::WChar *&ptr_;
-  // Instance.
-
-  // assignment from _var disallowed
-  void operator= (const CORBA_WString_var &);
-};
-
-// ****************************************************************
-
-class TAO_Export CORBA_ORB
-{
-  // = TITLE
-  //   ORB pseudo-objref.
-  //
-  // = DESCRIPTION
-  //
-  //   The "ORB" pseudo-object is used in bootstrapping, such as to
-  //   create object references from strings.  This class is intended
-  //   to be inherited by others, which will provide some more of the
-  //   CORBA support.  Implementations of this "CORBA::ORB" class must
-  //   know how to create stringify/destringify their objrefs, as well
-  //   as how to marshal and unmarshal them.
-  //
-public:
-
-  // ORB_Core has special privileges
-  friend class TAO_ORB_Core;
-  friend TAO_Export TAO_ORB_Core *TAO_ORB_Core_instance (void);
-
-  class TAO_Export InvalidName : public CORBA_UserException
-  {
-  public:
-    InvalidName (void);
-    InvalidName (const InvalidName &);
-    ~InvalidName (void);
-    InvalidName &operator= (const InvalidName &);
-
-    virtual void _raise (void);
-    static InvalidName* _narrow (CORBA_Exception *ex);
-    // = TAO extension
-    static CORBA::Exception *_alloc (void);
-  };
-  static CORBA::TypeCode_ptr _tc_InvalidName;
-
-  typedef char *ObjectId;
-  typedef CORBA::String_var ObjectId_var;
-  typedef CORBA::String_out ObjectId_out;
-  static CORBA::TypeCode_ptr _tc_ObjectId;
-
-  typedef CORBA_ORB_ObjectIdList ObjectIdList;
-  typedef CORBA_ORB_ObjectIdList_var ObjectIdList_var;
-  typedef CORBA_ORB_ObjectIdList_out ObjectIdList_out;
-  typedef CORBA_ORB_ObjectIdList *ObjectIdList_ptr;
-  static CORBA::TypeCode_ptr _tc_ObjectIdList;
-
-  static CORBA::ORB_ptr _duplicate (CORBA::ORB_ptr orb);
-  // Return a duplicate of <{orb}>.  When work with this duplicate is
-  // complete, it should be freed up using <CORBA::release()>.
-
-  static CORBA::ORB_ptr _nil (void);
-  // Returns a pointer to a nil ORB, i.e., an non-existent ORB.  This
-  // can be used for initialization or in comparisons.
-
-  virtual CORBA::Object_ptr string_to_object (
-                                              const char *str,
-                                              CORBA_Environment &ACE_TRY_ENV =
-                                              TAO_default_environment ());
-  // Turn a string-ified object reference back into an object pointer.
-  // Typically these strings are created using <object_to_string()>,
-  // but not necessarily locally.
-
-  virtual CORBA::String object_to_string (
-                                          CORBA::Object_ptr obj,
-                                          CORBA_Environment &ACE_TRY_ENV =
-                                          TAO_default_environment ());
-  // Turn an object reference into a string.  Each type of ORB,
-  // e.g. an IIOP ORB, must implement this.  This can be used by
-  // servers to publish their whereabouts to clients.  The output of
-  // this is typically eventually given to <string_to_object()> as an
-  // argument.
-
-
-#ifdef TAO_HAS_VALUETYPE
-  // Value factory operations  (CORBA 2.3 ptc/98-10-05 Ch. 4.2 p.4-7)
-  CORBA::ValueFactory_ptr register_value_factory (
-                                                  const char *repository_id,
-                                                  CORBA::ValueFactory_ptr factory,
-                                                  CORBA_Environment &ACE_TRY_ENV =
-                                                  TAO_default_environment () );
-  void unregister_value_factory (const char * repository_id,
-                                 CORBA_Environment &ACE_TRY_ENV =
-                                 TAO_default_environment () );
-  CORBA::ValueFactory_ptr lookup_value_factory (const char *repository_id,
-                                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () );
-#endif /* TAO_HAS_VALUETYPE */
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  // Typedefs for CORBA_ORB_RequestSeq,
-  // which is an argument of send_multiple_requests_*().
-  // See Request.{h,i,cpp} for definitions.
-  typedef CORBA_ORB_RequestSeq RequestSeq;
-  typedef CORBA_ORB_RequestSeq_ptr RequestSeq_ptr;
-  typedef CORBA_ORB_RequestSeq_var RequestSeq_var;
-  typedef CORBA_ORB_RequestSeq_out RequestSeq_out;
-
-  void create_list (CORBA::Long count,
-                    CORBA::NVList_ptr &new_list,
-                    CORBA_Environment &ACE_TRY_ENV =
-                    TAO_default_environment ());
-
-  // The following are not implemented and just throw
-  // CORBA::NO_IMPLEMENT.
-
-  void create_named_value (CORBA::NamedValue_ptr &nmval,
-                           CORBA_Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
-
-  void create_exception_list (CORBA::ExceptionList_ptr &exclist,
-                              CORBA_Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-
-  void create_context_list (CORBA::ContextList_ptr &ctxtlist,
-                            CORBA_Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-
-  void get_default_context (CORBA::Context_ptr &ctx,
-                            CORBA_Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-
-  void create_environment (CORBA::Environment_ptr &new_env,
-                           CORBA_Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
-
-  CORBA::Boolean get_service_information (CORBA::ServiceType service_type,
-                                          CORBA::ServiceInformation_out service_information,
-                                          CORBA::Environment &ACE_TRY_ENV =
-                                          TAO_default_environment ());
-
-  void send_multiple_requests_oneway (const CORBA_ORB_RequestSeq req,
-                                      CORBA_Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ());
-
-  void send_multiple_requests_deferred (const CORBA_ORB_RequestSeq req,
-                                        CORBA_Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ());
-
-  void get_next_response (CORBA_Request_ptr &req,
-                          CORBA_Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
-
-  CORBA::Boolean poll_next_response (CORBA_Environment &ACE_TRY_ENV =
-                                     TAO_default_environment ());
-
-  CORBA::Boolean work_pending (void);
-  // Returns an indication of whether the ORB needs to perform some
-  // work.
-
-  int perform_work (const ACE_Time_Value & = ACE_Time_Value::zero);
-  // This operation performs an implementation-defined unit of
-  // work. Note that the default behavior is not to block; this
-  // behavior can be modified by passing an appropriate
-  // <ACE_Time_Value>.
-
-  // Typecode for the above exception.
-  static CORBA::TypeCode_ptr _tc_InconsistentTypeCode;
-
-  // Dynamic Any factory functions.
-  // @@EXC@@ Add the ACE_THROW_SPEC for these functions...
-
-  CORBA_DynAny_ptr       create_dyn_any       (const CORBA_Any& any,
-                                               CORBA::Environment &ACE_TRY_ENV);
-
-  CORBA_DynAny_ptr       create_basic_dyn_any (CORBA_TypeCode_ptr tc,
-                                               CORBA::Environment &ACE_TRY_ENV);
-
-  CORBA_DynStruct_ptr    create_dyn_struct    (CORBA_TypeCode_ptr tc,
-                                               CORBA::Environment &ACE_TRY_ENV);
-
-  CORBA_DynSequence_ptr  create_dyn_sequence  (CORBA_TypeCode_ptr tc,
-                                               CORBA::Environment &ACE_TRY_ENV);
-
-  CORBA_DynArray_ptr     create_dyn_array     (CORBA_TypeCode_ptr tc,
-                                               CORBA::Environment &ACE_TRY_ENV);
-
-  CORBA_DynUnion_ptr     create_dyn_union     (CORBA_TypeCode_ptr tc,
-                                               CORBA::Environment &ACE_TRY_ENV);
-
-  CORBA_DynEnum_ptr      create_dyn_enum      (CORBA_TypeCode_ptr tc,
-                                               CORBA::Environment &ACE_TRY_ENV);
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  int run (void);
-  int run (ACE_Time_Value &tv);
-  int run (ACE_Time_Value *tv);
-  // Instructs the ORB to initialize itself and run its event loop in
-  // the current thread, not returning until the ORB has shut down.
-  // If an error occurs during initialization or a run-time this
-  // method will return -1.  If <tv> is non-NULL, then if no requests
-  // arrive at this thread before the timeout elapses we return to the
-  // caller with a value of 0 (this allows timeouts).  Otherwise, if
-  // we've returned since we've been asked to shut down the value of 1
-  // is returned.
-
-  void shutdown (CORBA::Boolean wait_for_completion = 0,
-                 CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // This operation instructs the ORB to shut down. Shutting down the
-  // ORB causes all Object Adapters to be shut down. If
-  // <wait_for_completion> parameter is TRUE, this operation blocks
-  // until all ORB processing (including request processing and object
-  // deactivation or other operations associated with object adapters)
-  // has completed.
-
-  // @@EXC@@ Add the ACE_THROW_SPEC for these two functions
-
-  CORBA_Object_ptr resolve_initial_references (const char *name,
-                                               CORBA_Environment &ACE_TRY_ENV =
-                                               TAO_default_environment ());
-
-  CORBA_Object_ptr resolve_initial_references (const char *name,
-                                               ACE_Time_Value *timeout,
-                                               CORBA_Environment &ACE_TRY_ENV =
-                                               TAO_default_environment ());
-  // This method acts as a mini-bootstrapping Naming Service, which is
-  // provided by the ORB for certain well-known object references.  TAO
-  // supports the "NameService", "TradingService", "RootPOA", "ImplRepo",
-  // and "POACurrent" via this method.  The <timeout> value bounds the
-  // amount of time the ORB blocks waiting to resolve the service.
-  // This is most useful for bootstrapping remote services, such as
-  // the "NameService" or "TradingService", that are commonly resolved
-  // via multicast.  By default, the value is 0, which means "use the
-  // <TAO_DEFAULT_SERVICE_RESOLUTION_TIMEOUT> timeout period".  Note
-  // that by using a default value for the <timeout> parameter, TAO
-  // will remains compliant with the CORBA
-  // <resolve_initial_references> specification.
-
-  // Unimplemented function - throws CORBA::NO_IMPLEMENT.
-  CORBA_ORB_ObjectIdList_ptr list_initial_services (CORBA_Environment &ACE_TRY_ENV =
-                                                    TAO_default_environment ());
-
-#if defined(TAO_HAS_CORBA_MESSAGING)
-  CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                   const CORBA::Any& val,
-                                   CORBA_Environment &ACE_TRY_ENV =
-                                       TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError));
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
-  // ----------------------------------------------------------------
-  // = TAO-specific extensions to the CORBA specification.
-  // ----------------------------------------------------------------
-
-  virtual TAO_SERVANT_LOCATION _get_collocated_servant (TAO_Stub *p,
-                                                        TAO_ServantBase *&servant);
-  // Return the object pointer of an collocated object it there is
-  // one, otherwise, return 0.  Each type of ORB, e. g., IIOP ORB,
-  // must implement this and determine what is a collocated object
-  // based on information provided in the TAO_Stub.
-
-  virtual int _tao_add_to_IOR_table (const ACE_CString &object_id,
-                                     CORBA::Object_ptr obj);
-  // Add a mapping ObjectID->IOR to the table.
-
-  virtual int _tao_find_in_IOR_table (const ACE_CString &object_id,
-                                      CORBA::Object_ptr &obj);
-  // Find the given ObjectID in the table.
-
-  CORBA_Object_ptr resolve_root_poa (CORBA_Environment &ACE_TRY_ENV,
-                                     const char *adapter_name = TAO_DEFAULT_ROOTPOA_NAME,
-                                     TAO_POA_Manager *poa_manager = 0,
-                                     const TAO_POA_Policies *policies = 0);
-  // Resolve the POA.
-
-  TAO_Stub *create_stub_object (const TAO_ObjectKey &key,
-                                const char *type_id,
-                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // Makes sure that the ORB is open and then creates an IIOP object
-  // based on the endpoint.
-
-  CORBA_Object_ptr key_to_object (const TAO_ObjectKey &key,
-                                  const char *type_id,
-                                  TAO_ServantBase *servant = 0,
-                                  CORBA::Boolean collocated = 1,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // Convert key into an object reference.  Return Object_ptr as out
-  // parameter.  Errors will come through the environment.
-  //
-  // Object IDs are assigned and used by servers to identify objects.
-  //
-  // Type IDs are repository IDs, assigned as part of OMG-IDL
-  // interface definition to identify specific interfaces and their
-  // relationships to other OMG-IDL interfaces.  It's OK to provide a
-  // null type ID.  Providing a null object key will result in an
-  // INV_OBJREF exception.
-  //
-  // <servant> and <collocated> are used to created collocated object
-  // references.  All object references created by this function should
-  // be collocated object.
-  //
-  // Clients which invoke operations using one of these references
-  // when the server is not active (or after the last reference to the
-  // POA is released) will normally see an OBJECT_NOT_EXIST exception
-  // reported by the ORB.  If the POA is a "Named POA" the client's
-  // ORB will not normally return OBJECT_NOT_EXIST unless the POA
-  // reports that fault.
-
-  int open (void);
-  // Set up the ORB Core's acceptor to listen on the
-  // previously-specified port for requests.  Returns -1 on failure,
-  // else 0.
-
-  static void init_orb_globals (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // Initialize the ORB globals correctly, i.e., only when they
-  // haven't been initialized yet.
-
-  static CORBA::Boolean orb_free_resources (void);
-  // Indicates if we have reached a point where all ORB owned
-  // resources will be deallocated.
-
-  // The function used by tao to handle the "unexpected" exceptions,
-  // It raises CORBA::UNKNOWN.
-  static void _tao_unexpected_exception (void);
-
-  // Reference counting...
-  virtual CORBA::ULong _incr_refcnt (void);
-  virtual CORBA::ULong _decr_refcnt (void);
-
-  void should_shutdown (int value);
-  // Set the shutdown flag to <value>.
-
-  int should_shutdown (void);
-  // Get the shutdown flag value
-
-  void _use_omg_ior_format (CORBA::Boolean ior);
-  // Set the IOR flag.
-  CORBA::Boolean _use_omg_ior_format (void);
-  // Get the IOR flag.
-
-  void _optimize_collocation_objects (CORBA::Boolean opt);
-  // Set collocation optimization status.
-  CORBA::Boolean _optimize_collocation_objects (void) const;
-  // Get collocation optimization status.
-
-  TAO_ORB_Core *orb_core (void) const;
-  // Get the ORB core.
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_ORB_ptr _ptr_type;
-  typedef CORBA_ORB_var _var_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
-protected:
-  // We must be created via the <ORB_init> call.
-  CORBA_ORB (TAO_ORB_Core *orb_core);
-  virtual ~CORBA_ORB (void);
-
-  TAO_SERVANT_LOCATION _find_collocated_servant (TAO_Stub *sobj,
-                                                 TAO_ORB_Core *orb_core,
-                                                 TAO_ServantBase *& servant,
-                                                 const TAO_MProfile &mprofile);
-  // Check if local servant exists for <mprofile> in <orb_core>.
-
-  CORBA_Object_ptr resolve_poa_current (CORBA_Environment &ACE_TRY_ENV);
-  // Resolve the POA current.
-
-  CORBA_Object_ptr resolve_policy_manager (CORBA::Environment&);
-  // Resolve the Policy Manager for this ORB.
-  CORBA_Object_ptr resolve_policy_current (CORBA::Environment&);
-  // Resolve the Policy Current for this thread.
-
-  CORBA_Object_ptr resolve_ior_manipulation (CORBA::Environment&);
-  // Resolve the IOR Manipulation reference for this ORB.
-
-  int run (ACE_Time_Value *tv,
-           int break_on_timeouts);
-  // Implements the run routine
-
-private:
-
-  CORBA_Object_ptr resolve_service (const char* service_name,
-                                    ACE_Time_Value *timeout,
-                                    CORBA::Environment& ACE_TRY_ENV);
-  // Resolve the service name.
-
-  CORBA_Object_ptr resolve_trading_service (ACE_Time_Value *timeout,
-                                            CORBA::Environment& ACE_TRY_ENV);
-  // Resolve the trading object reference.
-
-  CORBA_Object_ptr resolve_implrepo_service (ACE_Time_Value *timeout,
-                                             CORBA::Environment& ACE_TRY_ENV);
-  // Resolve the Implementation Repository object reference.
-
-  int multicast_query (char* &buf,
-                       const char *service_name,
-                       u_short port,
-                       ACE_Time_Value *timeout);
-
-  // returns and IOR string, the client is responsible for freeing
-  // memory!
-
-  CORBA_Object_ptr multicast_to_service (const char *service_name,
-                                         u_short port,
-                                         ACE_Time_Value *timeout,
-                                         CORBA::Environment& ACE_TRY_ENV);
-  // Resolve the reference of a service of type <name>.
-
-  CORBA::Object_ptr file_string_to_object (const char* filename,
-                                           CORBA::Environment &ACE_TRY_ENV);
-  // Read an IOR from a file and then parse it, returning the object
-  // reference.
-
-  CORBA::Object_ptr ior_string_to_object (const char* ior,
-                                          CORBA::Environment &ACE_TRY_ENV);
-  // Convert an OMG IOR into an object reference.
-
-  CORBA::Object_ptr url_ior_string_to_object (const char* ior,
-                                              CORBA::Environment &ACE_TRY_ENV);
-  // Convert an URL style IOR into an object reference.
-
-private:
-  ACE_SYNCH_MUTEX lock_;
-  // lock required for mutual exclusion between multiple threads.
-
-  u_int refcount_;
-  // Maintains a reference count of number of instantiations of the
-  // ORB.
-
-  u_int open_called_;
-  // Flag which denotes that the open method was called.
-
-  ACE_SYNCH_MUTEX open_lock_;
-  // Mutual exclusion for calling open.
-
-  ACE_Lock *shutdown_lock_;
-  // Pointer to our shutdown lock.
-
-  int should_shutdown_;
-  // Flag which denotes that the ORB should shut down and <run> should
-  // return.
-
-  CORBA_Object_ptr name_service_;
-  // If this is non-_nil(), then this is the object reference to our
-  // configured Naming Context.
-
-  CORBA_Object_ptr schedule_service_;
-  // If this is non-_nil(), then this is the object reference to our
-  // configured RtecScheduler::Scheduler.
-
-  CORBA_Object_ptr event_service_;
-  // If this is non-_nil(), then this is the object reference to our
-  // configured Event Channel.
-
-  CORBA_Object_ptr trading_service_;
-  // If this is non-_nil(), then this is the object reference to our
-  // configured Trading.
-
-  CORBA_Object_ptr implrepo_service_;
-  // If this is non-_nil(), then this is the object reference to our
-  // configured Implementation Repository.
-
-  static int orb_init_count_;
-  // Count of the number of times that <ORB_init> has been called.
-  // This must be protected by <ACE_Static_Object_Lock>.
-
-  TAO_ORB_Core *orb_core_;
-  // The ORB_Core that created us....
-
-#ifdef TAO_HAS_VALUETYPE
-  TAO_ValueFactory_Map *valuetype_factory_map_;
-  // If non-0 then this is the Factory for OBV unmarshaling
-#endif /* TAO_HAS_VALUETYPE */
-
-  TAO_IOR_LookupTable lookup_table_;
-  // Table of ObjectID->IOR mappings.
-
-  TAO_IOR_Manipulation_impl ior_manipulation_;
-  // object used for manipulation profiles in an object reference, that
-  // is an IOR.
-
-  CORBA::Boolean use_omg_ior_format_;
-  // Decides whether to use the URL notation or to use IOR notation.
-
-  // = NON-PROVIDED METHODS
-  CORBA_ORB (const CORBA_ORB &);
-  CORBA_ORB &operator= (const CORBA_ORB &);
-};
-
-class TAO_Export CORBA_ORB_var
-{
-public:
-  CORBA_ORB_var (void); // default constructor
-  CORBA_ORB_var (CORBA::ORB_ptr);
-  CORBA_ORB_var (const CORBA_ORB_var &); // copy constructor
-  ~CORBA_ORB_var (void); // destructor
-
-  CORBA_ORB_var &operator= (CORBA::ORB_ptr);
-  CORBA_ORB_var &operator= (const CORBA_ORB_var &);
-  CORBA::ORB_ptr operator-> (void) const;
-
-  operator const CORBA::ORB_ptr &() const;
-  operator CORBA::ORB_ptr &();
-  // in, inout, out, _retn
-  CORBA::ORB_ptr in (void) const;
-  CORBA::ORB_ptr &inout (void);
-  CORBA::ORB_ptr &out (void);
-  CORBA::ORB_ptr _retn (void);
-  CORBA::ORB_ptr ptr (void) const;
-
-private:
-  CORBA::ORB_ptr ptr_;
-};
-
-class TAO_Export CORBA_ORB_out
-{
-public:
-  CORBA_ORB_out (CORBA::ORB_ptr &);
-  CORBA_ORB_out (CORBA_ORB_var &);
-  CORBA_ORB_out (CORBA_ORB_out &);
-  CORBA_ORB_out &operator= (CORBA_ORB_out &);
-  CORBA_ORB_out &operator= (const CORBA_ORB_var &);
-  CORBA_ORB_out &operator= (CORBA::ORB_ptr);
-  operator CORBA::ORB_ptr &();
-  CORBA::ORB_ptr &ptr (void);
-  CORBA::ORB_ptr operator-> (void);
-
-private:
-  CORBA::ORB_ptr &ptr_;
-};
-
-extern TAO_Export void
-operator<<= (CORBA::Any &, const CORBA::ORB::InvalidName &);
-extern TAO_Export void
-operator<<= (CORBA::Any &, CORBA::ORB::InvalidName*);
-extern TAO_Export CORBA::Boolean
-operator>>= (const CORBA::Any &, CORBA::ORB::InvalidName *&);
-extern TAO_Export CORBA::Boolean
-operator<< (TAO_OutputCDR &, const CORBA::ORB::InvalidName &);
-extern TAO_Export CORBA::Boolean
-operator>> (TAO_InputCDR &, CORBA::ORB::InvalidName &);
-
-#if defined (__ACE_INLINE__)
-# include "tao/ORB.i"
-#endif /* __ACE_INLINE__ */
-
-#if  defined (_MSC_VER)
-// @@ NW: Disable messing with alignment for now.
-// VC++, goes back to other padding rules
-//# pragma pack (pop)
-#endif /* _MSV_VER */
-
-#endif /* TAO_ORB_H */
diff --git a/TAO/tao/ORB.i b/TAO/tao/ORB.i
deleted file mode 100644
index 0b5baf8ecde..00000000000
--- a/TAO/tao/ORB.i
+++ /dev/null
@@ -1,503 +0,0 @@
-// -*- c++ -*-
-// $Id$
-
-// ----------------------------------------------------------------------
-// String_var type
-// ----------------------------------------------------------------------
-
-ACE_INLINE
-CORBA_String_var::CORBA_String_var (void)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_String_var::CORBA_String_var (const char *p)
-  : ptr_ (CORBA::string_dup (p))
-{
-}
-
-ACE_INLINE CORBA::Char &
-CORBA_String_var::operator[] (CORBA::ULong slot)
-{
-  // We need to verify bounds else raise some exception.
-  return this->ptr_[slot];
-}
-
-ACE_INLINE CORBA::Char
-CORBA_String_var::operator[] (CORBA::ULong slot) const
-{
-  // We need to verify bounds else raise some exception.
-  return this->ptr_[slot];
-}
-
-ACE_INLINE
-CORBA_String_var::operator char *()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_String_var::operator const char *() const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const char *
-CORBA_String_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE char *&
-CORBA_String_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE char *&
-CORBA_String_var::out (void)
-{
-  CORBA::string_free (this->ptr_);
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE char *
-CORBA_String_var::_retn (void)
-{
-  char *temp = this->ptr_;
-  this->ptr_ = 0;
-  return temp;
-}
-
-// ----------------------------------------------------
-//  String_out type
-// ----------------------------------------------------
-
-ACE_INLINE
-CORBA_String_out::CORBA_String_out (char *&s)
-  : ptr_ (s)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_String_out::CORBA_String_out (CORBA_String_var &s)
-  : ptr_ (s.out ())
-{
-}
-
-ACE_INLINE
-CORBA_String_out::CORBA_String_out (const CORBA_String_out &s)
-  : ptr_ (s.ptr_)
-{
-}
-
-ACE_INLINE CORBA_String_out &
-CORBA_String_out::operator= (const CORBA_String_out &s)
-{
-  this->ptr_ = s.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_String_out &
-CORBA_String_out::operator= (char *s)
-{
-  this->ptr_ = s;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_String_out::operator char *&()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE char *&
-CORBA_String_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-// ****************************************************************
-
-// ----------------------------------------------------------------------
-// String_var type
-// ----------------------------------------------------------------------
-
-ACE_INLINE
-CORBA_WString_var::CORBA_WString_var (void)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_WString_var::CORBA_WString_var (const CORBA::WChar *p)
-  : ptr_ (CORBA::wstring_dup (p))
-{
-}
-
-ACE_INLINE CORBA::WChar &
-CORBA_WString_var::operator[] (CORBA::ULong slot)
-{
-  // We need to verify bounds else raise some exception.
-  return this->ptr_[slot];
-}
-
-ACE_INLINE CORBA::WChar
-CORBA_WString_var::operator[] (CORBA::ULong slot) const
-{
-  // We need to verify bounds else raise some exception.
-  return this->ptr_[slot];
-}
-
-ACE_INLINE
-CORBA_WString_var::operator CORBA::WChar *()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_WString_var::operator const CORBA::WChar *() const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const CORBA::WChar *
-CORBA_WString_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::WChar *&
-CORBA_WString_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::WChar *&
-CORBA_WString_var::out (void)
-{
-  CORBA::wstring_free (this->ptr_);
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::WChar *
-CORBA_WString_var::_retn (void)
-{
-  CORBA::WChar *temp = this->ptr_;
-  this->ptr_ = 0;
-  return temp;
-}
-
-// ----------------------------------------------------
-//  String_out type
-// ----------------------------------------------------
-
-ACE_INLINE
-CORBA_WString_out::CORBA_WString_out (CORBA::WChar *&s)
-  : ptr_ (s)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_WString_out::CORBA_WString_out (CORBA_WString_var &s)
-  : ptr_ (s.out ())
-{
-}
-
-ACE_INLINE
-CORBA_WString_out::CORBA_WString_out (const CORBA_WString_out &s)
-  : ptr_ (s.ptr_)
-{
-}
-
-ACE_INLINE CORBA_WString_out &
-CORBA_WString_out::operator= (const CORBA_WString_out &s)
-{
-  this->ptr_ = s.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_WString_out &
-CORBA_WString_out::operator= (CORBA::WChar *s)
-{
-  this->ptr_ = s;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_WString_out::operator CORBA::WChar *&()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::WChar *&
-CORBA_WString_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-// ****************************************************************
-
-// ---------------------------------------------------------------------------
-//  ORB specific
-// ---------------------------------------------------------------------------
-
-ACE_INLINE void
-CORBA_ORB::should_shutdown (int value)
-{
-  ACE_GUARD (ACE_Lock, monitor, *this->shutdown_lock_);
-  this->should_shutdown_ = value;
-}
-
-ACE_INLINE int
-CORBA_ORB::should_shutdown (void)
-{
-  ACE_GUARD_RETURN (ACE_Lock, monitor, *this->shutdown_lock_, -1);
-  return this->should_shutdown_;
-}
-
-ACE_INLINE CORBA::ULong
-CORBA_ORB::_incr_refcnt (void)
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, lock_, 0);
-  return ++this->refcount_;
-}
-
-ACE_INLINE CORBA::ULong
-CORBA_ORB::_decr_refcnt (void)
-{
-  {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, 0);
-    this->refcount_--;
-    if (this->refcount_ != 0)
-      return this->refcount_;
-  }
-
-  delete this;
-  return 0;
-}
-
-ACE_INLINE CORBA::ORB_ptr
-CORBA_ORB::_duplicate (CORBA::ORB_ptr obj)
-{
-  if (obj)
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-// Null pointers represent nil objects.
-
-ACE_INLINE CORBA::ORB_ptr
-CORBA_ORB::_nil (void)
-{
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-CORBA_ORB::orb_free_resources (void)
-{
-  return !CORBA_ORB::orb_init_count_;
-}
-
-ACE_INLINE void
-CORBA_ORB::_use_omg_ior_format (CORBA::Boolean ior)
-{
-  this->use_omg_ior_format_ = ior;
-}
-
-ACE_INLINE CORBA::Boolean
-CORBA_ORB::_use_omg_ior_format (void)
-{
-  return this->use_omg_ior_format_;
-}
-
-ACE_INLINE TAO_ORB_Core *
-CORBA_ORB::orb_core (void) const
-{
-  return this->orb_core_;
-}
-
-// ************************************************************
-// These are in CORBA namespace
-// ************************************************************
-
-ACE_INLINE CORBA::Boolean
-CORBA::is_nil (CORBA::ORB_ptr obj)
-{
-  return obj == 0;
-}
-
-ACE_INLINE void
-CORBA::release (CORBA::ORB_ptr obj)
-{
-  if (obj)
-    obj->_decr_refcnt ();
-}
-
-// *************************************************************
-// Inline operations for class CORBA_ORB_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_ORB_var::CORBA_ORB_var (void) // default constructor
-  : ptr_ (CORBA_ORB::_nil ())
-{
-}
-
-ACE_INLINE
-CORBA_ORB_var::CORBA_ORB_var (CORBA::ORB_ptr p)
-        : ptr_ (p)
-{
-}
-
-ACE_INLINE CORBA::ORB_ptr
-CORBA_ORB_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_ORB_var::CORBA_ORB_var (const CORBA_ORB_var &p) // copy constructor
-  : ptr_ (CORBA_ORB::_duplicate (p.ptr ()))
-{
-}
-
-ACE_INLINE
-CORBA_ORB_var::~CORBA_ORB_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_ORB_var &
-CORBA_ORB_var::operator= (CORBA::ORB_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_ORB_var &
-CORBA_ORB_var::operator= (const CORBA_ORB_var &p)
-{
-  if (this != &p)
-    {
-      CORBA::release (this->ptr_);
-      this->ptr_ = CORBA_ORB::_duplicate (p.ptr ());
-    }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_ORB_var::operator const CORBA::ORB_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_ORB_var::operator CORBA::ORB_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ORB_ptr
-CORBA_ORB_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ORB_ptr
-CORBA_ORB_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ORB_ptr &
-CORBA_ORB_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ORB_ptr &
-CORBA_ORB_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_ORB::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ORB_ptr
-CORBA_ORB_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::ORB_ptr val = this->ptr_;
-  this->ptr_ = CORBA_ORB::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_ORB_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_ORB_out::CORBA_ORB_out (CORBA::ORB_ptr &p)
-        : ptr_ (p)
-{
-  this->ptr_ = CORBA_ORB::_nil ();
-}
-
-ACE_INLINE
-CORBA_ORB_out::CORBA_ORB_out (CORBA_ORB_var &p) // constructor from _var
-        : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_ORB::_nil ();
-}
-
-ACE_INLINE
-CORBA_ORB_out::CORBA_ORB_out (CORBA_ORB_out &p) // copy constructor
-        : ptr_ (p.ptr_)
-{}
-
-ACE_INLINE CORBA_ORB_out &
-CORBA_ORB_out::operator= (CORBA_ORB_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_ORB_out &
-CORBA_ORB_out::operator= (const CORBA_ORB_var &p)
-{
-  this->ptr_ = CORBA_ORB::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_ORB_out &
-CORBA_ORB_out::operator= (CORBA::ORB_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_ORB_out::operator CORBA::ORB_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ORB_ptr &
-CORBA_ORB_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ORB_ptr
-CORBA_ORB_out::operator-> (void)
-{
-  return this->ptr_;
-}
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
deleted file mode 100644
index ec6a9de1b0f..00000000000
--- a/TAO/tao/ORB_Core.cpp
+++ /dev/null
@@ -1,1928 +0,0 @@
-// $Id$
-
-#include "tao/ORB_Core.h"
-#include "tao/ORB.h"
-
-#include "ace/Env_Value_T.h"
-#include "ace/Arg_Shifter.h"
-
-#include "tao/TAO_Internal.h"
-#include "tao/default_client.h"
-#include "tao/default_server.h"
-#include "tao/default_resource.h"
-#include "tao/debug.h"
-#include "tao/IOR_LookupTable.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/ORB_Core.i"
-#endif /* ! __ACE_INLINE__ */
-
-#include "tao/Connector_Registry.h"
-#include "tao/Acceptor_Registry.h"
-
-#include "tao/POA.h"
-
-#include "ace/Object_Manager.h"
-#include "ace/Env_Value_T.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/Arg_Shifter.h"
-#include "ace/INET_Addr.h"
-
-#if defined(ACE_MVS)
-#include "ace/Codeset_IBM1047.h"
-#endif /* ACE_MVS */
-
-ACE_RCSID(tao, ORB_Core, "$Id$")
-
-// ****************************************************************
-
-CORBA::Environment &
-TAO_default_environment ()
-{
-  return *TAO_TSS_RESOURCES::instance ()->default_environment_;
-}
-
-// ****************************************************************
-
-TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
-  : connector_registry_ (0),
-    acceptor_registry_ (0),
-    protocol_factories_ (0),
-    root_poa_ (0),
-    orb_params_ (0),
-    orbid_ (ACE_OS::strdup (orbid?orbid:"")),
-    resource_factory_ (0),
-    resource_factory_from_service_config_ (0),
-    // @@ This is not needed since the default resource factory, fredk
-    //    is staticaly added to the service configurator.
-    client_factory_ (0),
-    client_factory_from_service_config_ (0),
-    // @@ This is not needed since the default client factory, fredk
-    //    is staticaly added to the service configurator.
-    server_factory_ (0),
-    server_factory_from_service_config_ (0),
-    // @@ This is not needed since the default server factory, fredk
-    //    is staticaly added to the service configurator.
-    opt_for_collocation_ (1),
-    use_global_collocation_ (1),
-    collocation_strategy_ (THRU_POA),
-    poa_current_ (0),
-    object_adapter_ (0),
-    tm_ (),
-    from_iso8859_ (0),
-    to_iso8859_ (0),
-    from_unicode_ (0),
-    to_unicode_ (0),
-    use_tss_resources_ (0),
-    leader_follower_ (this)
-{
-  ACE_NEW (this->poa_current_,
-           TAO_POA_Current);
-
-  // Make sure that the thread manager does not wait for threads
-  this->tm_.wait_on_exit (0);
-
-#if defined(ACE_MVS)
-  ACE_NEW (this->from_iso8859_, ACE_IBM1047_ISO8859);
-  ACE_NEW (this->to_iso8859_,   ACE_IBM1047_ISO8859);
-#endif /* ACE_MVS */
-}
-
-TAO_ORB_Core::~TAO_ORB_Core (void)
-{
-  // Allocated in init()
-  delete this->orb_params_;
-
-  ACE_OS::free (this->orbid_);
-
-  delete this->poa_current_;
-
-  delete this->object_adapter_;
-
-  delete this->from_iso8859_;
-  delete this->to_iso8859_;
-}
-
-int
-TAO_ORB_Core::add_to_ior_table (ACE_CString init_ref,
-                                TAO_IOR_LookupTable &table)
-{
-  int slot = init_ref.find ("=");
-  if (slot == ACE_CString::npos)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Unable to parse -ORBInitRef parameter\n"),
-                      -1);
-
-  ACE_CString object_id = init_ref.substr (0, slot);
-  ACE_CString ior = init_ref.substr (slot + 1);
-
-  // Add the objectID-IOR to the table and return the status.
-  return table.add_ior (object_id, ior);
-}
-
-int
-TAO_ORB_Core::init (int &argc, char *argv[])
-{
-  // Right now, this code expects to begin parsing in argv[1] rather
-  // than argv[0].  I don't think that's wise.  I think we need to
-  // change that convention to argv[0] and let the initializing code
-  // make any necessary shifts.
-  //
-  // Parse arguments to the ORB.  Typically the ORB is passed
-  // arguments straight from the command line, so we will simply pass
-  // through them and respond to the ones we understand and ignore
-  // those we don't.
-  //
-  // In some instances, we may actually build another vector of
-  // arguments and stash it for use initializing other components such
-  // as the ACE_Service_Config or the RootPOA.
-  //
-  // Prepare a copy of the argument vector for the service configurator.
-
-  char **svc_config_argv;
-  // @@ depricated
-  int old_style_endpoint = 0;
-
-  int svc_config_argc = 0;
-  ACE_NEW_RETURN (svc_config_argv, char *[argc + 1], 0);
-
-  // Be certain to copy the program name so that service configurator
-  // has something to skip!
-  ACE_Arg_Shifter arg_shifter (argc, argv);
-  const char *argv0 = "";
-  if (argc > 0 && argv != 0)
-    argv0 = argv[0];
-  svc_config_argv[svc_config_argc++] = CORBA::string_dup (argv0);
-
-  // Initialize the container for the ORB parameters.
-  // orb_params_ must be initialized before the command line parsing loop
-  // since some of the parsing code expects it to have been already
-  // initialized.
-  if (this->orb_params_ == 0)
-    ACE_NEW_RETURN (this->orb_params_, TAO_ORB_Parameters, 0);
-
-  // @@ This should be an IIOP default, more generally each
-  //    loaded protocol should have it's own default defined by the
-  //    implemention.  This is currently defined to be a zero, fredk
-  ACE_Env_Value<int> defport ("TAO_DEFAULT_SERVER_PORT",
-                              TAO_DEFAULT_SERVER_PORT);
-  ACE_CString host;
-  CORBA::UShort port = defport;
-
-  // @@ GIOPLite should be an alternative ORB Messaging protocols, fredk
-  int giop_lite = 0;
-
-  CORBA::Boolean use_ior = 1;
-  int cdr_tradeoff = ACE_DEFAULT_CDR_MEMCPY_TRADEOFF;
-
-  // The following things should be changed to use the ACE_Env_Value<>
-  // template sometime.
-
-  // Name Service IOR string.
-  ACE_CString ns_ior;
-
-  // New <ObjectID>:<IOR> mapping that is used by the
-  // resolve_initial_references ()
-  ACE_CString init_ref;
-
-  // Table for <ObjectID>:<IOR> mapping specified on commandline
-  // using ORBInitRef.
-  TAO_IOR_LookupTable *ior_lookup_table;
-
-  ACE_NEW_RETURN (ior_lookup_table,
-                  TAO_IOR_LookupTable,
-                  -1);
-
-  // List of comma separated prefixes from ORBDefaultInitRef.
-  ACE_CString default_init_ref;
-
-  // Name Service port use for Multicast
-  u_short ns_port = 0;
-
-  // Trading Service IOR string.
-  ACE_CString ts_ior;
-
-  // Trading Service port used for Multicast
-  u_short ts_port = 0;
-
-  // Implementation Repository Service IOR string.
-  ACE_CString ir_ior;
-
-  // Implementation Repository Service port #.
-  u_short ir_port = 0;
-
-  // Buffer sizes for kernel socket buffers
-  // @@ should be a default defined for each protocol implementation?
-  //    since we may have protocols loaded which use shared memory of
-  //    some form, fredk
-  size_t rcv_sock_size = 0;
-  size_t snd_sock_size = 0;
-
-  // Should we skip the <ACE_Service_Config::open> method, e.g., if we
-  // already being configured by the ACE Service Configurator.
-  int skip_service_config_open = 0;
-
-  // Use dotted decimal addresses
-  // @@ This option will be treated as a suggestion to each loaded protocol to
-  // @@ use a character representation for the numeric address, otherwise
-  // @@ use a logical name. fredk
-#if defined (TAO_USE_DOTTED_DECIMAL_ADDRESSES)
-  int dotted_decimal_addresses = 1;
-#else
-  int dotted_decimal_addresses = 0;
-#endif /* TAO_USE_DOTTED_DECIMAL_ADDRESSES */
-
-#if defined (TAO_STD_PROFILE_COMPONENTS)
-  int std_profile_components = 1;
-#else
-  int std_profile_components = 0;
-#endif /* TAO_STD_PROFILE_COMPONENTS */
-
-  int use_tss_resources = -1;
-  // -1 is unknown, default to what the resource factory sets.
-  // @@ This is just for backwards compatibility.
-
-  while (arg_shifter.is_anything_left ())
-    {
-      char *current_arg = arg_shifter.get_current ();
-
-      if (ACE_OS::strcasecmp (current_arg,
-                              "-ORBSvcConf") == 0)
-        {
-          // Specify the name of the svc.conf file to be used.
-          svc_config_argv[svc_config_argc++] =
-            CORBA::string_dup ("-f");
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              svc_config_argv[svc_config_argc++] =
-                CORBA::string_dup (arg_shifter.get_current ());
-              arg_shifter.consume_arg();
-            }
-        }
-
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBDaemon") == 0)
-        {
-          // Be a daemon
-          svc_config_argv[svc_config_argc++] =
-            CORBA::string_dup ("-b");
-          arg_shifter.consume_arg ();
-        }
-
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBDottedDecimalAddresses") == 0)
-        {
-          // Use dotted decimal addresses
-          // @@ this should be renamed.  See above comment. fredk
-          arg_shifter.consume_arg ();
-          if (arg_shifter.is_parameter_next ())
-            {
-              dotted_decimal_addresses = ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBDebug") == 0)
-        {
-          // Turn on debugging
-          ACE::debug (1);
-          TAO_orbdebug = 1;
-          arg_shifter.consume_arg ();
-        }
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBDebugLevel") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next())
-            {
-              TAO_debug_level =
-                ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBEndpoint") == 0)
-        {
-          // Each "endpoint" is of the form:
-          //
-          //   protocol://V.v@addr1,addr2,...,addrN
-          //
-          // or:
-          //
-          //   protocol://addr1,addr2,...,addrN
-          //
-          // where "V.v" is an optional protocol version for each
-          // addr.  All preconnect or endpoint strings should be of
-          // the above form(s).
-          //
-          // Multiple sets of endpoint may be seperated by a semi-colon `;'.
-          // For example:
-          //
-          //   iioploc://space:2001,1.2@odyssey:2010;uiop://foo,bar
-          //
-          // All preconnect or endpoint strings should be of the above form(s).
-
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next())
-            {
-              ACE_CString endpts (arg_shifter.get_current ());
-
-              if (this->orb_params ()->endpoints (endpts) != 0)
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                                     "(%P|%t)\n"
-                                     "Invalid endpoint(s) specified:\n%s\n",
-                                     endpts.c_str ()),
-                                    -1);
-                }
-
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBHost") == 0)
-        {
-          // @@ This option now has the same effect as specifying
-          //    an extra -ORBendpoint.  Ideally, this option
-          //    should be removed so that all INET specific
-          //    stuff can be removed from the ORB core but I
-          //    guess we need to leave it here for backward
-          //    compatibility.  C'est la vie.
-
-          old_style_endpoint = 1;
-          // Specify the name of the host (i.e., interface) on which
-          // the server should listen.
-          arg_shifter.consume_arg ();
-
-          // Issue a warning since this backward compatibilty support
-          // may be dropped in future releases.
-
-          ACE_DEBUG ((LM_WARNING,
-                      "(%P|%t) \nWARNING: The `-ORBHost' option is obsolete.\n"
-                      "In the future, use the `-ORBEndpoint' option.\n"));
-
-          if (arg_shifter.is_parameter_next())
-            {
-              host = arg_shifter.get_current ();
-              arg_shifter.consume_arg ();
-            }
-        }
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBNameServiceIOR") == 0)
-        {
-          // Specify the IOR of the NameService.
-
-          arg_shifter.consume_arg ();
-          if (arg_shifter.is_parameter_next ())
-            {
-              ns_ior = arg_shifter.get_current ();
-              arg_shifter.consume_arg ();
-            }
-        }
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBNameServicePort") == 0)
-        {
-          // Specify the port number for the NameService.
-          // Unrelated to ORB Protocols, this is used for multicast.
-
-          arg_shifter.consume_arg ();
-          if (arg_shifter.is_parameter_next ())
-            {
-              ns_port = ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBTradingServiceIOR") == 0)
-        {
-          // Specify the IOR of the NameService.
-
-          arg_shifter.consume_arg ();
-          if (arg_shifter.is_parameter_next ())
-            {
-              ts_ior = arg_shifter.get_current ();
-              arg_shifter.consume_arg ();
-            }
-        }
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBTradingServicePort") == 0)
-        {
-          // Specify the port number for the NameService.
-
-          arg_shifter.consume_arg ();
-          if (arg_shifter.is_parameter_next ())
-            {
-              ts_port = ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBImplRepoIOR") == 0)
-        {
-          // Specify the IOR of the Implementation Repository
-
-          arg_shifter.consume_arg ();
-          if (arg_shifter.is_parameter_next ())
-            {
-              ir_ior = arg_shifter.get_current ();
-              arg_shifter.consume_arg ();
-            }
-        }
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBImplRepoPort") == 0)
-        {
-          // Specify the multicast port number for the Implementation Repository.
-
-          arg_shifter.consume_arg ();
-          if (arg_shifter.is_parameter_next ())
-            {
-              ir_port = ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBPort") == 0)
-        {
-          // Issue a warning since this backward compatibilty support
-          // may be dropped in future releases.
-
-          old_style_endpoint = 1;
-          ACE_DEBUG ((LM_WARNING,
-                      "(%P|%t) \nWARNING: The `-ORBPort' option is obsolete.\n"
-                      "In the future, use the `-ORBEndpoint' option.\n"));
-
-          // Specify the port number/name on which we should listen
-          arg_shifter.consume_arg ();
-          if (arg_shifter.is_parameter_next ())
-            {
-              // We really shouldn't limit this to being specified as
-              // an int, but oh well for now.
-              port = ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBRcvSock") == 0)
-        {
-          // @@ All protocol implementation may not use sockets, so
-          //    this can either be a generic I/O Buffer size or
-          //    Buffer info can be a per protocol specification, fredk
-
-          arg_shifter.consume_arg ();
-          // Specify the size of the socket's receive buffer
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              rcv_sock_size = ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBSndSock") == 0)
-        {
-          // @@ All protocol implementation may not use sockets, so
-          //    this can either be a generic I/O Buffer size or
-          //    Buffer info can be a per protocol specification, fredk
-
-          arg_shifter.consume_arg ();
-          // Specify the size of the socket's send buffer
-          if (arg_shifter.is_parameter_next ())
-            {
-              snd_sock_size = ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBObjRefStyle") == 0)
-        {
-          // Specifies the style of printed objrefs: URL or IOR
-          //
-          // BEGIN COMMENTS FROM IIOP-1.4 On Win32, we should be
-          // collecting information from the Registry such as what
-          // ORBs are configured, specific configuration details like
-          // whether they generate IOR or URL style stringified
-          // objrefs and which addresses they listen to (e.g. allowing
-          // multihomed hosts to implement firewalls), user-meaningful
-          // orb names (they will normally indicate domains), and
-          // more.
-          //
-          // On UNIX, we should collect that from some private config
-          // file.
-          //
-          // Instead, this just treats the "internet" ORB name
-          // specially and makes it always use URL-style stringified
-          // objrefs, where the hostname and TCP port number are
-          // explicit (and the whole objref is readable by mortals).
-          // BEGIN COMMENTS FROM IIOP-1.4
-          arg_shifter.consume_arg ();
-          if (arg_shifter.is_parameter_next ())
-            {
-              char *opt = arg_shifter.get_current ();
-              if (ACE_OS::strcasecmp (opt,
-                                      "URL") == 0)
-                use_ior = 0;
-
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBCollocation") == 0)
-        // Specify whether we want to optimize against collocation
-        // objects.  Valid arguments are: "yes" and "no".  Default is
-        // yes.
-        {
-          arg_shifter.consume_arg ();
-          if (arg_shifter.is_parameter_next ())
-            {
-              char *opt = arg_shifter.get_current ();
-              if (ACE_OS::strcasecmp (opt, "YES") == 0 ||
-                  ACE_OS::strcasecmp (opt, "global") == 0)
-                {
-                  this->opt_for_collocation_ = 1;
-                  this->use_global_collocation_ = 1;
-                }
-              else if (ACE_OS::strcasecmp (opt, "NO") == 0)
-                this->opt_for_collocation_ = 0;
-              else if (ACE_OS::strcasecmp (opt, "per-orb") == 0)
-                {
-                  this->opt_for_collocation_ = 1;
-                  this->use_global_collocation_ = 0;
-                }
-
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBCollocationStrategy") == 0)
-        // Specify which collocation policy we want to use.
-        {
-          arg_shifter.consume_arg ();
-          if (arg_shifter.is_parameter_next ())
-            {
-              char *opt = arg_shifter.get_current ();
-              if (ACE_OS::strcasecmp (opt, "thru_poa") == 0)
-                this->collocation_strategy_ = THRU_POA;
-              else if (ACE_OS::strcasecmp (opt, "direct") == 0)
-                this->collocation_strategy_ = DIRECT;
-
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBGlobalCollocation") == 0)
-        // Specify whether we want to use collocation across ORBs;
-        // i.e. all the ORBs in the same address space use collocated
-        // calls.
-        {
-          arg_shifter.consume_arg ();
-          ACE_DEBUG ((LM_DEBUG,
-                      "Warning: -ORBGlobalCollocation option is obsolete."
-                      "  Please use '-ORBCollocation global/per-orb/no' instead.\n"));
-          if (arg_shifter.is_parameter_next ())
-            {
-              char *opt = arg_shifter.get_current ();
-              if (ACE_OS::strcasecmp (opt,
-                                      "YES") == 0)
-                this->use_global_collocation_ = 1;
-              else if (ACE_OS::strcasecmp (opt,
-                                           "NO") == 0)
-                this->use_global_collocation_ = 0;
-
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBPreconnect") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          // Get a string which describes the connections we want to
-          // cache up-front, thus reducing the latency of the first call.
-          //
-          // For example,  specify -ORBpreconnect once for each
-          // protocol:
-          //
-          //   -ORBpreconnect iiop://tango:10015,watusi:10016
-          //   -ORBpreconnect busX_iop://board1:0x07450000,board2,0x08450000
-          //
-          // Or chain all possible endpoint designations together:
-          //
-          //   -ORBpreconnect iiop://tango:10015,watusi:10016/;
-          //              busX_iop://board1:0x07450000,board2,0x08450000/
-          //
-          // The old style command line only works for IIOP:
-          //    -ORBpreconnect tango:10015,tango:10015,watusi:10016
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              ACE_CString preconnections (arg_shifter.get_current ());
-
-              if (this->orb_params ()->preconnects (preconnections) != 0)
-                {
-                  // Handle old style preconnects for backward compatibility.
-                  // The old style preconnects only work for IIOP!
-
-                  // Issue a warning since this backward compatibilty support
-                  // may be dropped in future releases.
-
-                  ACE_DEBUG ((LM_WARNING,
-                              "(%P|%t) \nWARNING: The `host:port' pair style "
-                              "for `-ORBPreconnect' is obsolete.\n"
-                              "In the future, use the URL style.\n"));
-
-                  preconnections =
-                    ACE_CString ("iiop://") +
-                    ACE_CString (preconnections) +
-                    ACE_CString ("/");
-
-                  ACE_DEBUG ((LM_WARNING,
-                              "(%P|%t) \nWARNING: The following preconnection "
-                              "will be used:\n%s\n",
-                              preconnections.c_str()));
-
-                  this->orb_params ()->preconnects (preconnections);
-                }
-
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBCDRTradeoff") == 0)
-        {
-          arg_shifter.consume_arg ();
-          if (arg_shifter.is_parameter_next ())
-            {
-              cdr_tradeoff = ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-
-       else if (ACE_OS::strcasecmp (current_arg,
-                                    "-ORBSvcConfDirective") == 0)
-         {
-           // This is used to pass arguments to the Service
-           // Configurator using the "command line" to provide
-           // configuration information rather than using a svc.conf
-           // file.  Pass the "-S" to the service configurator.
-           svc_config_argv[svc_config_argc++] =
-             CORBA::string_dup ("-S");
-           arg_shifter.consume_arg ();
-
-           if (arg_shifter.is_parameter_next ())
-             {
-               // Pass the next argument.
-               svc_config_argv[svc_config_argc++] =
-                 CORBA::string_dup (arg_shifter.get_current ());
-               arg_shifter.consume_arg ();
-             }
-         }
-
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBGIOPlite") == 0)
-        {
-          // @@ This will have to change since gioplite will be considered
-          //    as an alternate ORB messaging protocols.
-          arg_shifter.consume_arg ();
-          giop_lite = 1;
-        }
-
-      // A new <ObjectID>:<IOR> mapping has been specified. This will be
-      // used by the resolve_initial_references ().
-
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBInitRef") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              init_ref = arg_shifter.get_current ();
-              if (this->add_to_ior_table (init_ref,
-                                          *ior_lookup_table) != 0)
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   "Unable to add IOR to the Table\n"),
-                                  -1);
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBDefaultInitRef") == 0)
-        {
-          arg_shifter.consume_arg ();
-          if (arg_shifter.is_parameter_next ())
-            {
-              default_init_ref = arg_shifter.get_current ();
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBSkipServiceConfigOpen") == 0)
-        {
-          arg_shifter.consume_arg ();
-          skip_service_config_open = 1;
-        }
-
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBStdProfileComponents") == 0)
-        {
-          arg_shifter.consume_arg ();
-          if (arg_shifter.is_parameter_next ())
-            {
-              std_profile_components =
-                ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-           }
-        }
-
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBResources") == 0)
-        {
-          arg_shifter.consume_arg ();
-          if (arg_shifter.is_parameter_next ())
-            {
-              char *opt = arg_shifter.get_current ();
-              if (ACE_OS::strcasecmp (opt, "global") == 0)
-                use_tss_resources = 0;
-              else if (ACE_OS::strcasecmp (opt, "tss") == 0)
-                use_tss_resources = 1;
-
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strncasecmp (current_arg,
-                                    "-ORB",
-                                    4) == 0)
-        {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "warning: unknown -ORB arg %s, consuming arg\n",
-                       current_arg));
-          arg_shifter.consume_arg ();
-        }
-      else
-        // Any arguments that don't match are ignored so that the
-        // caller can still use them.
-        arg_shifter.ignore_arg ();
-    }
-
-#if defined (DEBUG)
-  // Make it a little easier to debug programs using this code.
-  {
-    TAO_debug_level = ACE_Env_Value<u_int> ("TAO_ORB_DEBUG", 0);
-
-    char *value = ACE_OS::getenv ("TAO_ORB_DEBUG");
-
-    if (value != 0)
-      {
-        TAO_debug_level = ACE_OS::atoi (value);
-        if (TAO_debug_level <= 0)
-          TAO_debug_level = 1;
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_debug_level == %d", TAO_debug_level));
-      }
-  }
-#endif  /* DEBUG */
-
-#if defined (SIGPIPE) && !defined (ACE_LACKS_UNIX_SIGNALS)
-  // There's really no way to deal with this in a portable manner, so
-  // we just have to suck it up and get preprocessor conditional and
-  // ugly.
-  //
-  // Impractical to have each call to the ORB protect against the
-  // implementation artifact of potential writes to dead connections,
-  // as it'd be way expensive.  Do it here; who cares about SIGPIPE in
-  // these kinds of applications, anyway?
-  (void) ACE_OS::signal (SIGPIPE, SIG_IGN);
-#endif /* SIGPIPE */
-
-  // Initialize the Service Configurator -check for return values.
-  // Load the resource factory, connector registry, acceptor registry
-  // and protocols.  Will need to call the open () method on
-  // the registries!
-  int result = TAO_Internal::open_services (svc_config_argc,
-                                            svc_config_argv,
-                                            0,
-                                            skip_service_config_open);
-
-  // Make sure to free up all the dynamically allocated memory.  If we
-  // decide we don't need to allocate this stuff dynamically then we
-  // can remove this.
-  for (int i = 0; i < svc_config_argc; i++)
-    CORBA::string_free (svc_config_argv[i]);
-
-  delete [] svc_config_argv;
-
-  // Check for errors returned from <TAO_Internal::open_services>.
-  if (result != 0 && errno != ENOENT)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) %p\n",
-                       "ORB Core unable to initialize the Service Configurator"),
-                      -1);
-
-  // Initialize the pointers to resources in the ORB Core instance,
-  // e.g., reactor, connector, etc.  Must do this after we open
-  // services because we'll load the factory from there.
-  TAO_Resource_Factory *trf = this->resource_factory ();
-
-  if (trf == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) %p\n",
-                       "ORB Core unable to find a Resource Factory instance"),
-                      -1);
-
-  if (use_tss_resources == -1)
-    this->use_tss_resources_ = trf->use_tss_resources ();
-  else
-    this->use_tss_resources_ = use_tss_resources;
-
-  ACE_Reactor *reactor = this->reactor ();
-
-  // Make sure the reactor is initialized...
-  if (reactor == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) %p\n",
-                       "ORB Core unable to initialize reactor"),
-                      -1);
-
-  TAO_Server_Strategy_Factory *ssf = this->server_factory ();
-
-  if (ssf == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) %p\n",
-                       "ORB Core unable to find a Server Strategy Factory instance"),
-                      -1);
-
-  ssf->open (this);
-
-  // Inititalize the "ORB" pseudo-object now.
-  ACE_NEW_RETURN (this->orb_, CORBA_ORB (this), 0);
-
-  // This should probably move into the ORB Core someday rather then
-  // being done at this level.
-  this->orb_->_use_omg_ior_format (use_ior);
-
-  // Set the <shutdown_lock_> for the ORB.
-  this->orb_->shutdown_lock_ = ssf->create_event_loop_lock ();
-
-  // @@ Michael: I don't know if this is the best spot,
-  // we might have to discuss that.
-  //this->leader_follower_lock_ptr_ =  this->client_factory ()
-  //                                       ->create_leader_follower_lock ();
-
-  // Set all kinds of orb parameters whose setting needed to be
-  // deferred until after the service config entries had been
-  // determined.
-
-  // @@ Set the endpoint string to iiop://host:port/
-  //    Add a string to hold the endpoint desgination for this ORB
-  //    for now it will be IIOP://host:port/  fredk
-  if (old_style_endpoint)
-    {
-      ACE_CString iiop_endpoint;
-      if (this->set_iiop_endpoint (dotted_decimal_addresses,
-                                   port,
-                                   host,
-                                   iiop_endpoint) == -1)
-        return -1;
-      // Add the endpoint
-      this->orb_params ()->endpoints (iiop_endpoint);
-    }
-
-  // Set the init_ref.
-  this->orb_params ()->init_ref (init_ref);
-
-  // Set the IOR Table.
-  this->orb_params ()->ior_lookup_table (ior_lookup_table);
-
-  // Set the list of prefixes from -ORBDefaultInitRef.
-  this->orb_params ()->default_init_ref (default_init_ref);
-
-  this->orb_params ()->name_service_ior (ns_ior);
-  this->orb_params ()->name_service_port (ns_port);
-  this->orb_params ()->trading_service_ior (ts_ior);
-  this->orb_params ()->trading_service_port (ts_port);
-  this->orb_params ()->implrepo_service_ior (ir_ior);
-  this->orb_params ()->implrepo_service_port (ir_port);
-  this->orb_params ()->use_dotted_decimal_addresses (dotted_decimal_addresses);
-  if (rcv_sock_size != 0)
-    this->orb_params ()->sock_rcvbuf_size (rcv_sock_size);
-  if (snd_sock_size != 0)
-    this->orb_params ()->sock_sndbuf_size (snd_sock_size);
-  if (cdr_tradeoff >= 0)
-    this->orb_params ()->cdr_memcpy_tradeoff (cdr_tradeoff);
-
-  this->orb_params ()->use_lite_protocol (giop_lite);
-
-  this->orb_params ()->std_profile_components (std_profile_components);
-
-  // ** Set up the pluggable protocol infrastructure.  First get a
-  // pointer to the protocol factories set, then obtain pointers to
-  // all factories loaded by the service configurator.
-  // Load all protocol factories!
-  if (trf->init_protocol_factories () == -1)
-    return -1;
-
-  // init the ORB core's pointer
-  this->protocol_factories_ = trf->get_protocol_factories ();
-
-  // Now that we have a complete list of available protocols and their
-  // related factory objects, initial;ize the registries!
-
-  // Init the connector registry and create a connector for each
-  // configured protocol.
-  if (this->connector_registry ()->open (this) != 0)
-    return -1;
-
-  // Have registry parse the preconnects
-  if (this->orb_params ()->preconnects ().is_empty () == 0)
-    this->connector_registry ()->preconnect (this,
-                                             this->orb_params ()->preconnects ());
-
-  return 0;
-}
-
-int
-TAO_ORB_Core::set_iiop_endpoint (int dotted_decimal_addresses,
-                                 CORBA::UShort port,
-                                 ACE_CString &host,
-                                 ACE_CString &endpoint)
-{
-  // No host specified; find it
-  if (host.length () == 0)
-    {
-      ASYS_TCHAR name[MAXHOSTNAMELEN + 1];
-      if (ACE_OS::hostname (name, MAXHOSTNAMELEN + 1) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) Failed to look up local host name.\n"),
-                       -1);
-        }
-      host.set (name, 1);
-    }
-
-  // @@ For compatibility (ug) with how things were done before,
-  //    get the local host name in the correct format.  This will be
-  //    stored away in the ORB!  fredk
-  ACE_INET_Addr rendezvous;
-  rendezvous.set (port, host.c_str ());
-
-  char buffer[MAXHOSTNAMELEN + 1];
-
-  if (rendezvous.addr_to_string (buffer,
-                                 MAXHOSTNAMELEN,
-                                 dotted_decimal_addresses) == -1)
-    {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) failed in addr_to_string () %p.\n"),
-                          -1);
-    }
-
-  // endpoint == iiop://host:port/
-  endpoint.set ("iiop://", 1);
-  endpoint += buffer;
-  endpoint += ACE_CString("/");
-
-  return 0;
-}
-
-int
-TAO_ORB_Core::fini (void)
-{
-  if (TAO_debug_level >= 3)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Destroying ORB <%s>\n",
-                  this->orbid_));
-    }
-
-  // Close connectors before acceptors!
-  // Ask the registry to close all registered connectors.
-  if (this->connector_registry_ != 0)
-    {
-      this->connector_registry_->close_all ();
-      delete this->connector_registry_;
-    }
-
-  // Ask the registry to close all registered acceptors.
-  if (this->acceptor_registry_ != 0)
-    {
-      this->acceptor_registry_->close_all ();
-      delete this->acceptor_registry_;
-    }
-
-  TAO_Internal::close_services ();
-
-  // @@ This is not needed since the default resource factory
-  //    is staticaly added to the service configurator, fredk
-  if (!this->resource_factory_from_service_config_)
-    delete resource_factory_;
-
-  // @@ This is not needed since the default client factory
-  //    is staticaly added to the service configurator, fredk
-  if (!this->client_factory_from_service_config_)
-    delete client_factory_;
-
-  // @@ This is not needed since the default server factory
-  //    is staticaly added to the service configurator, fredk
-  if (!this->server_factory_from_service_config_)
-    delete server_factory_;
-
-  {
-    ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard,
-                              *ACE_Static_Object_Lock::instance (), 0));
-    TAO_ORB_Table::instance ()->unbind (this->orbid_);
-  }
-
-  delete this;
-
-  return 0;
-}
-
-TAO_Resource_Factory *
-TAO_ORB_Core::resource_factory (void)
-{
-  if (this->resource_factory_ == 0)
-    {
-      // Look in the service repository for an instance.
-      this->resource_factory_ =
-        ACE_Dynamic_Service<TAO_Resource_Factory>::instance ("Resource_Factory");
-      // @@ Not needed!
-      this->resource_factory_from_service_config_ = 1;
-    }
-
-  //@@ None of this stuff is needed since the default resource factory
-  //   is statically adde to the Service Configurator!
-  if (this->resource_factory_ == 0)
-    {
-      // Still don't have one, so let's allocate the default.  This
-      // will throw an exception if it fails on exception-throwing
-      // platforms.
-      if (TAO_orbdebug)
-        ACE_ERROR ((LM_WARNING,
-                    "(%P|%t) WARNING - No Resource Factory found in Service Repository."
-                    "  Using default instance with GLOBAL resource source specifier.\n"));
-
-      TAO_Default_Resource_Factory *default_factory;
-      ACE_NEW_RETURN (default_factory,
-                      TAO_Default_Resource_Factory,
-                      0);
-
-      // @@ Not needed.
-      this->resource_factory_from_service_config_ = 0;
-      this->resource_factory_ = default_factory;
-
-      // @@ At this point we need to register this with the
-      // Service_Repository in order to get it cleaned up properly.
-      // But, for now we let it leak.
-    }
-  return this->resource_factory_;
-}
-
-TAO_Client_Strategy_Factory *
-TAO_ORB_Core::client_factory (void)
-{
-  if (this->client_factory_ == 0)
-    {
-      // Look in the service repository for an instance.
-      this->client_factory_ =
-        ACE_Dynamic_Service<TAO_Client_Strategy_Factory>::instance ("Client_Strategy_Factory");
-      // @@ Not needed!
-      this->client_factory_from_service_config_ = 1;
-    }
-
-  //@@ None of this stuff is needed since the default client factory
-  //   is statically added to the Service Configurator, fredk
-  if (this->client_factory_ == 0)
-    {
-      // Still don't have one, so let's allocate the default.  This
-      // will throw an exception if it fails on exception-throwing
-      // platforms.
-      if (TAO_orbdebug)
-        ACE_ERROR ((LM_WARNING,
-                    "(%P|%t) WARNING - No Client Strategy Factory found in Service Repository."
-                    "  Using default instance.\n"));
-
-      ACE_NEW_RETURN (this->client_factory_,
-                      TAO_Default_Client_Strategy_Factory,
-                      0);
-
-      this->client_factory_from_service_config_ = 0;
-      // At this point we need to register this with the
-      // Service_Repository in order to get it cleaned up properly.
-      // But, for now we let it leak.
-    }
-  return this->client_factory_;
-}
-
-TAO_Server_Strategy_Factory *
-TAO_ORB_Core::server_factory (void)
-{
-  if (this->server_factory_ == 0)
-    {
-      // Look in the service repository for an instance.
-      this->server_factory_ =
-        ACE_Dynamic_Service<TAO_Server_Strategy_Factory>::instance ("Server_Strategy_Factory");
-      // @@ Not needed!
-      this->server_factory_from_service_config_ = 1;
-    }
-
-  //@@ None of this stuff is needed since the default server factory
-  //   is statically adde to the Service Configurator, fredk
-  // If the <server_factory_> isn't found it's usually because the ORB
-  // hasn't been intialized correctly...
-  if (this->server_factory_ == 0)
-    {
-      // Still don't have one, so let's allocate the default.
-      if (TAO_orbdebug)
-        ACE_ERROR ((LM_WARNING,
-                    "(%P|%t) WARNING - No %s found in Service Repository."
-                    "  Using default instance.\n",
-                    "Server Strategy Factory"));
-
-      ACE_NEW_RETURN (this->server_factory_,
-                      TAO_Default_Server_Strategy_Factory,
-                      0);
-
-      // @@ Not needed!
-      this->server_factory_from_service_config_ = 0;
-      // At this point we need to register this with the
-      // <Service_Repository> to get it cleaned up properly.  But, for
-      // now we let it leak.
-    }
-
-  return this->server_factory_;
-}
-
-CORBA::ORB_ptr
-TAO_ORB_Core::orb (CORBA::ORB_ptr op)
-{
-  // Shouldn't need to check for ptr validity at this point b/c we
-  // already did in ::init()
-  CORBA::ORB_ptr old_orb = this->orb_;
-  this->orb_ = op;
-  return old_orb;
-}
-
-int
-TAO_ORB_Core::inherit_from_parent_thread (TAO_ORB_Core_TSS_Resources *tss_resources)
-{
-  // Inherit properties/objects used in ORB_Core from the
-  // parent thread.  Stuff inherited here must already exist
-  // in the "parent" orbcore.
-  // This is used in the thread-per-connection concurrency model where
-  // each ORB spawned thread must use the resources of the spawning
-  // thread...
-
-  if (tss_resources)
-    {
-      if (tss_resources->reactor_ != 0)
-        {
-          // We'll use the spawning thread's reactor.
-          TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
-          if (tss->reactor_ != 0 && TAO_debug_level > 0)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "TAO (%P|%t) non nil reactor on thread startup!\n"));
-
-              if (tss == 0)
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   "(%P|%t) %p\n",
-                                   "TAO_ORB_Core::inherit_from_parent_thread"
-                                   " (); no more TSS keys"),
-                                  -1);
-
-              if (tss->owns_resources_ != 0 && !tss->inherited_reactor_)
-                delete tss->reactor_;
-            }
-          tss->reactor_ = tss_resources->reactor_;
-          tss->inherited_reactor_ = 1;
-        }
-
-      // this->connection_cache (tss_resources->connection_cache_);
-      // Inherit connection cache?
-
-      return 0;
-    }
-  else
-    {
-      return -1;
-    }
-}
-
-PortableServer::POA_ptr
-TAO_ORB_Core::root_poa_reference (CORBA::Environment &ACE_TRY_ENV,
-                                  const char *adapter_name,
-                                  TAO_POA_Manager *poa_manager,
-                                  const TAO_POA_Policies *policies)
-{
-  if (CORBA::is_nil (this->root_poa_reference_.in ()))
-    {
-      this->create_and_set_root_poa (adapter_name,
-                                     poa_manager,
-                                     policies,
-                                     ACE_TRY_ENV);
-      ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-    }
-
-  return PortableServer::POA::_duplicate (this->root_poa_reference_.in ());
-}
-
-void
-TAO_ORB_Core::create_and_set_root_poa (const char *adapter_name,
-                                       TAO_POA_Manager *poa_manager,
-                                       const TAO_POA_Policies *policies,
-                                       CORBA::Environment &ACE_TRY_ENV)
-{
-  if (this->root_poa_ == 0)
-    {
-      // Double checked locking
-      ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_);
-      if (this->root_poa_ == 0)
-        {
-          // @@ Irfan: please use auto_ptr here
-          if (poa_manager == 0)
-            {
-              ACE_NEW_THROW_EX (poa_manager,
-                                TAO_POA_Manager (*this->object_adapter_i ()),
-                                CORBA::NO_MEMORY ());
-              ACE_CHECK;
-            }
-
-          TAO_POA_Policies root_poa_policies;
-          if (policies == 0)
-            {
-              // RootPOA policies defined in spec
-              root_poa_policies.implicit_activation (PortableServer::IMPLICIT_ACTIVATION);
-
-              policies = &root_poa_policies;
-            }
-
-          // Construct a new POA
-          ACE_NEW_THROW_EX (this->root_poa_,
-                            TAO_POA (adapter_name,
-                                     *poa_manager,
-                                     *policies,
-                                     0,
-                                     this->object_adapter_i ()->lock (),
-                                     this->object_adapter_i ()->thread_lock (),
-                                     *this,
-                                     ACE_TRY_ENV),
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK;
-
-          this->root_poa_reference_ =
-            this->root_poa_->_this (ACE_TRY_ENV);
-          ACE_CHECK;
-        }
-    }
-}
-
-TAO_Object_Adapter *
-TAO_ORB_Core::object_adapter (void)
-{
-  if (this->object_adapter_ == 0)
-    {
-      // Double checked locking
-      ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0);
-      (void) this->object_adapter_i ();
-    }
-
-  return this->object_adapter_;
-}
-
-TAO_Object_Adapter *
-TAO_ORB_Core::object_adapter_i (void)
-{
-  if (this->object_adapter_ == 0)
-    {
-      ACE_NEW_RETURN (this->object_adapter_,
-                      TAO_Object_Adapter (this->server_factory ()->active_object_map_creation_parameters (),
-                                          *this),
-                      0);
-    }
-  return this->object_adapter_;
-}
-
-int
-TAO_ORB_Core::is_collocated (const TAO_MProfile& mprofile)
-{
-  if (this->acceptor_registry_ == 0)
-    return 0;
-
-  // @@ Lots of issues arrise when dealing with collocation.  What about
-  //    forwarding or what if this is a multi-profile IOR where the order is
-  //    significant and only one of the profiles is collocated.  For example
-  //    when using a multiple servers for fault tolerance.  For now, we just
-  //    look through all profiles and if any are colocated then we assume
-  //    the object is collocated.
-  // @@ Note, if collocated we can not be forwarded!
-  //    Also, acceptor_registry_->is_collocated (...) will check the
-  //    address (ORB Host) but not the object_key.  This should be checked
-  //    also.
-
-  return this->acceptor_registry_->is_collocated (mprofile);
-}
-
-// ****************************************************************
-
-int
-TAO_ORB_Core::run (ACE_Time_Value *tv, int break_on_timeouts)
-{
-  if (TAO_debug_level >= 3)
-    ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - start of run\n"));
-
-  TAO_Leader_Follower &leader_follower = this->leader_follower ();
-  {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon,
-                      leader_follower.lock (), -1);
-
-    leader_follower.set_server_thread ();
-  }
-
-  ACE_Reactor *r = this->reactor ();
-
-  // @@ Do we really need to do this?
-  // Set the owning thread of the Reactor to the one which we're
-  // currently in.  This is necessary b/c it's possible that the
-  // application is calling us from a thread other than that in which
-  // the Reactor's CTOR (which sets the owner) was called.
-  r->owner (ACE_Thread::self ());
-
-  // This method should only be called by servers, so now we set up
-  // for listening!
-  if (this->orb ()->open () == -1)
-    return -1;
-
-  int result = 1;
-  // 1 to detect that nothing went wrong
-
-  // Loop "forever" handling client requests.
-  while (this->orb ()->should_shutdown () == 0)
-    {
-      if (TAO_debug_level >= 3)
-        ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - blocking on handle events\n"));
-      switch (r->handle_events (tv))
-        {
-        case 0: // Timed out, so we return to caller.
-          if (break_on_timeouts)
-            result = 0;
-          break;
-          /* NOTREACHED */
-        case -1: // Something else has gone wrong, so return to caller.
-          result = -1;
-          break;
-          /* NOTREACHED */
-        default:
-          // Some handlers were dispatched, so keep on processing
-          // requests until we're told to shutdown .
-          break;
-          /* NOTREACHED */
-        }
-      if (result == 0 || result == -1)
-        break;
-    }
-
-  {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon,
-                      leader_follower.lock (), -1);
-
-    leader_follower.reset_server_thread ();
-
-    if (leader_follower.elect_new_leader () == -1)
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "TAO (%P|%t) Failed to wake up "
-                         "a follower thread\n"),
-                        -1);
-  }
-
-  if (TAO_debug_level >= 3)
-    ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - end of run %d\n", result));
-
-  return result;
-}
-
-// ****************************************************************
-
-ACE_SYNCH_CONDITION*
-TAO_Leader_Follower::get_next_follower (void)
-{
-  ACE_Unbounded_Set_Iterator<ACE_SYNCH_CONDITION *> iterator (
-    this->follower_set_);
-
-  if (iterator.first () == 0)
-    // means set is empty
-    return 0;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - next follower is %x\n",
-                *iterator));
-
-  ACE_SYNCH_CONDITION *cond = *iterator;
-
-  // We *must* remove it when we signal it so the same condition is
-  // not signalled for both wake up as a follower and as the next
-  // leader. 
-  // The follower may not be there if the reply is received while the
-  // consumer is not yet waiting for it (i.e. it send the request but
-  // has not blocked to receive the reply yet)
-  (void) this->remove_follower (cond); // Ignore errors..
-
-  return cond;
-}
-
-// ****************************************************************
-
-ACE_Allocator*
-TAO_ORB_Core::input_cdr_dblock_allocator (void)
-{
-  if (this->use_tss_resources_)
-    {
-      TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
-      if (tss == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) %p\n",
-                           "TAO_ORB_Core::input_cdr_dblock_allocator (); "
-                             "no more TSS keys"),
-                          0);
-
-      if (tss->input_cdr_dblock_allocator_ == 0)
-        {
-          tss->input_cdr_dblock_allocator_ = this->resource_factory ()->input_cdr_dblock_allocator ();
-          tss->owns_resources_ = 1;
-        }
-      return tss->input_cdr_dblock_allocator_;
-    }
-
-  if (this->orb_resources_.input_cdr_dblock_allocator_ == 0)
-    {
-      // Double checked locking
-      ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0);
-      if (this->orb_resources_.input_cdr_dblock_allocator_ == 0)
-        {
-          this->orb_resources_.input_cdr_dblock_allocator_ =
-            this->resource_factory ()->input_cdr_dblock_allocator ();
-          this->orb_resources_.owns_resources_ = 1;
-        }
-    }
-  return this->orb_resources_.input_cdr_dblock_allocator_;
-}
-
-ACE_Allocator*
-TAO_ORB_Core::input_cdr_buffer_allocator (void)
-{
-  if (this->use_tss_resources_)
-    {
-      TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
-      if (tss == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) %p\n",
-                           "TAO_ORB_Core::input_cdr_buffer_allocator (); "
-                             "no more TSS keys"),
-                          0);
-
-      if (tss->input_cdr_buffer_allocator_ == 0)
-        {
-          tss->input_cdr_buffer_allocator_ = this->resource_factory ()->input_cdr_buffer_allocator ();
-          tss->owns_resources_ = 1;
-        }
-      return tss->input_cdr_buffer_allocator_;
-    }
-
-  if (this->orb_resources_.input_cdr_buffer_allocator_ == 0)
-    {
-      // Double checked locking
-      ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0);
-      if (this->orb_resources_.input_cdr_buffer_allocator_ == 0)
-        {
-          this->orb_resources_.input_cdr_buffer_allocator_ =
-            this->resource_factory ()->input_cdr_buffer_allocator ();
-          this->orb_resources_.owns_resources_ = 1;
-        }
-    }
-  return this->orb_resources_.input_cdr_buffer_allocator_;
-}
-
-ACE_Allocator*
-TAO_ORB_Core::output_cdr_dblock_allocator (void)
-{
-#if 0
-  if (this->use_tss_resources_)
-#endif /* 0 */
-    {
-      TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
-      if (tss == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) %p\n",
-                           "TAO_ORB_Core::output_cdr_dblock_allocator (); "
-                             "no more TSS keys"),
-                          0);
-
-      if (tss->output_cdr_buffer_allocator_ == 0)
-        {
-          tss->output_cdr_buffer_allocator_ = this->resource_factory ()->output_cdr_buffer_allocator ();
-          tss->owns_resources_ = 1;
-        }
-      return tss->output_cdr_buffer_allocator_;
-    }
-
-#if 0
-  if (this->orb_resources_.output_cdr_buffer_allocator_ == 0)
-    {
-      // Double checked locking
-      ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0);
-      if (this->orb_resources_.output_cdr_buffer_allocator_ == 0)
-        {
-          this->orb_resources_.output_cdr_buffer_allocator_ =
-            this->resource_factory ()->output_cdr_buffer_allocator ();
-          this->orb_resources_.owns_resources_ = 1;
-        }
-    }
-  return this->orb_resources_.output_cdr_buffer_allocator_;
-#endif /* 0 */
-}
-
-ACE_Allocator*
-TAO_ORB_Core::output_cdr_buffer_allocator (void)
-{
-#if 0
-  if (this->use_tss_resources_)
-#endif /* 0 */
-    {
-      TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
-      if (tss == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) %p\n",
-                           "TAO_ORB_Core::input_cdr_buffer_allocator (); "
-                             "no more TSS keys"),
-                          0);
-
-      if (tss->output_cdr_buffer_allocator_ == 0)
-        {
-          tss->output_cdr_buffer_allocator_ = this->resource_factory ()->output_cdr_buffer_allocator ();
-          tss->owns_resources_ = 1;
-        }
-      return tss->output_cdr_buffer_allocator_;
-    }
-
-#if 0
-  if (this->orb_resources_.output_cdr_buffer_allocator_ == 0)
-    {
-      // Double checked locking
-      ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0);
-      if (this->orb_resources_.output_cdr_buffer_allocator_ == 0)
-        {
-          this->orb_resources_.output_cdr_buffer_allocator_ =
-            this->resource_factory ()->output_cdr_buffer_allocator ();
-          this->orb_resources_.owns_resources_ = 1;
-        }
-    }
-  return this->orb_resources_.output_cdr_buffer_allocator_;
-#endif /* 0 */
-}
-
-ACE_Data_Block*
-TAO_ORB_Core::create_input_cdr_data_block (size_t size)
-{
-  ACE_Data_Block *nb = 0;
-
-  ACE_Allocator *dblock_allocator =
-    this->input_cdr_dblock_allocator ();
-  ACE_Allocator *buffer_allocator =
-    this->input_cdr_buffer_allocator ();
-
-  if (this->resource_factory ()->use_locked_data_blocks ())
-    {
-      typedef
-        ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> >
-        Locked_Data_Block;
-
-      ACE_NEW_MALLOC_RETURN (
-            nb,
-            ACE_static_cast (Locked_Data_Block *,
-                             dblock_allocator->malloc (sizeof (Locked_Data_Block))),
-            Locked_Data_Block (size,
-                               ACE_Message_Block::MB_DATA,
-                               0,
-                               buffer_allocator,
-                               0,
-                               dblock_allocator),
-            0);
-    }
-  else
-    {
-      ACE_NEW_MALLOC_RETURN (
-            nb,
-            ACE_static_cast(ACE_Data_Block*,
-                            dblock_allocator->malloc (sizeof (ACE_Data_Block))),
-            ACE_Data_Block (size,
-                            ACE_Message_Block::MB_DATA,
-                            0,
-                            buffer_allocator,
-                            0,
-                            0,
-                            dblock_allocator),
-            0);
-    }
-
-  return nb;
-}
-
-ACE_Reactor *
-TAO_ORB_Core::reactor (void)
-{
-  if (this->use_tss_resources_)
-    {
-      TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
-
-      if (tss == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) %p\n",
-                           "TAO_ORB_Core::reactor (); no more TSS keys"),
-                          0);
-
-      if (tss->reactor_ == 0)
-        {
-          tss->reactor_ = this->resource_factory ()->get_reactor ();
-          tss->owns_resources_ = 1;
-        }
-      return tss->reactor_;
-    }
-
-  if (this->orb_resources_.reactor_ == 0)
-    {
-      // Double checked locking
-      ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0);
-      if (this->orb_resources_.reactor_ == 0)
-        {
-          this->orb_resources_.reactor_ =
-            this->resource_factory ()->get_reactor ();
-          this->orb_resources_.owns_resources_ = 1;
-        }
-    }
-  return this->orb_resources_.reactor_;
-}
-
-TAO_POA_Current &
-TAO_ORB_Core::poa_current (void) const
-{
-  return *this->poa_current_;
-}
-
-CORBA_Environment*
-TAO_ORB_Core::default_environment (void) const
-{
-  return TAO_TSS_RESOURCES::instance ()->default_environment_;
-}
-
-void
-TAO_ORB_Core::default_environment (CORBA_Environment *env)
-{
-  TAO_TSS_RESOURCES::instance ()->default_environment_ = env;
-}
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-
-TAO_Policy_Current &
-TAO_ORB_Core::policy_current (void)
-{
-  return this->policy_current_;
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
-// ****************************************************************
-
-TAO_ORB_Core_TSS_Resources::TAO_ORB_Core_TSS_Resources (void)
-  :  owns_resources_ (0),
-     reactor_ (0),
-     inherited_reactor_ (0),
-     output_cdr_dblock_allocator_ (0),
-     output_cdr_buffer_allocator_ (0),
-     output_cdr_msgblock_allocator_ (0),
-     input_cdr_dblock_allocator_ (0),
-     input_cdr_buffer_allocator_ (0),
-     connection_cache_ (0),
-     is_server_thread_ (0),
-     is_leader_thread_ (0)
-{
-}
-
-TAO_ORB_Core_TSS_Resources::~TAO_ORB_Core_TSS_Resources (void)
-{
-  if (!this->owns_resources_)
-    return;
-
-  if (!this->inherited_reactor_)
-    delete this->reactor_;
-  this->reactor_ = 0;
-
-  if (this->output_cdr_dblock_allocator_ != 0)
-    this->output_cdr_dblock_allocator_->remove ();
-  delete this->output_cdr_dblock_allocator_;
-
-  if (this->output_cdr_buffer_allocator_ != 0)
-    this->output_cdr_buffer_allocator_->remove ();
-  delete this->output_cdr_buffer_allocator_;
-
-  if (this->output_cdr_msgblock_allocator_ != 0)
-    this->output_cdr_msgblock_allocator_->remove ();
-  delete this->output_cdr_msgblock_allocator_;
-
-  if (this->input_cdr_dblock_allocator_ != 0)
-    this->input_cdr_dblock_allocator_->remove ();
-  delete this->input_cdr_dblock_allocator_;
-
-  if (this->input_cdr_buffer_allocator_ != 0)
-    this->input_cdr_buffer_allocator_->remove ();
-  delete this->input_cdr_buffer_allocator_;
-
-  // unimplemented delete this->connection_cache_;
-  this->connection_cache_ = 0;
-}
-
-// ****************************************************************
-
-TAO_TSS_Resources::TAO_TSS_Resources (void)
-  :  poa_current_impl_ (0),
-     default_environment_ (&this->tss_environment_)
-#if defined (TAO_HAS_CORBA_MESSAGING)
-     , policy_current_ (&this->initial_policy_current_)
-#endif /* TAO_HAS_CORBA_MESSAGING */
-{
-}
-
-TAO_TSS_Resources::~TAO_TSS_Resources (void)
-{
-}
-
-// ****************************************************************
-
-TAO_ORB_Table::TAO_ORB_Table (void)
-  : first_orb_ (0)
-{
-}
-
-TAO_ORB_Table::~TAO_ORB_Table (void)
-{
-  for (Iterator i = this->begin ();
-       i != this->end ();
-       i = this->begin ())
-    {
-      CORBA::release ((*i).int_id_->orb ());
-    }
-  this->table_.close ();
-}
-
-TAO_ORB_Table::Iterator
-TAO_ORB_Table::begin (void)
-{
-  return this->table_.begin ();
-}
-
-TAO_ORB_Table::Iterator
-TAO_ORB_Table::end (void)
-{
-  return this->table_.end ();
-}
-
-int
-TAO_ORB_Table::bind (const char *orb_id,
-                     TAO_ORB_Core *orb_core)
-{
-  if (this->first_orb_ == 0)
-    {
-      this->first_orb_ = orb_core;
-    }
-  ACE_CString id (orb_id);
-  return this->table_.bind (id, orb_core);
-}
-
-TAO_ORB_Core*
-TAO_ORB_Table::find (const char *orb_id)
-{
-  TAO_ORB_Core *found = 0;
-  ACE_CString id (orb_id);
-  this->table_.find (id, found);
-  return found;
-}
-
-int
-TAO_ORB_Table::unbind (const char *orb_id)
-{
-  ACE_CString id (orb_id);
-  TAO_ORB_Core *orb_core;
-  int result = this->table_.unbind (id, orb_core);
-  if (result == 0)
-    {
-      if (orb_core == this->first_orb_)
-        {
-          Iterator begin = this->begin ();
-          Iterator end = this->end ();
-          if (begin != end)
-            this->first_orb_ = (*begin).int_id_;
-        }
-    }
-  return result;
-}
-
-// ****************************************************************
-
-TAO_Export TAO_ORB_Core *
-TAO_ORB_Core_instance (void)
-{
-  // @@ This is a slight violation of layering, we should use
-  //    TAO_ORB_Core_instance(), but that breaks during startup.
-  TAO_ORB_Table *orb_table = TAO_ORB_Table::instance ();
-  if (orb_table->first_orb () == 0)
-    {
-      ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard,
-                                *ACE_Static_Object_Lock::instance (), 0));
-
-      if (orb_table->first_orb () == 0)
-        {
-          int argc = 0;
-          ACE_DECLARE_NEW_CORBA_ENV;
-          ACE_TRY
-            {
-              (void) CORBA::ORB_init (argc, 0, 0, ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-            }
-          ACE_CATCHANY
-            {
-              // @@ What should we do here?
-            }
-          ACE_ENDTRY;
-        }
-    }
-
-  return orb_table->first_orb ();
-}
-
-// ****************************************************************
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Reverse_Lock<ACE_SYNCH_MUTEX>;
-template class ACE_Guard<ACE_Reverse_Lock<ACE_SYNCH_MUTEX> >;
-
-template class ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> >;
-
-template class ACE_Env_Value<int>;
-template class ACE_Env_Value<u_int>;
-
-template class ACE_TSS_Singleton<TAO_TSS_Resources, ACE_SYNCH_MUTEX>;
-template class ACE_TSS<TAO_TSS_Resources>;
-template class ACE_TSS<TAO_ORB_Core_TSS_Resources>;
-
-template class ACE_Node<ACE_SYNCH_CONDITION*>;
-template class ACE_Unbounded_Set<ACE_SYNCH_CONDITION*>;
-template class ACE_Unbounded_Set_Iterator<ACE_SYNCH_CONDITION*>;
-
-template class ACE_Singleton<TAO_ORB_Table,ACE_SYNCH_MUTEX>;
-template class ACE_Map_Entry<ACE_CString,TAO_ORB_Core*>;
-template class ACE_Map_Manager<ACE_CString,TAO_ORB_Core*,ACE_Null_Mutex>;
-template class ACE_Map_Iterator_Base<ACE_CString,TAO_ORB_Core*,ACE_Null_Mutex>;
-template class ACE_Map_Iterator<ACE_CString,TAO_ORB_Core*,ACE_Null_Mutex>;
-template class ACE_Map_Reverse_Iterator<ACE_CString,TAO_ORB_Core*,ACE_Null_Mutex>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Reverse_Lock<ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Guard<ACE_Reverse_Lock<ACE_SYNCH_MUTEX> >
-
-#pragma instantiate ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> >
-
-#pragma instantiate ACE_Env_Value<int>
-#pragma instantiate ACE_Env_Value<u_int>
-
-#pragma instantiate ACE_TSS_Singleton<TAO_TSS_Resources, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_TSS<TAO_TSS_Resources>
-#pragma instantiate ACE_TSS<TAO_ORB_Core_TSS_Resources>
-
-#pragma instantiate ACE_Node<ACE_SYNCH_CONDITION*>
-#pragma instantiate ACE_Unbounded_Set<ACE_SYNCH_CONDITION*>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_SYNCH_CONDITION*>
-
-#pragma instantiate ACE_Singleton<TAO_ORB_Table,ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Map_Entry<ACE_CString,TAO_ORB_Core*>
-#pragma instantiate ACE_Map_Manager<ACE_CString,TAO_ORB_Core*,ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator_Base<ACE_CString,TAO_ORB_Core*,ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator<ACE_CString,TAO_ORB_Core*,ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<ACE_CString,TAO_ORB_Core*,ACE_Null_Mutex>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
deleted file mode 100644
index 966dcbdd3b6..00000000000
--- a/TAO/tao/ORB_Core.h
+++ /dev/null
@@ -1,673 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     orb_core.h
-//
-// = AUTHOR
-//     Chris Cleeland
-//
-// ============================================================================
-
-#ifndef TAO_ORB_CORE_H
-#define TAO_ORB_CORE_H
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Environment.h"
-#include "tao/Policy_Manager.h"
-#include "tao/Resource_Factory.h"
-#include "tao/params.h"
-#include "tao/POAC.h"
-#include "tao/GIOP.h"
-
-#include "ace/Map_Manager.h"
-#include "ace/Singleton.h"
-
-// Forward declarations
-class TAO_POA;
-class TAO_POA_Current;
-class TAO_POA_Current_Impl;
-class TAO_POA_Manager;
-class TAO_POA_Policies;
-class TAO_Acceptor;
-class TAO_Connector;
-class TAO_Acceptor_Registry;
-class TAO_Connector_Registry;
-
-class TAO_Resource_Factory;
-class TAO_Client_Strategy_Factory;
-class TAO_Server_Strategy_Factory;
-class TAO_Connection_Cache;
-class TAO_TSS_Resources;
-
-// ****************************************************************
-
-class TAO_Export TAO_ORB_Core_TSS_Resources
-{
-  // = TITLE
-  //   The TSS resoures of an ORB core.
-  //
-  // = DESCRIPTION
-  //   This class is used by the ORB_Core to store the resources
-  //   potentially bound to a thread in TSS storage.
-  //   The members are public because only the ORB Core is expected to
-  //   access them.
-  //
-public:
-  TAO_ORB_Core_TSS_Resources (void);
-  // constructor
-
-  ~TAO_ORB_Core_TSS_Resources (void);
-  // destructor
-
-  int owns_resources_;
-  // Set to 1 if this object owns the resources below
-
-  ACE_Reactor *reactor_;
-  // Used for responding to I/O reactively
-
-  int inherited_reactor_;
-  // The reactor was inherited from the spawning thread, do not delete
-
-  // = The rest of the resources are not currently in use, just a plan
-  //   for the future...
-
-  ACE_Allocator *output_cdr_dblock_allocator_;
-  ACE_Allocator *output_cdr_buffer_allocator_;
-  ACE_Allocator *output_cdr_msgblock_allocator_;
-  // The allocators for the output CDR streams.
-
-  ACE_Allocator *input_cdr_dblock_allocator_;
-  ACE_Allocator *input_cdr_buffer_allocator_;
-  // The allocators for the input CDR streams.
-
-  TAO_Connection_Cache *connection_cache_;
-  // This is is just a place holder, in the future the connection
-  // cache will be separated from the connectors and it will be a
-  // (potentially) TSS object.
-
-  int is_server_thread_;
-  // Is this thread a server for this ORB?
-
-  int is_leader_thread_;
-  // Is this thread a leader for this ORB?
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_Leader_Follower
-{
-public:
-  TAO_Leader_Follower (TAO_ORB_Core *orb_core);
-  // Constructor
-
-  void set_server_thread (void);
-  // The current thread has become a server thread (i.e. called
-  // ORB::run), update any flags and counters.
-
-  void reset_server_thread (void);
-  // The current thread is not a server thread anymore, reset any
-  // flags and counters.
-
-  int leader_available (void) const;
-  // Is there any thread running as a leader?
-
-  void set_client_thread (void);
-  // A server thread is making a request.
-
-  void reset_client_thread (void);
-  // A server thread has finished is making a request.
-
-  void set_leader_thread (void) ;
-  // The current thread has become the leader thread in the
-  // client side leader-follower set.
-
-  void reset_leader_thread (void) ;
-  // The current thread is no longer the leader thread in the client
-  // side leader-follower set.
-
-  void set_leader_thread (ACE_thread_t thread_ID);
-  // sets the thread ID of the leader thread in the leader-follower
-  // model
-
-  int is_leader_thread (void) const;
-  // checks if we are a leader thread
-
-  int elect_new_leader (void);
-  // A leader thread is relinquishing its role, unless there are more
-  // leader threads running pick up a follower (if there is any) to
-  // play the leader role.
-
-  int add_follower (ACE_SYNCH_CONDITION *follower_ptr);
-  // adds the a follower to the set of followers in the leader-
-  // follower model
-  // returns 0 on success, -1 on failure
-
-  int follower_available (void) const;
-  // checks for the availablity of a follower
-  // returns 1 on available, 0 else
-
-  int remove_follower (ACE_SYNCH_CONDITION *follower_ptr);
-  // removes a follower from the leader-follower set
-  // returns 0 on success, -1 on failure
-
-  ACE_SYNCH_CONDITION *get_next_follower (void);
-  // returns randomly a follower from the leader-follower set
-  // returns follower on success, else 0
-
-  ACE_SYNCH_MUTEX &lock (void);
-  ACE_Reverse_Lock<ACE_SYNCH_MUTEX> &reverse_lock (void);
-  // Accessors
-
-private:
-  TAO_ORB_Core_TSS_Resources *get_tss_resources (void) const;
-  // Shortcut to obtain the TSS resources of the orb core.
-
-private:
-  TAO_ORB_Core *orb_core_;
-  // The orb core
-
-  ACE_SYNCH_MUTEX lock_;
-  // do protect the access to the following three members
-
-  ACE_Reverse_Lock<ACE_SYNCH_MUTEX> reverse_lock_;
-  // do protect the access to the following three members
-
-  ACE_Unbounded_Set<ACE_SYNCH_CONDITION *> follower_set_;
-  // keep a set of followers around (protected)
-
-  int leaders_;
-  // Count the number of active leaders.
-  // There could be many leaders in the thread pool (i.e. calling
-  // ORB::run), and the same leader could show up multiple times as it
-  // receives nested upcalls and sends more requests.
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_ORB_Core
-{
-  // = TITLE
-  //    Encapsulates the state of an ORB.
-  //
-  // = DESCRIPTION
-  //   This is the implementation class for the CORBA::ORB interface.
-  //   The class also encapsulates the access to the ORB resources and
-  //   its state.
-  //   Some resources can be TSS or global, those resources are always
-  //   accessed through a TSS interface, but are allocated using the
-  //   Resource_Factory.  If the resource is really global the
-  //   Resource_Factory will simply return a pointer to the global
-  //   instance.
-  //
-  friend class CORBA_ORB;
-  friend CORBA::ORB_ptr CORBA::ORB_init (int &,
-                                         char *argv[],
-                                         const char *,
-                                         CORBA_Environment &);
-
-public:
-  // = Initialization and termination methods.
-  TAO_ORB_Core (const char* id);
-  // Constructor.
-
-  ~TAO_ORB_Core (void);
-  // Destructor
-
-  TAO_ORB_Parameters *orb_params (void);
-  // Accessor for the ORB parameters.
-
-  TAO_POA_Current &poa_current (void) const;
-  // Accessor to the POA current.
-
-  // = Get the connector registry
-  TAO_Connector_Registry *connector_registry (void);
-
-  // = Get the acceptor registry
-  TAO_Acceptor_Registry  *acceptor_registry  (void);
-
-  // = Get the protocol factories
-  TAO_ProtocolFactorySet *protocol_factories (void);
-
-  // = Set/get pointer to the ORB.
-  CORBA::ORB_ptr orb (CORBA::ORB_ptr);
-  CORBA::ORB_ptr orb (void);
-
-  // = Set/get the <ACE_Reactor>.
-  ACE_Reactor *reactor (void);
-
-  // = Set/get the <ACE_Thread_Manager>.
-  ACE_Thread_Manager *thr_mgr (void);
-
-  // = Set/get <rootPOA>.
-  TAO_POA *root_poa (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment (),
-                     const char *adapter_name = TAO_DEFAULT_ROOTPOA_NAME,
-                     TAO_POA_Manager *poa_manager = 0,
-                     const TAO_POA_Policies *policies = 0);
-  PortableServer::POA_ptr root_poa_reference (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment (),
-                                              const char *adapter_name = TAO_DEFAULT_ROOTPOA_NAME,
-                                              TAO_POA_Manager *poa_manager = 0,
-                                              const TAO_POA_Policies *policies = 0);
-
-  // = Collocation strategies.
-  enum {
-    ORB_CONTROL,                // Indicate object should refer to ORB for either one of the following strategies.
-    THRU_POA,                   // Collocated calls will go thru POA.
-    DIRECT                      // Collocated calls invoke operation on Servant directly.
-  };
-
-  // = Get the default codeset translators.
-  //   In most configurations these are just <nil> objects, but they
-  //   can be set to something different if the native character sets
-  //   are not ISO8869 (aka Latin/1, UTF-8) and UNICODE (aka UTF-16).
-
-  ACE_Char_Codeset_Translator *from_iso8859 (void) const;
-  // Convert from ISO8859 to the native character set
-
-  ACE_Char_Codeset_Translator *to_iso8859 (void) const;
-  // Convert from the native character set to ISO8859
-
-  ACE_WChar_Codeset_Translator *from_unicode (void) const;
-  // Convert from UNICODE to the native wide character set
-
-  ACE_WChar_Codeset_Translator *to_unicode (void) const;
-  // Convert from the native wide character set to UNICODE
-
-  TAO_GIOP_ServiceContextList& service_context (void);
-  // Obtain the service context list used to send requests...
-
-  // @@ This is just note on how could the translator database be
-  //    implemented: use the service configurator to load the
-  //    translator, and then use the CodesetId (an unsigned long) to
-  //    translate the character set code into the Service Object
-  //    name.
-  //    The default resource factory could parse command line options
-  //    like:
-  //    -ORBcharcodeset 0x00010001=ISO8859
-  //    -ORBcharcodeset 0x10020417=IBM1047
-  //    -ORBwcharcodeset 0x00010106=ISOIEC10646
-  //    that would let the user experiment with different translators
-  //    and plug them in on demand.
-  //
-  //    We should also think about how translators will report
-  //    conversion failures and how to simplify the implementation of
-  //    char translators (it would seem like just a couple of arrays
-  //    are needed, maybe the arrays should be dynamically loaded and
-  //    the implementation would remain constant?  Just a thought
-
-  // = Set/get the collocation flags
-  void optimize_collocation_objects (CORBA::Boolean opt);
-  CORBA::Boolean optimize_collocation_objects (void) const;
-
-  void use_global_collocation (CORBA::Boolean opt);
-  CORBA::Boolean use_global_collocation (void) const;
-
-  CORBA::ULong get_collocation_strategy (void) const;
-
-  TAO_Object_Adapter *object_adapter (void);
-  // Get <Object Adapter>.
-
-  int inherit_from_parent_thread (TAO_ORB_Core_TSS_Resources *tss_resources);
-  // A spawned thread needs to inherit some properties/objects from
-  // the spawning thread in order to serve requests.  Return 0 if
-  // it successfully inherits from the parent, -1 otherwise.
-
-  // = Access to Factories.
-  //
-  // These factories are not thread-specific, and are presented here
-  // in order to have one place to get useful information.  Often, the
-  // instances to which the return pointers are stored in the Service
-  // Repository.
-
-  TAO_Resource_Factory *resource_factory (void);
-  // Returns pointer to the resource factory.
-
-  TAO_Client_Strategy_Factory *client_factory (void);
-  // Returns pointer to the client factory.
-
-  TAO_Server_Strategy_Factory *server_factory (void);
-  // Returns pointer to the server factory.
-
-  int is_collocated (const TAO_MProfile& mprofile);
-  // See if we have a collocated address, if yes, return the POA
-  // associated with the address.
-
-  int add_to_ior_table (ACE_CString init_ref, TAO_IOR_LookupTable &table);
-  // Add the init_ref (objectID->IOR) to the Lookup Table
-
-  ACE_Allocator *output_cdr_dblock_allocator (void);
-  // This allocator is always TSS and has no locks. It is intended for
-  // allocating the ACE_Data_Blocks used in *outgoing* CDR streams.
-
-  ACE_Allocator *output_cdr_buffer_allocator (void);
-  // This allocator is always TSS and has no locks. It is intended for
-  // allocating the buffers used in *outgoing* CDR streams.
-
-  ACE_Allocator *input_cdr_dblock_allocator (void);
-  // This allocator maybe TSS or global, may or may not have locks. It
-  // is intended for allocating the ACE_Data_Blocks used in *outgoing*
-  // CDR streams.
-
-  ACE_Allocator *input_cdr_buffer_allocator (void);
-  // This allocator is always TSS and has no locks. It is intended for
-  // allocating the buffers used in *outgoing* CDR streams.
-
-  ACE_Data_Block *create_input_cdr_data_block (size_t size);
-  // The Message Blocks used for input CDRs must have appropiate
-  // locking strategies.
-
-  CORBA_Environment *default_environment (void) const;
-  void default_environment (CORBA_Environment*);
-  // The thread has a default environment to simplify porting between
-  // platforms that support native C++ exceptions and those that
-  // don't. This is a TSS resource (always), but with a twist: if the
-  // user creates a new environment the old one is "pushed" (actually
-  // the new one remembers it), eventually the new environment
-  // destructor pops itself from the stack and we recover the old
-  // environment.
-  // This means that if the user create a new environment and somebody
-  // calls a function using the default one the exception will still
-  // be received in the environment created by the user.
-  // The only drawback is that environments life time must nest
-  // properly, this shouldn't be a problem because environments are
-  // usually created on the stack, but, the spec allows their creation
-  // on the heap and/or as class members; we need to investigate the
-  // tradeoffs and take a decision.
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-  TAO_Policy_Manager *policy_manager (void);
-  // Return the Policy_Manager for this ORB.
-
-  TAO_Policy_Current &policy_current (void);
-  // Accesors to the policy current, this object should be kept in TSS
-  // storage.  The POA has to reset the policy current object on every
-  // upcall.
-
-  CORBA::Policy_ptr get_default_policy (
-      CORBA::PolicyType policy,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ());
-  // Accesor to obtain the default policy for a particular policy
-  // type.
-  // If there is no default policy it returns CORBA::Policy::_nil ()
-
-  POA_Messaging::RelativeRoundtripTimeoutPolicy*
-      default_relative_roundtrip_timeout (void) const;
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
-  TAO_ORB_Core_TSS_Resources* get_tss_resources (void);
-  // Obtain the TSS resources of this orb.
-
-  TAO_Leader_Follower &leader_follower (void);
-  // Get access to the leader_follower class
-
-  int run (ACE_Time_Value *tv, int break_on_timeouts);
-  // Run the event loop
-
-protected:
-  int set_iiop_endpoint (int dotted_decimal_addresses,
-                         CORBA::UShort port,
-                         ACE_CString &host,
-                         ACE_CString &iiop_endpoint);
-  // Set the endpoint
-
-  int init (int &argc, char **argv);
-  // Initialize the guts of the ORB Core.  It is intended that this be
-  // called by <CORBA::ORB_init>.
-
-  int fini (void);
-  // Final termination hook, typically called by CORBA::ORB's DTOR.
-
-  void create_and_set_root_poa (const char *adapter_name,
-                                TAO_POA_Manager *poa_manager,
-                                const TAO_POA_Policies *policies,
-                                CORBA::Environment &ACE_TRY_ENV);
-  // Initialize the root POA.
-
-  TAO_Object_Adapter *object_adapter_i (void);
-  // Get <Object Adapter>, assume the lock is held...
-
-protected:
-  ACE_SYNCH_MUTEX lock_;
-  // Synchronize internal state...
-
-  // = Data members.
-
-  TAO_Connector_Registry *connector_registry_;
-  // The connector registry which all active connecters must register
-  // themselves with.
-
-  TAO_Acceptor_Registry *acceptor_registry_;
-  // The registry which maintains a list of acceptor factories for each
-  // loaded protocol.
-
-  TAO_ProtocolFactorySet *protocol_factories_;
-  // Pointer to the list of protocol loaded into this ORB instance.
-
-  CORBA::ORB_ptr orb_;
-  // @@ Should we keep a single ORB pointer? This is good because
-  //    multiple calls to ORB_init() with the same ORBid can use the
-  //    same object, but maybe don't want so much coupling.
-  // Pointer to the ORB.
-
-  TAO_POA *root_poa_;
-  // Pointer to the root POA.  It will eventually be the pointer
-  // returned by calls to <CORBA::ORB::resolve_initial_references
-  // ("RootPOA")>.
-
-  PortableServer::POA_var root_poa_reference_;
-  // Cached POA reference
-
-  TAO_ORB_Parameters *orb_params_;
-  // Parameters used by the ORB.
-
-  char* orbid_;
-  // The ORBid for this ORB.
-
-  TAO_Resource_Factory *resource_factory_;
-  // Handle to the factory for resource information..
-
-  CORBA::Boolean resource_factory_from_service_config_;
-  // TRUE if <resource_factory_> was obtained from the Service
-  // Configurator.
-  // @@ This is not needed since the default resource factory
-  //    is staticaly added to the service configurator.
-
-  TAO_Client_Strategy_Factory *client_factory_;
-  // Handle to the factory for Client-side strategies.
-
-  CORBA::Boolean client_factory_from_service_config_;
-  // TRUE if <client_factory_> was obtained from the Service
-  // Configurator.
-  // @@ This is not needed since the client facotry factory
-  //    is staticaly added to the service configurator.
-
-  TAO_Server_Strategy_Factory *server_factory_;
-  // Handle to the factory for Server-side strategies.
-
-  CORBA::Boolean server_factory_from_service_config_;
-  // TRUE if <server_factory_> was obtained from the Service
-  // Configurator.
-  // @@ This is not needed since the server factory factory
-  //    is staticaly added to the service configurator.
-
-  CORBA::Boolean opt_for_collocation_;
-  // TRUE if we want to take advantage of collocation optimization in
-  // this ORB.
-
-  CORBA::Boolean use_global_collocation_;
-  // TRUE if we want to consider all ORBs in this address space
-  // collocated.
-
-  CORBA::ULong collocation_strategy_;
-  // Default collocation policy.  This should never be ORB_CONTROL.
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-  TAO_Policy_Manager policy_manager_;
-  // The Policy_Manager for this ORB.
-
-  TAO_Policy_Manager_Impl default_policies_;
-  // The default policies.
-
-  TAO_Policy_Current policy_current_;
-  // Policy current.
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
-  TAO_POA_Current *poa_current_;
-  // POA current.
-  //
-  // Note that this is a pointer in order to reduce the include file
-  // dependencies.
-  //
-
-  TAO_Object_Adapter *object_adapter_;
-  // Object Adapter.
-
-  ACE_Thread_Manager tm_;
-  // The Thread Manager
-
-  ACE_Char_Codeset_Translator *from_iso8859_;
-  ACE_Char_Codeset_Translator *to_iso8859_;
-  ACE_WChar_Codeset_Translator *from_unicode_;
-  ACE_WChar_Codeset_Translator *to_unicode_;
-  // Codeset translators for simple implementations.
-
-  int use_tss_resources_;
-  // If 1 then this ORB uses thread-specific resources
-
-  ACE_TSS_TYPE (TAO_ORB_Core_TSS_Resources) tss_resources_;
-  // This is where the tss resources for this ORB are stored.
-
-  TAO_ORB_Core_TSS_Resources orb_resources_;
-  // If the resources are per-ORB (as opposed to per-ORB-per-thread)
-  // then they are stored here...
-
-  // @@ TODO: the service context list may need to be in TSS
-  //    storage...
-  // NOTE: this is only used to *send* requests, not to store the
-  // service context list of a reply...
-  TAO_GIOP_ServiceContextList service_context_;
-
-  TAO_Leader_Follower leader_follower_;
-  // Information about the leader follower model
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_TSS_Resources
-{
-  // = TITLE
-  //   The TSS resoures shared by all the ORBs
-  //
-  // = DESCRIPTION
-  //   This class is used by TAO to store the resources that are
-  //   thread-specific but are *not* ORB specific...
-  //   The members are public because only the ORB Core is expected to
-  //   access them.
-  //
-public:
-  TAO_TSS_Resources (void);
-  // constructor
-
-  ~TAO_TSS_Resources (void);
-  // destructor
-
-  TAO_POA_Current_Impl *poa_current_impl_;
-  // Points to structure containing state for the current upcall
-  // context in this thread.  Note that it does not come from the
-  // resource factory because it must always be held in
-  // thread-specific storage.  For now, since TAO_ORB_Core instances
-  // are TSS singletons, we simply ride along and don't allocate
-  // occupy another TSS slot since there are some platforms where
-  // those are precious commodities (e.g., NT).
-
-  CORBA_Environment* default_environment_;
-  // The default environment for the thread.
-
-  CORBA_Environment tss_environment_;
-  // If the user (or library) provides no environment the ORB_Core
-  // still holds one.
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-  TAO_Policy_Current_Impl initial_policy_current_;
-  // The initial PolicyCurrent for this thread. Should be a TSS
-  // resource.
-
-  TAO_Policy_Current_Impl *policy_current_;
-  // This pointer is reset by the POA on each upcall.
-#endif /* TAO_HAS_CORBA_MESSAGING */
-};
-
-// @@ Must go away....
-typedef ACE_TSS_Singleton<TAO_TSS_Resources, ACE_SYNCH_MUTEX>
-        TAO_TSS_RESOURCES;
-
-// ****************************************************************
-
-class TAO_Export TAO_ORB_Table
-{
-  // = TITLE
-  //   Keep a table with all the ORBs in the system.
-  //
-  // = DESCRIPTION
-  //   CORBA::ORB_init() is supposed to return the same ORB if the
-  //   user specifies the same ORBid, either in the ORB_init()
-  //   parameter or in the -ORBid option.
-  //   This class is used to implement that feature.
-  //   It is also useful when trying to determine if an object
-  //   reference is collocated or not.
-  //
-public:
-  ~TAO_ORB_Table (void);
-  // destructor
-
-  // @@ Ossama, we may use a Hash_Map_Manager and use "const char*"
-  //    instead of ACE_CString to speed things up.
-  typedef ACE_Map_Manager<ACE_CString,TAO_ORB_Core*,ACE_Null_Mutex> Table;
-  typedef Table::iterator Iterator;
-
-  Iterator begin (void);
-  Iterator end (void);
-  int bind (const char* orb_id, TAO_ORB_Core* orb_core);
-  TAO_ORB_Core* find (const char* orb_id);
-  int unbind (const char* orb_id);
-  // The canonical ACE_Map methods.
-
-  TAO_ORB_Core *first_orb (void);
-  // Obtain the first ORB for the ORB_Core_instance() implementation
-
-  static TAO_ORB_Table* instance (void);
-  // Return a unique instance
-
-protected:
-  friend class ACE_Singleton<TAO_ORB_Table,ACE_SYNCH_MUTEX>;
-  TAO_ORB_Table (void);
-  // Constructor
-
-private:
-  Table table_;
-  // The implementation.
-
-  TAO_ORB_Core *first_orb_;
-  // The first ORB created by the user
-};
-
-// ****************************************************************
-
-extern TAO_Export TAO_ORB_Core *TAO_ORB_Core_instance (void);
-
-#if defined (__ACE_INLINE__)
-# include "tao/ORB_Core.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_ORB_CORE_H */
diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i
deleted file mode 100644
index 150c55df3e9..00000000000
--- a/TAO/tao/ORB_Core.i
+++ /dev/null
@@ -1,308 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "ace/Dynamic_Service.h"
-
-ACE_INLINE ACE_Thread_Manager *
-TAO_ORB_Core::thr_mgr (void)
-{
-  return &this->tm_;
-}
-
-ACE_INLINE CORBA::ORB_ptr
-TAO_ORB_Core::orb (void)
-{
-  return this->orb_;
-}
-
-ACE_INLINE TAO_POA *
-TAO_ORB_Core::root_poa (CORBA::Environment &ACE_TRY_ENV,
-                        const char *adapter_name,
-                        TAO_POA_Manager *poa_manager,
-                        const TAO_POA_Policies *policies)
-{
-  if (this->root_poa_ == 0)
-    {
-      this->create_and_set_root_poa (adapter_name,
-                                     poa_manager,
-                                     policies,
-                                     ACE_TRY_ENV);
-    }
-  return this->root_poa_;
-}
-
-ACE_INLINE void
-TAO_ORB_Core::optimize_collocation_objects (CORBA::Boolean opt)
-{
-  this->opt_for_collocation_ = opt;
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_ORB_Core::optimize_collocation_objects (void) const
-{
-  return this->opt_for_collocation_;
-}
-
-ACE_INLINE void
-TAO_ORB_Core::use_global_collocation (CORBA::Boolean opt)
-{
-  this->use_global_collocation_ = opt;
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_ORB_Core::use_global_collocation (void) const
-{
-  return this->use_global_collocation_;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_ORB_Core::get_collocation_strategy (void) const
-{
-  return this->collocation_strategy_;
-}
-
-ACE_INLINE
-TAO_ORB_Parameters *
-TAO_ORB_Core::orb_params(void)
-{
-  return this->orb_params_;
-}
-
-#define TAO_OC_RETRIEVE(member) \
-  ((this->member##_ == 0) ? (this->member##_ = this->resource_factory ()->get_##member ()) : (this->member##_) )
-
-ACE_INLINE TAO_ProtocolFactorySet *
-TAO_ORB_Core::protocol_factories (void)
-{
-  return TAO_OC_RETRIEVE (protocol_factories);
-}
-
-ACE_INLINE TAO_Connector_Registry *
-TAO_ORB_Core::connector_registry (void)
-{
-  return TAO_OC_RETRIEVE (connector_registry);
-}
-
-ACE_INLINE TAO_Acceptor_Registry *
-TAO_ORB_Core::acceptor_registry (void)
-{
-  return TAO_OC_RETRIEVE (acceptor_registry);
-}
-
-#undef TAO_OC_RETRIEVE
-
-ACE_INLINE ACE_Char_Codeset_Translator *
-TAO_ORB_Core::from_iso8859 (void) const
-{
-  return this->from_iso8859_;
-}
-
-ACE_INLINE ACE_Char_Codeset_Translator *
-TAO_ORB_Core::to_iso8859 (void) const
-{
-  return this->to_iso8859_;
-}
-
-ACE_INLINE ACE_WChar_Codeset_Translator *
-TAO_ORB_Core::from_unicode (void) const
-{
-  return this->from_unicode_;
-}
-
-ACE_INLINE ACE_WChar_Codeset_Translator *
-TAO_ORB_Core::to_unicode (void) const
-{
-  return this->to_unicode_;
-}
-
-ACE_INLINE TAO_GIOP_ServiceContextList&
-TAO_ORB_Core::service_context (void)
-{
-  return this->service_context_;
-}
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-ACE_INLINE TAO_Policy_Manager*
-TAO_ORB_Core::policy_manager (void)
-{
-  return &this->policy_manager_;
-}
-
-ACE_INLINE CORBA::Policy_ptr
-TAO_ORB_Core::get_default_policy (
-      CORBA::PolicyType policy,
-      CORBA::Environment &ACE_TRY_ENV)
-{
-  return this->default_policies_.get_policy (policy, ACE_TRY_ENV);
-}
-
-ACE_INLINE POA_Messaging::RelativeRoundtripTimeoutPolicy*
-TAO_ORB_Core::default_relative_roundtrip_timeout (void) const
-{
-  return this->default_policies_.relative_roundtrip_timeout ();
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
-ACE_INLINE TAO_ORB_Core_TSS_Resources*
-TAO_ORB_Core::get_tss_resources (void)
-{
-  return ACE_TSS_GET (&this->tss_resources_,TAO_ORB_Core_TSS_Resources);
-}
-
-ACE_INLINE TAO_Leader_Follower &
-TAO_ORB_Core::leader_follower (void)
-{
-  return this->leader_follower_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_Leader_Follower::TAO_Leader_Follower (TAO_ORB_Core* orb_core)
-  : orb_core_ (orb_core),
-    reverse_lock_ (lock_),
-    leaders_ (0)
-{
-}
-
-ACE_INLINE TAO_ORB_Core_TSS_Resources *
-TAO_Leader_Follower::get_tss_resources (void) const
-{
-  return this->orb_core_->get_tss_resources ();
-}
-
-ACE_INLINE void
-TAO_Leader_Follower::set_server_thread (void)
-{
-  // Set the TSS flag to remember that we are a leader thread...
-  TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
-  tss->is_server_thread_ = 1;
-
-  ++this->leaders_;
-}
-
-ACE_INLINE void
-TAO_Leader_Follower::reset_server_thread (void)
-{
-  // Set the TSS flag to remember that we are a leader thread...
-  TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
-  tss->is_server_thread_ = 0;
-
-  --this->leaders_;
-}
-
-ACE_INLINE int
-TAO_Leader_Follower::leader_available (void) const
-{
-  return this->leaders_ != 0;
-}
-
-ACE_INLINE void
-TAO_Leader_Follower::set_client_thread (void)
-{
-  // Set the TSS flag to remember that we are a leader thread...
-  TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
-  if (tss->is_server_thread_)
-    {
-      --this->leaders_;
-    }
-}
-
-ACE_INLINE void
-TAO_Leader_Follower::reset_client_thread (void)
-{
-  // Set the TSS flag to remember that we are a leader thread...
-  TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
-  if (tss->is_server_thread_)
-    {
-      ++this->leaders_;
-    }
-}
-
-ACE_INLINE void
-TAO_Leader_Follower::set_leader_thread (void)
-{
-  TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
-  if (tss->is_leader_thread_ == 0)
-    {
-      ++this->leaders_;
-    }
-  ++tss->is_leader_thread_;
-}
-
-ACE_INLINE void
-TAO_Leader_Follower::reset_leader_thread (void)
-{
-  TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
-  --tss->is_leader_thread_;
-  if (tss->is_leader_thread_ == 0)
-    {
-      --this->leaders_;
-    }
-}
-
-ACE_INLINE int
-TAO_Leader_Follower::is_leader_thread (void) const
-{
-  TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
-  return tss->is_leader_thread_ != 0;
-}
-
-ACE_INLINE int
-TAO_Leader_Follower::follower_available (void) const
-{
-  return !this->follower_set_.is_empty ();
-}
-
-ACE_INLINE int
-TAO_Leader_Follower::elect_new_leader (void)
-{
-  if (this->leaders_ == 0 && this->follower_available ())
-    {
-      ACE_SYNCH_CONDITION* condition_ptr = this->get_next_follower ();
-      if (condition_ptr == 0 || condition_ptr->signal () == -1)
-        return -1;
-    }
-  return 0;
-}
-
-ACE_INLINE int
-TAO_Leader_Follower::add_follower (ACE_SYNCH_CONDITION *follower_ptr)
-{
-  if (this->follower_set_.insert (follower_ptr) != 0)
-    return -1;
-  return 0;
-}
-
-ACE_INLINE int
-TAO_Leader_Follower::remove_follower (ACE_SYNCH_CONDITION *follower_ptr)
-{
-  return this->follower_set_.remove (follower_ptr);
-}
-
-ACE_INLINE ACE_SYNCH_MUTEX &
-TAO_Leader_Follower::lock (void)
-{
-  return this->lock_;
-}
-
-ACE_INLINE ACE_Reverse_Lock<ACE_SYNCH_MUTEX> &
-TAO_Leader_Follower::reverse_lock (void)
-{
-  return this->reverse_lock_;
-}
-
-// ****************************************************************
-
-ACE_INLINE TAO_ORB_Table *
-TAO_ORB_Table::instance (void)
-{
-  return ACE_Singleton<TAO_ORB_Table, ACE_SYNCH_MUTEX>::instance ();
-}
-
-ACE_INLINE TAO_ORB_Core *
-TAO_ORB_Table::first_orb (void)
-{
-  return this->first_orb_;
-}
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
deleted file mode 100644
index baf921940a9..00000000000
--- a/TAO/tao/Object.cpp
+++ /dev/null
@@ -1,592 +0,0 @@
-// @(#) $Id$
-//
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// ORB:         CORBA_Object operations
-
-#include "tao/Object.h"
-#include "tao/Object_Adapter.h"
-#include "tao/Stub.h"
-#include "tao/Servant_Base.h"
-#include "tao/Request.h"
-#include "tao/varout.h"
-#include "tao/GIOP.h"
-#include "tao/ORB_Core.h"
-#include "tao/Invocation.h"
-#include "tao/Connector_Registry.h"
-#include "tao/debug.h"
-#include "ace/Auto_Ptr.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Object.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, Object, "$Id$")
-
-CORBA_Object::~CORBA_Object (void)
-{
-  if (this->protocol_proxy_)
-    this->protocol_proxy_->_decr_refcnt ();
-}
-
-CORBA_Object::CORBA_Object (TAO_Stub *protocol_proxy,
-                            TAO_ServantBase *servant,
-                            CORBA::Boolean collocated)
-  : servant_ (servant),
-    is_collocated_ (collocated),
-    protocol_proxy_ (protocol_proxy),
-    refcount_ (1)
-{
-  // Notice that the refcount_ above is initialized to 1 because
-  // the semantics of CORBA Objects are such that obtaining one
-  // implicitly takes a reference.
-}
-
-// IS_A ... ask the object if it's an instance of the type whose
-// logical type ID is passed as a parameter.
-
-CORBA::Boolean
-CORBA_Object::_is_a (const CORBA::Char *type_id,
-                     CORBA::Environment &ACE_TRY_ENV)
-{
-  // If the object is collocated then try locally....
-  if (this->is_collocated_)
-    {
-      // Which collocation strategy should we use?
-      if (this->protocol_proxy_->servant_orb_var ()->orb_core ()->get_collocation_strategy () == TAO_ORB_Core::THRU_POA)
-        {
-          TAO_Object_Adapter::Servant_Upcall servant_upcall
-            (*this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ());
-          servant_upcall.prepare_for_upcall (this->_object_key (),
-                                             "_non_existent",
-                                             ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-          return servant_upcall.servant ()->_is_a (type_id, ACE_TRY_ENV);
-        }
-
-      // Direct collocation strategy is used.
-      if (this->servant_ != 0)
-        return this->servant_->_is_a (type_id, ACE_TRY_ENV);
-    }
-  // NOTE: if istub->type_id is nonzero and we have local knowledge of
-  // it, we can answer this question without a costly remote call.
-  //
-  // That "local knowledge" could come from stubs or skeletons linked
-  // into this process in the best case, or a "near" repository in a
-  // slightly worse case.  Or in a trivial case, if the ID being asked
-  // about is the ID we have recorded, we don't need to ask about the
-  // inheritance relationships at all!
-  //
-  // In real systems having local knowledge will be common, though as
-  // the systems built atop ORBs become richer it'll also become
-  // common to have the "real type ID" not be directly understood
-  // because it's more deeply derived than any locally known types.
-  //
-  // XXX if type_id is that of CORBA_Object, "yes, we comply" :-)
-
-  if ( ACE_static_cast(const char *, this->_stubobj ()->type_id) != 0
-      && ACE_OS::strcmp ((char *) type_id, (char *) this->_stubobj ()->type_id) == 0)
-    return 1;
-
-  CORBA::Boolean _tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_is_a",
-      istub->orb_core ()
-    );
-
-
-  // Loop until we succeed or we raise an exception.
-  // @@ Nanbor: Do we still need to clear the environment variable?
-  //  ACE_TRY_ENV.clear ();
-  for (;;)
-    {
-      _tao_call.start (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (_tao_retval);
-
-      TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-      if (!(
-          (_tao_out << type_id)
-      ))
-        ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-      int _invoke_status =
-        _tao_call.invoke (0, 0, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (_tao_retval);
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        continue;
-      // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-        // cannot happen
-      if (_invoke_status != TAO_INVOKE_OK)
-      {
-        ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-      }
-      break;
-    }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(_tao_in >> CORBA::Any::to_boolean (_tao_retval)))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-const char*
-CORBA_Object::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/Object:1.0";
-}
-
-TAO_ServantBase *
-CORBA_Object::_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean
-CORBA_Object::_is_collocated (void) const
-{
-  return this->is_collocated_;
-}
-
-// Quickly hash an object reference's representation data.  Used to
-// create hash tables.
-
-CORBA::ULong
-CORBA_Object::_hash (CORBA::ULong maximum,
-                     CORBA::Environment &ACE_TRY_ENV)
-{
-  return this->_stubobj ()->hash (maximum, ACE_TRY_ENV);
-}
-
-// Compare two object references to see if they point to the same
-// object.  Used in linear searches, as in hash buckets.
-//
-// XXX would be useful to also have a trivalued comparison predicate,
-// such as strcmp(), to allow more comparison algorithms.
-
-CORBA::Boolean
-CORBA_Object::_is_equivalent (CORBA_Object_ptr other_obj,
-                              CORBA::Environment &)
-    ACE_THROW_SPEC (())
-{
-  if (other_obj == this)
-    {
-      return 1;
-    }
-
-  return this->_stubobj ()->is_equivalent (other_obj);
-}
-
-// TAO's extensions
-
-TAO_ObjectKey *
-CORBA::Object::_key (CORBA::Environment &)
-{
-  if (this->_stubobj () && this->_stubobj ()->profile_in_use ())
-    return this->_stubobj ()->profile_in_use ()->_key ();
-
-  ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Null stub obj!!!\n"), 0);
-}
-
-const TAO_ObjectKey &
-CORBA::Object::_object_key (void)
-{
-  return this->_stubobj ()->profile_in_use ()->object_key ();
-}
-
-// @@ This doesn't seemed to be used anyplace! It should go away!! FRED
-void
-CORBA::Object::_use_locate_requests (CORBA::Boolean use_it)
-{
-  if ( this->_stubobj () )
-    this->_stubobj ()->use_locate_requests (use_it);
-
-  return;
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-// NON_EXISTENT ... send a simple call to the object, which will
-// either elicit a FALSE response or a OBJECT_NOT_EXIST exception.  In
-// the latter case, return FALSE.
-
-CORBA::Boolean
-CORBA_Object::_non_existent (CORBA::Environment &ACE_TRY_ENV)
-{
-  // If the object is collocated then try locally....
-  if (this->is_collocated_ && this->servant_ != 0)
-    return this->servant_->_non_existent (ACE_TRY_ENV);
-
-  CORBA::Boolean _tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_non_existent",
-      istub->orb_core ()
-    );
-
-
-  // ACE_TRY_ENV.clear ();
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-  return _tao_retval;
-}
-
-void
-CORBA_Object::_create_request (CORBA::Context_ptr ctx,
-                               const CORBA::Char *operation,
-                               CORBA::NVList_ptr arg_list,
-                               CORBA::NamedValue_ptr result,
-                               CORBA::Request_ptr &request,
-                               CORBA::Flags req_flags,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  // Since we don't really support Context, anything but a null pointer
-  // is a no-no.
-  if (ctx)
-    {
-      ACE_THROW (CORBA::NO_IMPLEMENT ());
-    }
-  request = new CORBA::Request (this,
-                                operation,
-                                arg_list,
-                                result,
-                                req_flags,
-                                ACE_TRY_ENV);
-}
-
-void
-CORBA_Object::_create_request (CORBA::Context_ptr ctx,
-                               const CORBA::Char *operation,
-                               CORBA::NVList_ptr arg_list,
-                               CORBA::NamedValue_ptr result,
-                               CORBA::ExceptionList_ptr,
-                               CORBA::ContextList_ptr,
-                               CORBA::Request_ptr &request,
-                               CORBA::Flags req_flags,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  // Since we don't really support Context, anything but a null pointer
-  // is a no-no.
-  if (ctx)
-    {
-      ACE_THROW (CORBA::NO_IMPLEMENT ());
-    }
-  request = new CORBA::Request (this,
-                                operation,
-                                arg_list,
-                                result,
-                                req_flags,
-                                ACE_TRY_ENV);
-}
-
-CORBA::Request_ptr
-CORBA_Object::_request (const CORBA::Char *operation,
-                        CORBA::Environment &ACE_TRY_ENV)
-{
-  //  ACE_TRY_ENV.clear ();
-  return new CORBA::Request (this,
-                             operation,
-                             ACE_TRY_ENV);
-}
-
-CORBA::InterfaceDef_ptr
-CORBA_Object::_get_interface (CORBA::Environment &ACE_TRY_ENV)
-{
-  // @@ TODO this method will require some modifications once the
-  // interface repository is implemented. The modifications are
-  // documented with @@ comments.
-
-  // @@ this should use the _nil() method...
-  CORBA::InterfaceDef_ptr _tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_interface",
-      istub->orb_core ()
-    );
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-  }
-
-#if 0
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  // @@ The extraction operation (>>) for InterfaceDef will be
-  // defined, and thus this code will work. Right now we raise a
-  // MARSHAL exception....
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-#else
-    ACE_UNUSED_ARG (_tao_retval);
-    ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-#endif
-}
-
-CORBA::ImplementationDef_ptr
-CORBA_Object::_get_implementation (CORBA::Environment &)
-{
-  return 0;
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-// ****************************************************************
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-CORBA::Policy_ptr
-CORBA_Object::_get_policy (
-    CORBA::PolicyType type,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  return this->_stubobj ()->get_policy (type, ACE_TRY_ENV);
-}
-
-CORBA::Policy_ptr
-CORBA_Object::_get_client_policy (
-    CORBA::PolicyType type,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  return this->_stubobj ()->get_client_policy (type, ACE_TRY_ENV);
-}
-
-CORBA::Object_ptr
-CORBA_Object::_set_policy_overrides (
-    const CORBA::PolicyList & policies,
-    CORBA::SetOverrideType set_add,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Stub* stub =
-    this->_stubobj ()->set_policy_overrides (policies,
-                                             set_add,
-                                             ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  return new CORBA_Object (stub,
-                           this->servant_,
-                           this->is_collocated_);
-}
-
-CORBA::PolicyList *
-CORBA_Object::_get_policy_overrides (
-    const CORBA::PolicyTypeSeq & types,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  return this->_stubobj ()->get_policy_overrides (types, ACE_TRY_ENV);
-}
-
-CORBA::Boolean
-CORBA_Object::_validate_connection (
-    CORBA::PolicyList_out inconsistent_policies,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  return this->_stubobj ()->validate_connection (inconsistent_policies,
-                                                 ACE_TRY_ENV);
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
-// ****************************************************************
-
-CORBA::Boolean
-operator<< (TAO_OutputCDR& cdr, const CORBA_Object* x)
-{
-  if (x == 0)
-    {
-      // NIL objrefs ... marshal as empty type hint, no elements.
-      cdr.write_ulong (1);
-      cdr.write_char ('\0');
-      cdr.write_ulong (0);
-      return cdr.good_bit ();
-    }
-
-  TAO_Stub *stubobj = x->_stubobj ();
-
-  if (stubobj == 0)
-    return 0;
-
-  // STRING, a type ID hint
-  if ((cdr << stubobj->type_id) == 0)
-    return 0;
-
-  const TAO_MProfile& mprofile =
-    stubobj->get_base_profiles ();
-
-  CORBA::ULong profile_count = mprofile.profile_count ();
-  if ((cdr << profile_count) == 0)
-    return 0;
-
-  // @@ The MProfile should be locked during this iteration, is there
-  // anyway to achieve that?
-  for (CORBA::ULong i = 0; i < profile_count; ++i)
-    {
-      const TAO_Profile* p = mprofile.get_profile (i);
-      if (p->encode (cdr) == 0)
-        return 0;
-    }
-  return cdr.good_bit ();
-}
-
-CORBA::Boolean
-operator>> (TAO_InputCDR& cdr, CORBA_Object*& x)
-{
-  CORBA::String_var type_hint;
-
-  if ((cdr >> type_hint.inout ()) == 0)
-    return 0;
-
-  CORBA::ULong profile_count;
-  if ((cdr >> profile_count) == 0)
-    return 0;
-
-  if (profile_count == 0)
-    {
-      x = CORBA::Object::_nil ();
-      return cdr.good_bit ();
-    }
-
-  // get a profile container to store all profiles in the IOR.
-  TAO_MProfile mp (profile_count);
-
-  TAO_ORB_Core *orb_core = cdr.orb_core ();
-  if (orb_core == 0)
-    {
-      orb_core = TAO_ORB_Core_instance ();
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "WARNING: extracting object from default ORB_Core\n"));
-        }
-    }
-
-  TAO_Connector_Registry *connector_registry =
-    orb_core->connector_registry ();
-  for (CORBA::ULong i = 0; i != profile_count && cdr.good_bit (); ++i)
-    {
-      TAO_Profile *pfile =
-        connector_registry->create_profile (cdr);
-      if (pfile != 0)
-        mp.give_profile (pfile);
-    }
-
-  // make sure we got some profiles!
-  if (mp.profile_count () != profile_count)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) could not create all "
-                  "the profiles\n"));
-      return 0;
-    }
-
-  // Ownership of type_hint is given to TAO_Stub
-  // TAO_Stub will make a copy of mp!
-  TAO_Stub *objdata;
-  ACE_NEW_RETURN (objdata, TAO_Stub (type_hint._retn (),
-                                     mp,
-                                     cdr.orb_core ()), 0);
-
-  if (objdata == 0)
-    return 0;
-
-  // Figure out if the servant is collocated.
-  TAO_ServantBase *servant = 0;
-  TAO_SERVANT_LOCATION servant_location =
-    objdata->orb_core ()->orb ()->_get_collocated_servant (objdata,
-                                                           servant);
-
-  int collocated = 0;
-  if (servant_location != TAO_SERVANT_NOT_FOUND)
-    collocated = 1;
-
-  // Create a new CORBA_Object and give it the TAO_Stub just created.
-  ACE_NEW_RETURN (x, CORBA_Object (objdata, servant, collocated), 0);
-
-  // the corba proxy would have already incremented the reference count on
-  // the objdata. So we decrement it here by 1 so that the objdata is now
-  // fully owned by the corba_proxy that was created.
-  // objdata->_decr_refcnt ();
-
-  return cdr.good_bit ();
-}
-
-// ****************************************************************
-
-TAO_Object_Field::~TAO_Object_Field (void)
-{
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO_Object_Field_T<CORBA_Object,CORBA_Object_var>;
-template class auto_ptr<TAO_MProfile>;
-template class ACE_Auto_Basic_Ptr<TAO_MProfile>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_Object_Field_T<CORBA_Object,CORBA_Object_var>
-#pragma instantiate auto_ptr<TAO_MProfile>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_MProfile>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
deleted file mode 100644
index c4cf48a3299..00000000000
--- a/TAO/tao/Object.h
+++ /dev/null
@@ -1,321 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    object.h
-//
-// = DESCRIPTION
-//     Header file for Win32 interface to CORBA's base "Object" type.
-//
-//     A "Object" is an entity that can be the target of an invocation
-//     using an ORB.  All CORBA objects provide this functionality.
-//     See the CORBA 2.0 specification for details.
-//
-// = AUTHOR
-//     Portions Copyright 1994-1995 by Sun Microsystems Inc.
-//     Portions Copyright 1997 by Washington University
-//
-// ============================================================================
-
-#ifndef TAO_CORBA_OBJECT_H
-#define TAO_CORBA_OBJECT_H
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_ServantBase;
-class TAO_Stub;
-
-class TAO_Export CORBA_Object
-{
-public:
-  virtual ~CORBA_Object (void);
-  // destructor
-
-  static CORBA_Object_ptr _duplicate (CORBA_Object_ptr obj);
-  // increment the ref count
-
-  static CORBA_Object_ptr _nil (void);
-  // return a NUL object
-
-  static CORBA_Object_ptr _narrow (CORBA_Object_ptr obj,
-                                   CORBA_Environment &ACE_TRY_ENV =
-                                     TAO_default_environment ());
-  // no-op it is just here to simplify some templates.
-
-  // These calls correspond to over-the-wire operations, or at least
-  // do so in many common cases.  The normal implementation assumes a
-  // particular simple, efficient, protocol-neutral interface for
-  // making such calls, but may be overridden when it appears
-  // appropriate.
-
-  virtual CORBA::Boolean _is_a (const CORBA::Char *logical_type_id,
-                                CORBA_Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ());
-  // determine if we are of the type specified by the "logical_type_id"
-
-  virtual const char* _interface_repository_id (void) const;
-  // The repository ID for the most derived class, this is an
-  // implementation method and does no remote invocations!
-
-  virtual TAO_ServantBase *_servant (void) const;
-  // return the associated servant (if one exists)
-
-  virtual CORBA::Boolean _is_collocated (void) const;
-  // are we collocated with the servant?
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  virtual CORBA::Boolean _non_existent (CORBA_Environment &ACE_TRY_ENV =
-                                          TAO_default_environment ());
-
-  virtual CORBA::ImplementationDef_ptr
-      _get_implementation (CORBA_Environment &ACE_TRY_ENV =
-                             TAO_default_environment ());
-  // This method is deprecated in the CORBA 2.2 spec, we just return 0
-  // every time.
-
-  virtual CORBA::InterfaceDef_ptr _get_interface (CORBA_Environment &ACE_TRY_ENV =
-                                                    TAO_default_environment ());
-
-  // Interface repository related operations.
-
-  // DII operations to create a request.
-  //
-  // The mapping for create_request is split into two forms,
-  // corresponding to the two usage styles described in CORBA section
-  // 6.2.1.
-
-  virtual void _create_request (CORBA::Context_ptr ctx,
-                                const CORBA::Char *operation,
-                                CORBA::NVList_ptr arg_list,
-                                CORBA::NamedValue_ptr result,
-                                CORBA::Request_ptr &request,
-                                CORBA::Flags req_flags,
-                                CORBA_Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ());
-
-  virtual void _create_request (CORBA::Context_ptr ctx,
-                                const CORBA::Char *operation,
-                                CORBA::NVList_ptr arg_list,
-                                CORBA::NamedValue_ptr result,
-                                CORBA::ExceptionList_ptr exclist,
-                                CORBA::ContextList_ptr ctxtlist,
-                                CORBA::Request_ptr &request,
-                                CORBA::Flags req_flags,
-                                CORBA_Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ());
-
-  // The default implementation of this method uses the same simple,
-  // multi-protocol remote invocation interface as is assumed by the
-  // calls above ... that's how it can have a default implementation.
-
-  virtual CORBA::Request_ptr _request (const CORBA::Char *operation,
-                                       CORBA_Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ());
-  // DII operation to create a request.
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-  CORBA::Policy_ptr _get_policy (
-      CORBA::PolicyType type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  CORBA::Policy_ptr _get_client_policy (
-      CORBA::PolicyType type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  CORBA::Object_ptr _set_policy_overrides (
-      const CORBA::PolicyList & policies,
-      CORBA::SetOverrideType set_add,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  CORBA::PolicyList * _get_policy_overrides (
-      const CORBA::PolicyTypeSeq & types,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  CORBA::Boolean _validate_connection (
-      CORBA::PolicyList_out inconsistent_policies,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
-  virtual CORBA::ULong _hash (CORBA::ULong maximum,
-                              CORBA_Environment &ACE_TRY_ENV =
-                                TAO_default_environment ());
-  // Return a (potentially non-unique) hash value for this object.
-  // This method relies on the representation of the object
-  // reference's private state.  Since that changes easily (when
-  // different ORB protocols are in use) there is no default
-  // implementation.
-
-  virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj,
-                                         CORBA_Environment &ACE_TRY_ENV =
-                                             TAO_default_environment ())
-    ACE_THROW_SPEC (());
-  // Try to determine if this object is the same as <other_obj>.  This
-  // method relies on the representation of the object reference's
-  // private state.  Since that changes easily (when different ORB
-  // protocols are in use) there is no default implementation.
-
-  virtual TAO_ObjectKey *_key (CORBA_Environment &ACE_TRY_ENV =
-                                 TAO_default_environment ());
-  // Return the object key as an out parameter.  Caller should release
-  // return value when finished with it.
-
-  virtual const TAO_ObjectKey &_object_key (void);
-  // Return a reference to the object key of profile in-use.
-  // If there's no in-use profile, then the program will
-  // probably crash.  This method does not create a new copy.
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_Object_ptr _ptr_type;
-  typedef CORBA_Object_var _var_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
-  // = TAO extensions
-
-  // = Reference count managment.
-  CORBA::ULong _incr_refcnt (void);
-  // Increment the reference count.
-
-  CORBA::ULong _decr_refcnt (void);
-  // Decrement the reference count.
-
-  CORBA_Object (TAO_Stub *p = 0,
-                TAO_ServantBase *servant = 0,
-                CORBA::Boolean collocated = 0);
-  // constructor
-
-  virtual TAO_Stub *_stubobj (void) const;
-  // get the underlying stub object
-
-  virtual void _use_locate_requests (CORBA::Boolean use_it);
-  // the the object to use a locate request for the first call to
-  // the object
-
-protected:
-  TAO_ServantBase *servant_;
-  // Servant pointer.  It is 0 except for collocated objects.
-
-  CORBA::Boolean is_collocated_;
-  // Flag to indicate collocation.  It is 0 except for collocated
-  // objects.
-
-private:
-  TAO_Stub *protocol_proxy_;
-  // Pointer to the protocol-specific "object" containing important
-  // profiling information regarding this proxy.
-  // The protocol proxy is (potentially) shared among several
-  // CORBA_Objects
-
-  CORBA::ULong refcount_;
-  // Number of outstanding references to this object.
-
-  ACE_SYNCH_MUTEX refcount_lock_;
-  // Protect the reference count, this is OK because we do no
-  // duplicates or releases on the critical path.
-
-  // = Unimplemented methods
-  CORBA_Object (const CORBA_Object &);
-  CORBA_Object &operator = (const CORBA_Object &);
-};
-
-class TAO_Export CORBA_Object_var
-{
-public:
-  CORBA_Object_var (void); // default constructor
-  CORBA_Object_var (CORBA::Object_ptr);
-  CORBA_Object_var (const CORBA_Object_var &); // copy constructor
-  ~CORBA_Object_var (void); // destructor
-
-  CORBA_Object_var &operator= (CORBA::Object_ptr);
-  CORBA_Object_var &operator= (const CORBA_Object_var &);
-  CORBA::Object_ptr operator-> (void) const;
-
-  operator const CORBA::Object_ptr &() const;
-  operator CORBA::Object_ptr &();
-  // in, inout, out, _retn
-  CORBA::Object_ptr in (void) const;
-  CORBA::Object_ptr &inout (void);
-  CORBA::Object_ptr &out (void);
-  CORBA::Object_ptr _retn (void);
-  CORBA::Object_ptr ptr (void) const;
-
-private:
-  CORBA::Object_ptr ptr_;
-};
-
-class TAO_Export CORBA_Object_out
-{
-public:
-  CORBA_Object_out (CORBA::Object_ptr &);
-  CORBA_Object_out (CORBA_Object_var &);
-  CORBA_Object_out (const CORBA_Object_out &);
-  CORBA_Object_out &operator= (const CORBA_Object_out &);
-  CORBA_Object_out &operator= (const CORBA_Object_var &);
-  CORBA_Object_out &operator= (CORBA::Object_ptr);
-  operator CORBA::Object_ptr &();
-  CORBA::Object_ptr &ptr (void);
-  CORBA::Object_ptr operator-> (void);
-
-private:
-  CORBA::Object_ptr &ptr_;
-};
-
-class TAO_Export TAO_Object_Field
-{
-  // = TITLE
-  //   Base class to represent fields (in structures) corresponding to
-  //   object references.
-  //
-  // = DESCRIPTION
-  //   When an object reference appears in a structure the marshaling
-  //   and demarhsaling of the structure gets complicated:
-  //   the interpreter can only marshal CORBA_Object_ptr when it
-  //   dermarshal it creates on of those objects.
-  //   The downcasting to the right type must be executed by classes
-  //   with compile-time knowledge of the object type.
-  //   The solution addopted in TAO is to create a special manager
-  //   class for that field called TAO_Object_Field_T<T> (see
-  //   varout.h), this class serves as an abstract interface to
-  //   manipulate instances of those classes (by the interpreter, of
-  //   course).
-  //
-public:
-  virtual ~TAO_Object_Field (void);
-  // destructor
-
-  virtual void _downcast (CORBA_Object* base_ptr,
-                          CORBA_Environment &ACE_TRY_ENV =
-                            TAO_default_environment ()) = 0;
-  virtual CORBA_Object* _upcast (void) = 0;
-  virtual void _release (void) = 0;
-};
-
-extern TAO_Export CORBA::Boolean
-operator<< (TAO_OutputCDR&, const CORBA_Object*);
-
-extern TAO_Export CORBA::Boolean
-operator>> (TAO_InputCDR&, CORBA_Object*&);
-
-#if defined (__ACE_INLINE__)
-# include "tao/Object.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_CORBA_OBJECT_H */
diff --git a/TAO/tao/Object.i b/TAO/tao/Object.i
deleted file mode 100644
index ba601235b64..00000000000
--- a/TAO/tao/Object.i
+++ /dev/null
@@ -1,235 +0,0 @@
-// $Id$
-
-// ****************************************************************
-
-ACE_INLINE CORBA::ULong
-CORBA_Object::_incr_refcnt (void)
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->refcount_lock_, 0);
-  return this->refcount_++;
-}
-
-ACE_INLINE CORBA::ULong
-CORBA_Object::_decr_refcnt (void)
-{
-  {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->refcount_lock_, 0);
-    this->refcount_--;
-    if (this->refcount_ != 0)
-      return this->refcount_;
-  }
-
-  delete this;
-  return 0;
-}
-
-ACE_INLINE CORBA_Object_ptr
-CORBA_Object::_duplicate (CORBA_Object_ptr obj)
-{
-  if (obj)
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-// Null pointers represent nil objects.
-
-ACE_INLINE CORBA_Object_ptr
-CORBA_Object::_nil (void)
-{
-  return 0;
-}
-
-ACE_INLINE CORBA_Object_ptr
-CORBA_Object::_narrow (CORBA_Object_ptr obj, CORBA::Environment&)
-{
-  return CORBA_Object::_duplicate (obj);
-}
-
-ACE_INLINE TAO_Stub *
-CORBA_Object::_stubobj (void) const
-{
-  return this->protocol_proxy_;
-}
-
-// ************************************************************
-// These are in CORBA namespace
-
-ACE_INLINE CORBA::Boolean
-CORBA::is_nil (CORBA::Object_ptr obj)
-{
-  return obj == 0;
-}
-
-ACE_INLINE void
-CORBA::release (CORBA_Object_ptr obj)
-{
-  if (obj)
-    obj->_decr_refcnt ();
-}
-
-// DII hook to objref
-//
-// The mapping for create_request is split into two forms,
-// corresponding to the two usage styles described in CORBA section
-// 6.2.1.
-
-// *************************************************************
-// Inline operations for class CORBA_Object_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_Object_var::CORBA_Object_var (void)
-  : ptr_ (CORBA_Object::_nil ())
-{
-}
-
-ACE_INLINE
-CORBA_Object_var::CORBA_Object_var (CORBA_Object_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_Object_var::~CORBA_Object_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_Object_ptr
-CORBA_Object_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Object_var::CORBA_Object_var (const CORBA_Object_var &p) // copy constructor
-        : ptr_ (CORBA_Object::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE CORBA_Object_var &
-CORBA_Object_var::operator= (CORBA_Object_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_Object_var &
-CORBA_Object_var::operator= (const CORBA_Object_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_Object::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_Object_var::operator const CORBA_Object_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Object_var::operator CORBA_Object_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Object_ptr
-CORBA_Object_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Object_ptr
-CORBA_Object_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Object_ptr &
-CORBA_Object_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Object_ptr &
-CORBA_Object_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_Object::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Object_ptr
-CORBA_Object_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_Object_ptr val = this->ptr_;
-  this->ptr_ = CORBA_Object::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_Object_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_Object_out::CORBA_Object_out (CORBA_Object_ptr &p)
-        : ptr_ (p)
-{
-  this->ptr_ = CORBA_Object::_nil ();
-}
-
-ACE_INLINE
-CORBA_Object_out::CORBA_Object_out (CORBA_Object_var &p) // constructor from _var
-        : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_Object::_nil ();
-}
-
-ACE_INLINE
-CORBA_Object_out::CORBA_Object_out (const CORBA_Object_out &p) // copy constructor
-        : ptr_ (p.ptr_)
-{}
-
-ACE_INLINE CORBA_Object_out &
-CORBA_Object_out::operator= (const CORBA_Object_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_Object_out &
-CORBA_Object_out::operator= (const CORBA_Object_var &p)
-{
-  this->ptr_ = CORBA_Object::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_Object_out &
-CORBA_Object_out::operator= (CORBA_Object_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_Object_out::operator CORBA_Object_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Object_ptr &
-CORBA_Object_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Object_ptr
-CORBA_Object_out::operator-> (void)
-{
-  return this->ptr_;
-}
diff --git a/TAO/tao/ObjectIDList.cpp b/TAO/tao/ObjectIDList.cpp
deleted file mode 100644
index a283fcd3fed..00000000000
--- a/TAO/tao/ObjectIDList.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-//
-// Hand Modified by Vishal Kachroo <vishal@cs.wustl.edu>
-//
-
-#include "ObjectIDList.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ObjectIDList.i"
-#endif /* !defined INLINE */
-
-#if !defined (_CORBA_ORB_OBJECTIDLIST_CS_)
-#define _CORBA_ORB_OBJECTIDLIST_CS_
-
-// *************************************************************
-// CORBA_ORB_ObjectIdList
-// *************************************************************
-
-CORBA_ORB_ObjectIdList::CORBA_ORB_ObjectIdList (void)
-{}
-CORBA_ORB_ObjectIdList::CORBA_ORB_ObjectIdList (CORBA::ULong max) // uses max size
-  :
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- (max)
-{}
-CORBA_ORB_ObjectIdList::CORBA_ORB_ObjectIdList (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
-  :
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- (max, length, buffer, release)
-{}
-CORBA_ORB_ObjectIdList::CORBA_ORB_ObjectIdList (const CORBA_ORB_ObjectIdList &seq) // copy ctor
-  :
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- (seq)
-{}
-CORBA_ORB_ObjectIdList::~CORBA_ORB_ObjectIdList (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-static const CORBA::Long _oc_CORBA_ORB_ObjectIdList[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f52), ACE_NTOHL (0x422f4f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x49644c69), ACE_NTOHL (0x73743a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ORB/ObjectIdList:1.0
-  13, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63744964), ACE_NTOHL (0x4c697374), ACE_NTOHL (0x0),  // name = ObjectIdList
-  CORBA::tk_sequence, // typecode kind
-  84, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_alias, // typecode kind for typedefs
-    68, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f52), ACE_NTOHL (0x422f4f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ORB/ObjectId:1.0
-      9, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63744964), ACE_NTOHL (0x0),  // name = ObjectId
-      CORBA::tk_string,
-      0, // string length
-  0,
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ORB_ObjectIdList (CORBA::tk_alias, sizeof (_oc_CORBA_ORB_ObjectIdList), (char *) &_oc_CORBA_ORB_ObjectIdList, 0, sizeof (CORBA_ORB_ObjectIdList));
-CORBA::TypeCode_ptr CORBA::ORB::_tc_ObjectIdList = &_tc_TAO_tc_CORBA_ORB_ObjectIdList;
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA_ORB_ObjectIdList &_tao_elem
-  ) // copying
-{
-  CORBA_ORB_ObjectIdList *_tao_any_val;
-  ACE_NEW (_tao_any_val, CORBA_ORB_ObjectIdList (_tao_elem));
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::ORB::_tc_ObjectIdList, _tao_any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA_ORB_ObjectIdList *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::ORB::_tc_ObjectIdList, _tao_elem, 0, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ORB_ObjectIdList *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::ORB::_tc_ObjectIdList, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA_ORB_ObjectIdList *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA_ORB_ObjectIdList, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::ORB::_tc_ObjectIdList, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::ORB::_tc_ObjectIdList, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tao/ObjectIDList.h b/TAO/tao/ObjectIDList.h
deleted file mode 100644
index b5c51249cc6..00000000000
--- a/TAO/tao/ObjectIDList.h
+++ /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 the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-//
-//  Hand Modified by Vishal Kachroo <vishal@cs.wustl.edu>
-//
-
-#ifndef OBJECTIDLIST_H_
-#define OBJECTIDLIST_H_
-
-#include "tao/corba.h"
-#include "tao/Sequence.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-#if !defined (_CORBA_ORB_OBJECTIDLIST_CH_)
-#define _CORBA_ORB_OBJECTIDLIST_CH_
-
-// *************************************************************
-// ObjectIdList
-// *************************************************************
-
-class  CORBA_ORB_ObjectIdList : public
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-{
-public:
- CORBA_ORB_ObjectIdList (void); // default ctor
- CORBA_ORB_ObjectIdList (CORBA::ULong max); // uses max size
- CORBA_ORB_ObjectIdList (
-               CORBA::ULong max,
-               CORBA::ULong length,
-               char * *buffer,
-               CORBA::Boolean release=0
-               );
- CORBA_ORB_ObjectIdList (const CORBA_ORB_ObjectIdList &); // copy ctor
- ~CORBA_ORB_ObjectIdList (void); // dtor
-};
-
-typedef CORBA_ORB_ObjectIdList *CORBA_ORB_ObjectIdList_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ORB_OBJECTIDLIST___VAR_CH_)
-#define _CORBA_ORB_OBJECTIDLIST___VAR_CH_
-
-// *************************************************************
-// class CORBA::ORB::ObjectIdList_var
-// *************************************************************
-
-class CORBA_ORB_ObjectIdList_var
-{
-public:
-  CORBA_ORB_ObjectIdList_var (void); // default constructor
-  CORBA_ORB_ObjectIdList_var (CORBA_ORB_ObjectIdList *);
-  CORBA_ORB_ObjectIdList_var (const CORBA_ORB_ObjectIdList_var &); // copy constructor
-  ~CORBA_ORB_ObjectIdList_var (void); // destructor
-
-  CORBA_ORB_ObjectIdList_var &operator= (CORBA_ORB_ObjectIdList *);
-  CORBA_ORB_ObjectIdList_var &operator= (const CORBA_ORB_ObjectIdList_var &);
-  CORBA_ORB_ObjectIdList *operator-> (void);
-  const CORBA_ORB_ObjectIdList *operator-> (void) const;
-
-  operator const CORBA_ORB_ObjectIdList &() const;
-  operator CORBA_ORB_ObjectIdList &();
-  operator CORBA_ORB_ObjectIdList &() const;
-  TAO_SeqElem_String_Manager operator[] (CORBA::ULong slot);
-  // in, inout, out, _retn
-  const CORBA_ORB_ObjectIdList &in (void) const;
-  CORBA_ORB_ObjectIdList &inout (void);
-  CORBA_ORB_ObjectIdList *&out (void);
-  CORBA_ORB_ObjectIdList *_retn (void);
-  CORBA_ORB_ObjectIdList *ptr (void) const;
-
-private:
-  CORBA_ORB_ObjectIdList *ptr_;
-};
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ORB_OBJECTIDLIST___OUT_CH_)
-#define _CORBA_ORB_OBJECTIDLIST___OUT_CH_
-
-class CORBA_ORB_ObjectIdList_out
-{
-public:
-  CORBA_ORB_ObjectIdList_out (CORBA_ORB_ObjectIdList *&);
-  CORBA_ORB_ObjectIdList_out (CORBA_ORB_ObjectIdList_var &);
-  CORBA_ORB_ObjectIdList_out (const CORBA_ORB_ObjectIdList_out &);
-  CORBA_ORB_ObjectIdList_out &operator= (const CORBA_ORB_ObjectIdList_out &);
-  CORBA_ORB_ObjectIdList_out &operator= (CORBA_ORB_ObjectIdList *);
-  operator CORBA_ORB_ObjectIdList *&();
-  CORBA_ORB_ObjectIdList *&ptr (void);
-  CORBA_ORB_ObjectIdList *operator-> (void);
-  TAO_SeqElem_String_Manager operator[] (CORBA::ULong slot);
-
-private:
-  CORBA_ORB_ObjectIdList *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_ORB_ObjectIdList_var &);
-};
-
-#endif /* end #if !defined */
-
-#ifndef __ACE_INLINE__
-
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA_ORB_ObjectIdList &); //
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA_ORB_ObjectIdList &);
-
-#endif /* __ACE_INLINE__ */
-
-
-#if defined (__ACE_INLINE__)
-#include "ObjectIDList.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* ifndef */
diff --git a/TAO/tao/ObjectIDList.i b/TAO/tao/ObjectIDList.i
deleted file mode 100644
index a03864bede7..00000000000
--- a/TAO/tao/ObjectIDList.i
+++ /dev/null
@@ -1,231 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-//
-// Hand modified by Vishal Kachroo <vishal@cs.wustl.edu>
-//
-
-#if !defined (_CORBA_ORB_OBJECTIDLIST_I_)
-#define _CORBA_ORB_OBJECTIDLIST_I_
-
-// *************************************************************
-// Inline operations for class CORBA::ORB::ObjectIdList_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_var::CORBA_ORB_ObjectIdList_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_var::CORBA_ORB_ObjectIdList_var (CORBA_ORB_ObjectIdList *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_var::CORBA_ORB_ObjectIdList_var (const CORBA_ORB_ObjectIdList_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA_ORB_ObjectIdList(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_var::~CORBA_ORB_ObjectIdList_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA_ORB_ObjectIdList_var &
-CORBA_ORB_ObjectIdList_var::operator= (CORBA_ORB_ObjectIdList *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_ORB_ObjectIdList_var &
-CORBA_ORB_ObjectIdList_var::operator= (const CORBA_ORB_ObjectIdList_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA_ORB_ObjectIdList (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA_ORB_ObjectIdList *
-CORBA_ORB_ObjectIdList_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ORB_ObjectIdList *
-CORBA_ORB_ObjectIdList_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_var::operator const CORBA_ORB_ObjectIdList &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_var::operator CORBA_ORB_ObjectIdList &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_var::operator CORBA_ORB_ObjectIdList &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TAO_SeqElem_String_Manager
-CORBA_ORB_ObjectIdList_var::operator[] (CORBA::ULong slot)
-{
-  return this->ptr_->operator[] (slot);
-}
-
-ACE_INLINE const CORBA_ORB_ObjectIdList &
-CORBA_ORB_ObjectIdList_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA_ORB_ObjectIdList &
-CORBA_ORB_ObjectIdList_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE CORBA_ORB_ObjectIdList *&
-CORBA_ORB_ObjectIdList_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ORB_ObjectIdList *
-CORBA_ORB_ObjectIdList_var::_retn (void)
-{
-  CORBA_ORB_ObjectIdList *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA_ORB_ObjectIdList *
-CORBA_ORB_ObjectIdList_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_ORB_ObjectIdList_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_out::CORBA_ORB_ObjectIdList_out (CORBA_ORB_ObjectIdList *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_out::CORBA_ORB_ObjectIdList_out (CORBA_ORB_ObjectIdList_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_out::CORBA_ORB_ObjectIdList_out (const CORBA_ORB_ObjectIdList_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_ORB_ObjectIdList_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_ORB_ObjectIdList_out &
-CORBA_ORB_ObjectIdList_out::operator= (const CORBA_ORB_ObjectIdList_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_ORB_ObjectIdList_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_ORB_ObjectIdList_out &
-CORBA_ORB_ObjectIdList_out::operator= (CORBA_ORB_ObjectIdList *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_out::operator CORBA_ORB_ObjectIdList *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ORB_ObjectIdList *&
-CORBA_ORB_ObjectIdList_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ORB_ObjectIdList *
-CORBA_ORB_ObjectIdList_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_SeqElem_String_Manager
-CORBA_ORB_ObjectIdList_out::operator[] (CORBA::ULong slot)
-{
-  return this->ptr_->operator[] (slot);
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA_ORB_ObjectIdList &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_ORB_ObjectIdList &_tao_sequence)
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
diff --git a/TAO/tao/Object_Adapter.cpp b/TAO/tao/Object_Adapter.cpp
deleted file mode 100644
index 33614335dcc..00000000000
--- a/TAO/tao/Object_Adapter.cpp
+++ /dev/null
@@ -1,1261 +0,0 @@
-// $Id$
-
-#include "tao/Object_Adapter.h"
-#include "tao/POA.h"
-#include "tao/ORB.h"
-#include "tao/ORB_Core.h"
-#include "tao/Server_Request.h"
-#include "ace/Auto_Ptr.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Object_Adapter.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(tao, POA, "$Id$")
-
-// Timeprobes class
-#include "tao/Timeprobe.h"
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-
-static const char *TAO_Object_Adapter_Timeprobe_Description[] =
-{
-  "Object_Adapter::dispatch_servant - start",
-  "Object_Adapter::dispatch_servant - end",
-
-  "POA::parse_key - start",
-  "POA::parse_key - end",
-
-  "Object_Adapter::find_poa - start",
-  "Object_Adapter::find_poa - end",
-
-  "POA::locate_servant - start",
-  "POA::locate_servant - end",
-
-  "Servant::_dispatch - start",
-  "Servant::_dispatch - end",
-};
-
-enum
-{
-  // Timeprobe description table start key
-  TAO_OBJECT_ADAPTER_DISPATCH_SERVANT_START = 200,
-  TAO_OBJECT_ADAPTER_DISPATCH_SERVANT_END,
-
-  TAO_POA_PARSE_KEY_START,
-  TAO_POA_PARSE_KEY_END,
-
-  TAO_OBJECT_ADAPTER_FIND_POA_START,
-  TAO_OBJECT_ADAPTER_FIND_POA_END,
-
-  TAO_POA_LOCATE_SERVANT_START,
-  TAO_POA_LOCATE_SERVANT_END,
-
-  TAO_SERVANT_DISPATCH_START,
-  TAO_SERVANT_DISPATCH_END
-};
-
-// Setup Timeprobes
-ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Object_Adapter_Timeprobe_Description,
-                                  TAO_OBJECT_ADAPTER_DISPATCH_SERVANT_START);
-
-#endif /* ACE_ENABLE_TIMEPROBES */
-
-/* static */
-size_t TAO_Object_Adapter::transient_poa_name_size_ = 0;
-
-void
-TAO_Object_Adapter::set_transient_poa_name_size (const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters)
-{
-  if (TAO_Object_Adapter::transient_poa_name_size_ == 0)
-    {
-      switch (creation_parameters.poa_lookup_strategy_for_transient_id_policy_)
-        {
-        case TAO_LINEAR:
-          TAO_Object_Adapter::transient_poa_name_size_ =
-            sizeof (CORBA::ULong);
-          break;
-        case TAO_DYNAMIC_HASH:
-          TAO_Object_Adapter::transient_poa_name_size_ =
-            sizeof (CORBA::ULong);
-          break;
-        case TAO_ACTIVE_DEMUX:
-        default:
-          TAO_Object_Adapter::transient_poa_name_size_ =
-            ACE_Active_Map_Manager_Key::size ();
-          break;
-        }
-    }
-}
-
-TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters,
-                                        TAO_ORB_Core &orb_core)
-  : hint_strategy_ (0),
-    persistent_poa_name_map_ (0),
-    transient_poa_map_ (0),
-    orb_core_ (orb_core),
-    enable_locking_ (orb_core_.server_factory ()->enable_poa_locking ()),
-    thread_lock_ (),
-    lock_ (TAO_Object_Adapter::create_lock (enable_locking_,
-                                            thread_lock_)),
-    reverse_lock_ (*lock_),
-    non_servant_upcall_condition_ (thread_lock_),
-    non_servant_upcall_in_progress_ (0),
-    non_servant_upcall_thread_ (ACE_OS::NULL_thread)
-{
-  TAO_Object_Adapter::set_transient_poa_name_size (creation_parameters);
-
-  Hint_Strategy *hint_strategy = 0;
-  if (creation_parameters.use_active_hint_in_poa_names_)
-    ACE_NEW (hint_strategy,
-             Active_Hint_Strategy (creation_parameters.poa_map_size_));
-  else
-    ACE_NEW (hint_strategy,
-             No_Hint_Strategy);
-
-  // Give ownership to the auto pointer.
-  auto_ptr<Hint_Strategy> new_hint_strategy (hint_strategy);
-
-  new_hint_strategy->object_adapter (this);
-
-  persistent_poa_name_map *ppnm;
-  switch (creation_parameters.poa_lookup_strategy_for_persistent_id_policy_)
-    {
-    case TAO_LINEAR:
-      ACE_NEW (ppnm,
-               persistent_poa_name_linear_map (creation_parameters.poa_map_size_));
-      break;
-    case TAO_DYNAMIC_HASH:
-    default:
-      ACE_NEW (ppnm,
-               persistent_poa_name_hash_map (creation_parameters.poa_map_size_));
-      break;
-    }
-  // Give ownership to the auto pointer.
-  auto_ptr<persistent_poa_name_map> new_persistent_poa_name_map (ppnm);
-
-  transient_poa_map *tpm = 0;
-  switch (creation_parameters.poa_lookup_strategy_for_transient_id_policy_)
-    {
-    case TAO_LINEAR:
-      ACE_NEW (tpm,
-               transient_poa_linear_map (creation_parameters.poa_map_size_));
-      break;
-    case TAO_DYNAMIC_HASH:
-      ACE_NEW (tpm,
-               transient_poa_hash_map (creation_parameters.poa_map_size_));
-      break;
-    case TAO_ACTIVE_DEMUX:
-    default:
-      ACE_NEW (tpm,
-               transient_poa_active_map (creation_parameters.poa_map_size_));
-      break;
-    }
-  // Give ownership to the auto pointer.
-  auto_ptr<transient_poa_map> new_transient_poa_map (tpm);
-
-  this->hint_strategy_ =
-    new_hint_strategy.release ();
-  this->persistent_poa_name_map_ =
-    new_persistent_poa_name_map.release ();
-  this->transient_poa_map_ =
-    new_transient_poa_map.release ();
-}
-
-TAO_Object_Adapter::~TAO_Object_Adapter (void)
-{
-  delete this->hint_strategy_;
-  delete this->persistent_poa_name_map_;
-  delete this->transient_poa_map_;
-  delete this->lock_;
-}
-
-/* static */
-ACE_Lock *
-TAO_Object_Adapter::create_lock (int enable_locking,
-                                 ACE_SYNCH_MUTEX &thread_lock)
-{
-#if defined (ACE_HAS_THREADS)
-  if (enable_locking)
-    {
-      ACE_Lock *the_lock;
-      ACE_NEW_RETURN (the_lock,
-                      ACE_Lock_Adapter<ACE_SYNCH_MUTEX> (thread_lock),
-                      0);
-      return the_lock;
-    }
-#endif /* ACE_HAS_THREADS */
-
-  ACE_Lock *the_lock;
-  ACE_NEW_RETURN (the_lock,
-                  ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX> (),
-                  0);
-  return the_lock;
-}
-
-
-void
-TAO_Object_Adapter::deactivate_i (CORBA::Boolean wait_for_completion,
-                                  CORBA::Environment &ACE_TRY_ENV)
-{
-  // If the ORB::shutdown operation is called, it makes a call on
-  // deactivate with a TRUE etherealize_objects parameter for each POA
-  // manager known in the process; the wait_for_completion parameter
-  // to deactivate will be the same as the similarly named parameter
-  // of ORB::shutdown.
-
-  poa_manager_set::iterator end = this->poa_manager_set_.end ();
-
-  for (poa_manager_set::iterator iterator = this->poa_manager_set_.begin ();
-       iterator != end;
-       ++iterator)
-    {
-      TAO_POA_Manager *poa_manager = *iterator;
-      poa_manager->deactivate_i (1,
-                                 wait_for_completion,
-                                 ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-}
-
-void
-TAO_Object_Adapter::dispatch_servant (const TAO_ObjectKey &key,
-                                      CORBA::ServerRequest &req,
-                                      void *context,
-                                      CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_FUNCTION_TIMEPROBE (TAO_OBJECT_ADAPTER_DISPATCH_SERVANT_START);
-
-  // This object is magical, i.e., it has a non-trivial constructor
-  // and destructor.
-  Servant_Upcall servant_upcall (*this);
-
-  // Set up state in the POA et al (including the POA Current), so
-  // that we know that this servant is currently in an upcall.
-  const char *operation = req.operation ();
-  servant_upcall.prepare_for_upcall (key,
-                                     operation,
-                                     ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // Servant dispatch.
-  {
-    ACE_FUNCTION_TIMEPROBE (TAO_SERVANT_DISPATCH_START);
-
-    servant_upcall.servant ()->_dispatch (req,
-                                          context,
-                                          ACE_TRY_ENV);
-    ACE_CHECK;
-  }
-}
-
-void
-TAO_Object_Adapter::locate_poa (const TAO_ObjectKey &key,
-                                PortableServer::ObjectId &system_id,
-                                TAO_POA *&poa,
-                                CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Object_Adapter::poa_name poa_system_name;
-  CORBA::Boolean is_root = 0;
-  CORBA::Boolean is_persistent = 0;
-  CORBA::Boolean is_system_id = 0;
-  TAO_Temporary_Creation_Time poa_creation_time;
-
-  int result = 0;
-
-  {
-    ACE_FUNCTION_TIMEPROBE (TAO_POA_PARSE_KEY_START);
-
-    result = TAO_POA::parse_key (key,
-                                 poa_system_name,
-                                 system_id,
-                                 is_root,
-                                 is_persistent,
-                                 is_system_id,
-                                 poa_creation_time);
-  }
-
-  if (result != 0)
-    ACE_THROW (CORBA::OBJ_ADAPTER ());
-
-  {
-    ACE_FUNCTION_TIMEPROBE (TAO_OBJECT_ADAPTER_FIND_POA_START);
-
-    result = this->find_poa (poa_system_name,
-                             is_persistent,
-                             is_root,
-                             poa_creation_time,
-                             poa,
-                             ACE_TRY_ENV);
-    ACE_CHECK;
-  }
-
-  if (result != 0)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-}
-
-int
-TAO_Object_Adapter::activate_poa (const poa_name &folded_name,
-                                  TAO_POA *&poa,
-                                  CORBA_Environment &ACE_TRY_ENV)
-{
-  int result = -1;
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  // A recursive thread lock without using a recursive thread lock.
-  // Non_Servant_Upcall has a magic constructor and destructor.  We
-  // unlock the Object_Adapter lock for the duration of the adapter
-  // activator(s) upcalls; reacquiring once the upcalls complete.
-  // Even though we are releasing the lock, other threads will not be
-  // able to make progress since
-  // <Object_Adapter::non_servant_upcall_in_progress_> has been set.
-  Non_Servant_Upcall non_servant_upcall (*this);
-  ACE_UNUSED_ARG (non_servant_upcall);
-
-  iteratable_poa_name ipn (folded_name);
-  iteratable_poa_name::iterator iterator = ipn.begin ();
-  iteratable_poa_name::iterator end = ipn.end ();
-
-  TAO_POA *parent = this->orb_core_.root_poa ();
-  if (parent->name () != *iterator)
-    ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                      -1);
-  else
-    ++iterator;
-
-  for (;
-       iterator != end;
-       ++iterator)
-    {
-      TAO_POA *current = parent->find_POA_i (*iterator,
-                                             1,
-                                             ACE_TRY_ENV);
-      ACE_CHECK_RETURN (-1);
-
-      parent = current;
-    }
-
-  poa = parent;
-  result = 0;
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  return result;
-}
-
-int
-TAO_Object_Adapter::find_transient_poa (const poa_name &system_name,
-                                        CORBA::Boolean root,
-                                        const TAO_Temporary_Creation_Time &poa_creation_time,
-                                        TAO_POA *&poa)
-{
-  int result = 0;
-
-  if (root)
-    poa = this->orb_core_.root_poa ();
-  else
-    result = this->transient_poa_map_->find (system_name,
-                                             poa);
-  if (result == 0 && poa->creation_time () != poa_creation_time)
-    result = -1;
-
-  return result;
-}
-
-int
-TAO_Object_Adapter::bind_poa (const poa_name &folded_name,
-                              TAO_POA *poa,
-                              poa_name_out system_name)
-{
-  if (poa->persistent ())
-    return this->bind_persistent_poa (folded_name,
-                                      poa,
-                                      system_name);
-  else
-    return this->bind_transient_poa (poa,
-                                     system_name);
-}
-
-int
-TAO_Object_Adapter::unbind_poa (TAO_POA *poa,
-                                const poa_name &folded_name,
-                                const poa_name &system_name)
-{
-  if (poa->persistent ())
-    return this->unbind_persistent_poa (folded_name,
-                                        system_name);
-  else
-    return this->unbind_transient_poa (system_name);
-}
-
-int
-TAO_Object_Adapter::locate_servant_i (const TAO_ObjectKey &key,
-                                      CORBA::Environment &ACE_TRY_ENV)
-{
-  PortableServer::ObjectId id;
-  TAO_POA *poa = 0;
-
-  this->locate_poa (key,
-                    id,
-                    poa,
-                    ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  PortableServer::Servant servant = 0;
-  TAO_SERVANT_LOCATION servant_location =
-    poa->locate_servant_i (id,
-                           servant,
-                           ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  switch (servant_location)
-    {
-    case TAO_SERVANT_FOUND:
-      // Optimistic attitude
-    case TAO_DEFAULT_SERVANT:
-    case TAO_SERVANT_MANAGER:
-      return 0;
-
-    case TAO_SERVANT_NOT_FOUND:
-      return -1;
-    }
-
-  return -1;
-}
-
-TAO_SERVANT_LOCATION
-TAO_Object_Adapter::find_servant_i (const TAO_ObjectKey &key,
-                                    PortableServer::Servant &servant,
-                                    CORBA::Environment &ACE_TRY_ENV)
-{
-  PortableServer::ObjectId id;
-  TAO_POA *poa = 0;
-
-  this->locate_poa (key,
-                    id,
-                    poa,
-                    ACE_TRY_ENV);
-  ACE_CHECK_RETURN (TAO_SERVANT_NOT_FOUND);
-
-  TAO_SERVANT_LOCATION servant_location = poa->locate_servant_i (id,
-                                                                 servant,
-                                                                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN (TAO_SERVANT_NOT_FOUND);
-
-  return servant_location;
-}
-
-TAO_Object_Adapter::Hint_Strategy::~Hint_Strategy (void)
-{
-}
-
-void
-TAO_Object_Adapter::Hint_Strategy::object_adapter (TAO_Object_Adapter *oa)
-{
-  this->object_adapter_ = oa;
-}
-
-TAO_Object_Adapter::Active_Hint_Strategy::Active_Hint_Strategy (CORBA::ULong map_size)
-  : persistent_poa_system_map_ (map_size)
-{
-}
-
-TAO_Object_Adapter::Active_Hint_Strategy::~Active_Hint_Strategy (void)
-{
-}
-
-int
-TAO_Object_Adapter::Active_Hint_Strategy::find_persistent_poa (const poa_name &system_name,
-                                                               TAO_POA *&poa,
-                                                               CORBA_Environment &ACE_TRY_ENV)
-{
-  poa_name folded_name;
-  int result = this->persistent_poa_system_map_.recover_key (system_name,
-                                                             folded_name);
-
-  if (result == 0)
-    {
-      result = this->persistent_poa_system_map_.find (system_name,
-                                                      poa);
-      if (result != 0
-          || folded_name != poa->folded_name ())
-        {
-          result = this->object_adapter_->persistent_poa_name_map_->find (folded_name,
-                                                                          poa);
-          if (result != 0)
-            {
-              result = this->object_adapter_->activate_poa (folded_name,
-                                                            poa,
-                                                            ACE_TRY_ENV);
-              ACE_CHECK_RETURN (-1);
-            }
-        }
-    }
-
-  return result;
-}
-
-int
-TAO_Object_Adapter::Active_Hint_Strategy::bind_persistent_poa (const poa_name &folded_name,
-                                                               TAO_POA *poa,
-                                                               poa_name_out system_name)
-{
-  poa_name name = folded_name;
-  int result = this->persistent_poa_system_map_.bind_modify_key (poa,
-                                                                 name);
-
-  if (result == 0)
-    {
-      result =
-        this->object_adapter_->persistent_poa_name_map_->bind (folded_name,
-                                                               poa);
-
-      if (result != 0)
-        this->persistent_poa_system_map_.unbind (name);
-      else
-        ACE_NEW_RETURN (system_name,
-                        poa_name (name),
-                        -1);
-    }
-
-  return result;
-}
-
-int
-TAO_Object_Adapter::Active_Hint_Strategy::unbind_persistent_poa (const poa_name &folded_name,
-                                                                 const poa_name &system_name)
-{
-  int result = this->persistent_poa_system_map_.unbind (system_name);
-
-  if (result == 0)
-    result =
-      this->object_adapter_->persistent_poa_name_map_->unbind (folded_name);
-
-  return result;
-}
-
-TAO_Object_Adapter::No_Hint_Strategy::~No_Hint_Strategy (void)
-{
-}
-
-int
-TAO_Object_Adapter::No_Hint_Strategy::find_persistent_poa (const poa_name &system_name,
-                                                           TAO_POA *&poa,
-                                                           CORBA_Environment &ACE_TRY_ENV)
-{
-  int result = this->object_adapter_->persistent_poa_name_map_->find (system_name,
-                                                                      poa);
-  if (result != 0)
-    {
-      result =
-        this->object_adapter_->activate_poa (system_name,
-                                             poa,
-                                             ACE_TRY_ENV);
-      ACE_CHECK_RETURN (-1);
-    }
-
-  return result;
-}
-
-int
-TAO_Object_Adapter::No_Hint_Strategy::bind_persistent_poa (const poa_name &folded_name,
-                                                           TAO_POA *poa,
-                                                           poa_name_out system_name)
-{
-  int result =
-    this->object_adapter_->persistent_poa_name_map_->bind (folded_name,
-                                                           poa);
-  if (result == 0)
-    ACE_NEW_RETURN (system_name,
-                    poa_name (folded_name),
-                    -1);
-  return result;
-}
-
-int
-TAO_Object_Adapter::No_Hint_Strategy::unbind_persistent_poa (const poa_name &folded_name,
-                                                             const poa_name &system_name)
-{
-  ACE_UNUSED_ARG (system_name);
-
-  return this->object_adapter_->persistent_poa_name_map_->unbind (folded_name);
-}
-
-TAO_Object_Adapter::poa_name_iterator::poa_name_iterator (int begin,
-                                                          CORBA::ULong size,
-                                                          const CORBA::Octet *folded_buffer)
-  : size_ (size),
-    folded_buffer_ (folded_buffer),
-    last_separator_ (~0)
-{
-  if (begin)
-    {
-      this->position_ = ~0;
-      this->operator++ ();
-    }
-  else
-    this->position_ = this->size_;
-}
-
-int
-TAO_Object_Adapter::poa_name_iterator::operator== (const poa_name_iterator &rhs) const
-{
-  return this->position_ == rhs.position_;
-}
-
-int
-TAO_Object_Adapter::poa_name_iterator::operator!= (const poa_name_iterator &rhs) const
-{
-  return !this->operator== (rhs);
-}
-
-ACE_CString
-TAO_Object_Adapter::poa_name_iterator::operator* () const
-{
-  CORBA::ULong start_at =
-    this->last_separator_ +
-    TAO_POA::name_separator_length ();
-
-  CORBA::ULong how_many =
-    this->position_
-    - this->last_separator_
-    - TAO_POA::name_separator_length ();
-
-  return ACE_CString (ACE_reinterpret_cast (const char *,
-                                            &this->folded_buffer_[start_at]),
-                      how_many);
-}
-
-TAO_Object_Adapter::poa_name_iterator &
-TAO_Object_Adapter::poa_name_iterator::operator++ (void)
-{
-  for (this->last_separator_ = this->position_;
-       ;
-       )
-    {
-      ++this->position_;
-      if (this->position_ < this->size_)
-        {
-          if (this->folded_buffer_[this->position_] == TAO_POA::name_separator ())
-            break;
-        }
-      else
-        break;
-    }
-
-  return *this;
-}
-
-TAO_Object_Adapter::iteratable_poa_name::iteratable_poa_name (const poa_name &folded_name)
-  : folded_name_ (folded_name)
-{
-}
-
-TAO_Object_Adapter::iteratable_poa_name::iterator
-TAO_Object_Adapter::iteratable_poa_name::begin (void) const
-{
-  return iterator (1,
-                   this->folded_name_.length (),
-                   this->folded_name_.get_buffer ());
-}
-
-TAO_Object_Adapter::iteratable_poa_name::iterator
-TAO_Object_Adapter::iteratable_poa_name::end (void) const
-{
-  return iterator (0,
-                   this->folded_name_.length (),
-                   this->folded_name_.get_buffer ());
-}
-
-TAO_Object_Adapter::Non_Servant_Upcall::Non_Servant_Upcall (TAO_Object_Adapter &object_adapter)
-  : object_adapter_ (object_adapter)
-{
-  // Mark the fact that a non-servant upcall is in progress.
-  this->object_adapter_.non_servant_upcall_in_progress_ = 1;
-
-  // Remember which thread is calling the adapter activators.
-  this->object_adapter_.non_servant_upcall_thread_ = ACE_OS::thr_self ();
-
-  // Release the Object Adapter lock.
-  this->object_adapter_.lock ().release ();
-}
-
-TAO_Object_Adapter::Non_Servant_Upcall::~Non_Servant_Upcall (void)
-{
-  // Reacquire the Object Adapter lock.
-  this->object_adapter_.lock ().acquire ();
-
-  // We are no longer in a non-servant upcall.
-  this->object_adapter_.non_servant_upcall_in_progress_ = 0;
-
-  // Reset thread id.
-  this->object_adapter_.non_servant_upcall_thread_ =
-    ACE_OS::NULL_thread;
-
-  // If locking is enabled.
-  if (this->object_adapter_.enable_locking_)
-    // Wakeup all waiting threads.
-    this->object_adapter_.non_servant_upcall_condition_.broadcast ();
-}
-
-TAO_Object_Adapter::Servant_Upcall::Servant_Upcall (TAO_Object_Adapter &object_adapter)
-  : object_adapter_ (object_adapter),
-    poa_ (0),
-    servant_ (0),
-    state_ (INITIAL_STAGE),
-    id_ (),
-    current_context_ (),
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-    cookie_ (0),
-    operation_ (0),
-#endif /* TAO_HAS_MINIMUM_CORBA */
-    active_object_map_entry_ (0),
-    using_servant_locator_ (0)
-{
-}
-
-void
-TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key,
-                                                        const char *operation,
-                                                        CORBA::Environment &ACE_TRY_ENV)
-{
-  // Acquire the object adapter lock first.
-  int result = this->object_adapter_.lock ().acquire ();
-  if (result == -1)
-    // Locking error.
-    ACE_THROW (CORBA::OBJ_ADAPTER ());
-
-  // We have acquired the object adapater lock.  Record this for later
-  // use.
-  this->state_ = OBJECT_ADAPTER_LOCK_ACQUIRED;
-
-  // Check if a non-servant upcall is in progress.  If a non-servant
-  // upcall is in progress, wait for it to complete.  Unless of
-  // course, the thread making the non-servant upcall is this thread.
-  this->wait_for_non_servant_upcalls_to_complete (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // Locate the POA.
-  this->object_adapter_.locate_poa (key,
-                                    this->id_,
-                                    this->poa_,
-                                    ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // Check the state of the POA Manager.
-  this->poa_->check_poa_manager_state (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // Setup current for this request.
-  this->current_context_.setup (this->poa_,
-                                key,
-                                0);
-
-  // We have setup the POA Current.  Record this for later use.
-  this->state_ = POA_CURRENT_SETUP;
-
-  {
-    ACE_FUNCTION_TIMEPROBE (TAO_POA_LOCATE_SERVANT_START);
-
-    // Lookup the servant.
-    this->servant_ = this->poa_->locate_servant_i (operation,
-                                                   this->id_,
-                                                   *this,
-                                                   this->current_context_,
-                                                   ACE_TRY_ENV);
-    ACE_CHECK;
-  }
-
-  // Now that we know the servant.
-  this->current_context_.servant (this->servant_);
-
-  // Increase <poa->outstanding_requests_> for the duration of the
-  // upcall.
-  //
-  // Note that the object adapter lock is released after
-  // <POA::outstanding_requests_> is increased.
-  this->poa_->increment_outstanding_requests ();
-
-  // Release the object adapter lock.
-  this->object_adapter_.lock ().release ();
-
-  // We have release the object adapater lock.  Record this for later
-  // use.
-  this->state_ = OBJECT_ADAPTER_LOCK_RELEASED;
-
-  // Lock servant (if appropriate).
-  this->single_threaded_poa_setup (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // We have acquired the servant lock.  Record this for later use.
-  this->state_ = SERVANT_LOCK_ACQUIRED;
-
-  // After this point, <this->servant_> is ready for dispatching.
-}
-
-TAO_Object_Adapter::Servant_Upcall::~Servant_Upcall ()
-{
-  switch (this->state_)
-    {
-    case SERVANT_LOCK_ACQUIRED:
-      // Unlock servant (if appropriate).
-      this->single_threaded_poa_cleanup ();
-      /* FALLTHRU */
-
-    case OBJECT_ADAPTER_LOCK_RELEASED:
-      // Cleanup servant locator related state.  Note that because
-      // this operation does not change any Object Adapter related
-      // state, it is ok to call it outside the lock.
-      this->servant_locator_cleanup ();
-
-      // Since the object adapter lock was released, we must acquire
-      // it.
-      //
-      // Note that errors are ignored here since we cannot do much
-      // with it.
-      this->object_adapter_.lock ().acquire ();
-
-      // Cleanup servant related state.
-      this->servant_cleanup ();
-
-      // Cleanup POA related state.
-      this->poa_cleanup ();
-      /* FALLTHRU */
-
-    case POA_CURRENT_SETUP:
-      // Teardown current for this request.
-      this->current_context_.teardown ();
-      /* FALLTHRU */
-
-    case OBJECT_ADAPTER_LOCK_ACQUIRED:
-      // Finally, since the object adapter lock was acquired, we must
-      // release it.
-      this->object_adapter_.lock ().release ();
-
-      /* FALLTHRU */
-    case INITIAL_STAGE:
-    default:
-      // @@ Keep compiler happy, the states above are the only
-      //    possible ones.
-      break;
-    }
-}
-
-void
-TAO_Object_Adapter::Servant_Upcall::wait_for_non_servant_upcalls_to_complete (CORBA::Environment &ACE_TRY_ENV)
-{
-  // Check if a non-servant upcall is in progress.  If a non-servant
-  // upcall is in progress, wait for it to complete.  Unless of
-  // course, the thread making the non-servant upcall is this thread.
-  while (this->object_adapter_.enable_locking_ &&
-         this->object_adapter_.non_servant_upcall_in_progress_ &&
-         ! ACE_OS::thr_equal (this->object_adapter_.non_servant_upcall_thread_,
-                              ACE_OS::thr_self ()))
-    {
-      // If so wait...
-      int result =
-        this->object_adapter_.non_servant_upcall_condition_.wait ();
-      if (result == -1)
-        ACE_THROW (CORBA::OBJ_ADAPTER ());
-    }
-}
-
-void
-TAO_Object_Adapter::Servant_Upcall::servant_locator_cleanup (void)
-{
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  if (this->using_servant_locator_)
-    {
-      // If we are a single threaded POA, teardown the appropriate
-      // locking in the servant.
-      //
-      // Note that teardown of the servant lock must happen before the
-      // post_invoke() call since that might end up deleting the
-      // servant.
-      //
-      this->poa_->teardown_servant_lock (this->servant_);
-
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
-        {
-          PortableServer::POA_var poa = this->poa_->_this (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          this->poa_->servant_locator_->postinvoke (this->current_context_.object_id (),
-                                                    poa.in (),
-                                                    this->operation_,
-                                                    this->cookie_,
-                                                    this->servant_,
-                                                    ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          // Ignore errors from servant locator ....
-        }
-      ACE_ENDTRY;
-    }
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-}
-
-void
-TAO_Object_Adapter::Servant_Upcall::single_threaded_poa_setup (CORBA::Environment &ACE_TRY_ENV)
-{
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  // Lock servant (if necessary).
-  //
-  // Note that this lock must be acquired *after* the object adapter
-  // lock has been released.  This is necessary since we cannot block
-  // waiting for the servant lock while holding the object adapter
-  // lock.  Otherwise, the thread that wants to release this lock will
-  // not be able to do so since it can't acquire the object adapterx
-  // lock.
-  if (this->poa_->policies ().thread () == PortableServer::SINGLE_THREAD_MODEL)
-    {
-      int result = this->servant_->_single_threaded_poa_lock ().acquire ();
-
-      if (result == -1)
-        // Locking error.
-        ACE_THROW (CORBA::OBJ_ADAPTER ());
-    }
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-}
-
-void
-TAO_Object_Adapter::Servant_Upcall::single_threaded_poa_cleanup (void)
-{
-  // Since the servant lock was acquired, we must release it.
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-  if (this->poa_->policies ().thread () == PortableServer::SINGLE_THREAD_MODEL)
-    this->servant_->_single_threaded_poa_lock ().release ();
-#endif /* TAO_HAS_MINIMUM_CORBA */
-}
-
-void
-TAO_Object_Adapter::Servant_Upcall::servant_cleanup (void)
-{
-  // Cleanup servant related stuff.
-  if (this->active_object_map_entry_ != 0)
-    {
-      // Decrement the reference count.
-      CORBA::UShort new_count = --this->active_object_map_entry_->reference_count_;
-
-      if (new_count == 0)
-        {
-          if (this->poa_->waiting_servant_deactivation_ > 0)
-            {
-              // Wakeup all waiting threads.
-              this->poa_->servant_deactivation_condition_.broadcast ();
-            }
-
-          ACE_DECLARE_NEW_CORBA_ENV;
-          ACE_TRY
-            {
-              this->poa_->cleanup_servant (this->active_object_map_entry_,
-                                           ACE_TRY_ENV);
-
-              ACE_TRY_CHECK;
-            }
-          ACE_CATCHANY
-            {
-              // Ignore errors from servant cleanup ....
-            }
-          ACE_ENDTRY;
-        }
-    }
-}
-
-void
-TAO_Object_Adapter::Servant_Upcall::poa_cleanup (void)
-{
-  // Decrease <poa->outstanding_requests_> now that the upcall
-  // is complete.
-  //
-  // Note that the object adapter lock is acquired before
-  // <POA::outstanding_requests_> is increased.
-  CORBA::ULong outstanding_requests =
-    this->poa_->decrement_outstanding_requests ();
-
-  // Check if all pending requests are over.
-  if (outstanding_requests == 0)
-    {
-      // If locking is enabled and some thread is waiting in POA::destroy.
-      if (this->object_adapter_.enable_locking_ &&
-          this->poa_->wait_for_completion_pending_)
-        // Wakeup all waiting threads.
-        this->poa_->outstanding_requests_condition_.broadcast ();
-      if (this->poa_->waiting_destruction_)
-        {
-          delete this->poa_;
-          this->poa_ = 0;
-        }
-    }
-}
-
-TAO_POA_Current_Impl::TAO_POA_Current_Impl (void)
-  : poa_ (0),
-    object_id_ (),
-    object_key_ (0),
-    servant_ (0),
-    previous_current_impl_ (0),
-    setup_done_ (0)
-{
-}
-
-void
-TAO_POA_Current_Impl::setup (TAO_POA *p,
-                             const TAO_ObjectKey &key,
-                             PortableServer::Servant servant)
-{
-  // Remember information about this upcall.
-  this->poa_ = p;
-  this->object_key_ = &key;
-  this->servant_ = servant;
-
-  // Set the current context and remember the old one.
-  TAO_TSS_Resources *tss =
-    TAO_TSS_RESOURCES::instance ();
-
-  this->previous_current_impl_ = tss->poa_current_impl_;
-  tss->poa_current_impl_ = this;
-
-  // Setup is complete.
-  this->setup_done_ = 1;
-}
-
-void
-TAO_POA_Current_Impl::teardown (void)
-{
-  if (this->setup_done_)
-    {
-      TAO_TSS_Resources *tss =
-        TAO_TSS_RESOURCES::instance ();
-
-      // Reset the old context.
-      tss->poa_current_impl_ = this->previous_current_impl_;
-    }
-}
-
-PortableServer::POA_ptr
-TAO_POA_Current_Impl::get_POA (CORBA::Environment &ACE_TRY_ENV)
-{
-  PortableServer::POA_var result = this->poa_->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  return result._retn ();
-}
-
-PortableServer::ObjectId *
-TAO_POA_Current_Impl::get_object_id (CORBA::Environment &)
-{
-  // Create a new one and pass it back
-  return new PortableServer::ObjectId (this->object_id_);
-}
-
-TAO_ORB_Core &
-TAO_POA_Current_Impl::orb_core (void) const
-{
-  return this->poa_->orb_core_;
-}
-
-PortableServer::POA_ptr
-TAO_POA_Current::get_POA (CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_POA_Current_Impl *impl = this->implementation ();
-
-  if (impl == 0)
-    ACE_THROW_RETURN (PortableServer::Current::NoContext (),
-                      0);
-  return impl->get_POA (ACE_TRY_ENV);
-}
-
-PortableServer::ObjectId *
-TAO_POA_Current::get_object_id (CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_POA_Current_Impl *impl = this->implementation ();
-
-  if (impl == 0)
-    ACE_THROW_RETURN (PortableServer::Current::NoContext (),
-                      0);
-  return impl->get_object_id (ACE_TRY_ENV);
-}
-
-TAO_POA_Current_Impl *
-TAO_POA_Current::implementation (void)
-{
-  return TAO_TSS_RESOURCES::instance ()->poa_current_impl_;
-}
-
-TAO_POA_Current_Impl *
-TAO_POA_Current::implementation (TAO_POA_Current_Impl *new_current)
-{
-  TAO_TSS_Resources *tss =
-    TAO_TSS_RESOURCES::instance ();
-
-  TAO_POA_Current_Impl *old = tss->poa_current_impl_;
-  tss->poa_current_impl_ = new_current;
-  return old;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-// Common typedefs.
-typedef TAO_Object_Adapter::poa_name key;
-typedef TAO_POA *value;
-typedef ACE_Reverse_Lock<ACE_Lock> REVERSE_LOCK;
-
-typedef ACE_Pair<key, value> expanded_value;
-typedef ACE_Reference_Pair<const key, value> value_type;
-typedef ACE_Equal_To<key> compare_keys;
-typedef TAO_ObjectId_Hash hash_key;
-typedef ACE_Noop_Key_Generator<key> noop_key_generator;
-
-template class ACE_Reverse_Lock<ACE_Lock>;
-template class ACE_Guard<REVERSE_LOCK>;
-
-template class auto_ptr<TAO_Object_Adapter::Hint_Strategy>;
-template class auto_ptr<TAO_Object_Adapter::transient_poa_map>;
-
-template class ACE_Auto_Basic_Ptr<TAO_Object_Adapter::Hint_Strategy>;
-template class ACE_Auto_Basic_Ptr<TAO_Object_Adapter::transient_poa_map>;
-
-template class ACE_Noop_Key_Generator<key>;
-
-// Common
-template class ACE_Reference_Pair<const key, value>;
-
-// Map and iterator classes.
-template class ACE_Map<key, value>;
-template class ACE_Iterator<value_type>;
-template class ACE_Reverse_Iterator<value_type>;
-
-// Iterator base classes.
-template class ACE_Iterator_Impl<value_type>;
-template class ACE_Reverse_Iterator_Impl<value_type>;
-
-// Active Map Manager related.
-template class ACE_Pair<key, value>;
-template class ACE_Active_Map_Manager_Adapter<key, value, TAO_Ignore_Original_Key_Adapter>;
-template class ACE_Active_Map_Manager_Adapter<key, value, TAO_Preserve_Original_Key_Adapter>;
-template class ACE_Active_Map_Manager_Iterator_Adapter<value_type, expanded_value>;
-template class ACE_Active_Map_Manager_Reverse_Iterator_Adapter<value_type, expanded_value>;
-template class ACE_Active_Map_Manager<expanded_value>;
-template class ACE_Map_Manager<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>;
-template class ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>;
-template class ACE_Map_Iterator<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>;
-template class ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>;
-template class ACE_Map_Entry<ACE_Active_Map_Manager_Key, expanded_value>;
-
-// Hash Map Manager related.
-template class ACE_Hash_Map_Manager_Ex_Adapter<key, value, hash_key, compare_keys, TAO_Incremental_Key_Generator>;
-template class ACE_Hash_Map_Manager_Ex_Adapter<key, value, hash_key, compare_keys, noop_key_generator>;
-template class ACE_Hash_Map_Manager_Ex_Iterator_Adapter<value_type, key, value, hash_key, compare_keys>;
-template class ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<value_type, key, value, hash_key, compare_keys>;
-template class ACE_Hash_Map_Manager_Ex<key, value, hash_key, compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<key, value, hash_key, compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<key, value, hash_key, compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<key, value, hash_key, compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<key, value>;
-
-// Already in Active_Object_Map.cpp
-// template class ACE_Equal_To<key>;
-
-// Map Manager related.
-template class ACE_Map_Manager_Iterator_Adapter<value_type, key, value>;
-template class ACE_Map_Manager_Reverse_Iterator_Adapter<value_type, key, value>;
-template class ACE_Map_Manager_Adapter<key, value, TAO_Incremental_Key_Generator>;
-template class ACE_Map_Manager_Adapter<key, value, noop_key_generator>;
-template class ACE_Map_Manager<key, value, ACE_Null_Mutex>;
-template class ACE_Map_Iterator_Base<key, value, ACE_Null_Mutex>;
-template class ACE_Map_Iterator<key, value, ACE_Null_Mutex>;
-template class ACE_Map_Reverse_Iterator<key, value, ACE_Null_Mutex>;
-template class ACE_Map_Entry<key, value>;
-
-template class ACE_Unbounded_Set<TAO_POA_Manager *>;
-template class ACE_Node<TAO_POA_Manager *>;
-template class ACE_Unbounded_Set_Iterator<TAO_POA_Manager *>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-// Common typedefs.
-typedef TAO_Object_Adapter::poa_name key;
-typedef TAO_POA *value;
-typedef ACE_Reverse_Lock<ACE_Lock> REVERSE_LOCK;
-
-typedef ACE_Pair<key, value> expanded_value;
-typedef ACE_Reference_Pair<const key, value> value_type;
-typedef ACE_Equal_To<key> compare_keys;
-typedef TAO_ObjectId_Hash hash_key;
-typedef ACE_Noop_Key_Generator<key> noop_key_generator;
-
-#pragma instantiate ACE_Reverse_Lock<ACE_Lock>
-#pragma instantiate ACE_Guard<REVERSE_LOCK>
-
-#pragma instantiate auto_ptr<TAO_Object_Adapter::Hint_Strategy>
-#pragma instantiate auto_ptr<TAO_Object_Adapter::transient_poa_map>
-
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Object_Adapter::Hint_Strategy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Object_Adapter::transient_poa_map>
-
-#pragma instantiate ACE_Noop_Key_Generator<key>
-
-// Common
-#pragma instantiate ACE_Reference_Pair<const key, value>
-
-// Map and iterator classes.
-#pragma instantiate ACE_Map<key, value>
-#pragma instantiate ACE_Iterator<value_type>
-#pragma instantiate ACE_Reverse_Iterator<value_type>
-
-// Iterator base classes.
-#pragma instantiate ACE_Iterator_Impl<value_type>
-#pragma instantiate ACE_Reverse_Iterator_Impl<value_type>
-
-// Active Map Manager related.
-#pragma instantiate ACE_Pair<key, value>
-#pragma instantiate ACE_Active_Map_Manager_Adapter<key, value, TAO_Ignore_Original_Key_Adapter>
-#pragma instantiate ACE_Active_Map_Manager_Adapter<key, value, TAO_Preserve_Original_Key_Adapter>
-#pragma instantiate ACE_Active_Map_Manager_Iterator_Adapter<value_type, expanded_value>
-#pragma instantiate ACE_Active_Map_Manager_Reverse_Iterator_Adapter<value_type, expanded_value>
-#pragma instantiate ACE_Active_Map_Manager<expanded_value>
-#pragma instantiate ACE_Map_Manager<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Entry<ACE_Active_Map_Manager_Key, expanded_value>
-
-// Hash Map Manager related.
-#pragma instantiate ACE_Hash_Map_Manager_Ex_Adapter<key, value, hash_key, compare_keys, TAO_Incremental_Key_Generator>
-#pragma instantiate ACE_Hash_Map_Manager_Ex_Adapter<key, value, hash_key, compare_keys, noop_key_generator>
-#pragma instantiate ACE_Hash_Map_Manager_Ex_Iterator_Adapter<value_type, key, value, hash_key, compare_keys>
-#pragma instantiate ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<value_type, key, value, hash_key, compare_keys>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<key, value, hash_key, compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<key, value, hash_key, compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<key, value, hash_key, compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<key, value, hash_key, compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<key, value>
-
-// Already in Active_Object_Map.cpp
-// #pragma instantiate ACE_Equal_To<key>
-
-// Map Manager related.
-#pragma instantiate ACE_Map_Manager_Iterator_Adapter<value_type, key, value>
-#pragma instantiate ACE_Map_Manager_Reverse_Iterator_Adapter<value_type, key, value>
-#pragma instantiate ACE_Map_Manager_Adapter<key, value, TAO_Incremental_Key_Generator>
-#pragma instantiate ACE_Map_Manager_Adapter<key, value, noop_key_generator>
-#pragma instantiate ACE_Map_Manager<key, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator_Base<key, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator<key, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<key, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Entry<key, value>
-
-#pragma instantiate ACE_Unbounded_Set<TAO_POA_Manager *>
-#pragma instantiate ACE_Node<TAO_POA_Manager *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_POA_Manager *>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Object_Adapter.h b/TAO/tao/Object_Adapter.h
deleted file mode 100644
index 60e33b58535..00000000000
--- a/TAO/tao/Object_Adapter.h
+++ /dev/null
@@ -1,650 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Object_Adapter.h
-//
-// = AUTHOR
-//    Irfan Pyarali
-//
-// ============================================================================
-
-#ifndef TAO_OBJECT_ADAPTER_H
-#define TAO_OBJECT_ADAPTER_H
-
-#include "tao/Key_Adapters.h"
-#include "tao/Server_Strategy_Factory.h"
-#include "tao/poa_macros.h"
-
-// Stubs
-#include "tao/POAC.h"
-
-// Servant
-#include "tao/Servant_Base.h"
-
-// Skeletons
-#include "tao/POAS.h"
-
-// Active Object Table
-#include "tao/Active_Object_Map.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-////////////////////////////////////////////////////////////////////////////////
-
-// Forward declaration
-class TAO_POA;
-class TAO_POA_Manager;
-class TAO_Temporary_Creation_Time;
-class TAO_POA_Current_Impl;
-
-class TAO_Export TAO_POA_Current : public POA_PortableServer::Current
-{
-public:
-  TAO_POA_Current (void);
-  // Constructor
-
-  PortableServer::POA_ptr get_POA (CORBA_Environment &ACE_TRY_ENV);
-  // Returns the POA on which the current request is being invoked.
-  // Can raise the <CORBA::NoContext> exception if this function is
-  // not invoked in the context of an upcall.
-
-  PortableServer::ObjectId *get_object_id (CORBA_Environment &ACE_TRY_ENV);
-  // Returns the object id of the current request being invoked.  Can
-  // raise the <CORBA::NoContext> exception if this function is not
-  // invoked in the context of an upcall.
-
-  TAO_POA_Current_Impl *implementation (void);
-  // Returns the class that implements this interface.
-
-  TAO_POA_Current_Impl *implementation (TAO_POA_Current_Impl *new_current);
-  // Sets the thread-specific pointer to the new POA Current state,
-  // returning a pointer to the existing POA Current state.
-};
-
-class TAO_Export TAO_POA_Current_Impl
-{
-  // = TITLE
-  //
-  //     Implementation of the PortableServer::Current object.
-  //
-  // = DESCRIPTION
-  //
-  //     Objects of this class hold state information regarding the
-  //     current POA invocation.  Savvy readers will notice that this
-  //     contains substantially more methods than the POA spec shows;
-  //     they exist because the ORB either (a) needs them or (b) finds
-  //     them useful for implementing a more efficient ORB.
-  //
-  //     The intent is that instances of this class are held in
-  //     Thread-Specific Storage so that upcalls can get context
-  //     information regarding their invocation.  The POA itself must
-  //     insure that all <set_*> operations are performed in the
-  //     execution thread so that the proper <TAO_POA_Current> pointer
-  //     is obtained from TSS.
-public:
-
-  friend class TAO_POA;
-
-  PortableServer::POA_ptr get_POA (CORBA_Environment &ACE_TRY_ENV);
-  // Return pointer to the invoking POA.  Raises the
-  // <CORBA::NoContext> exception.
-
-  PortableServer::ObjectId *get_object_id (CORBA_Environment &ACE_TRY_ENV);
-  // Return pointer to the object id through which this was invoked.
-  // This may be necessary in cases where a <Servant> is serving under
-  // the guise of multiple object ids.  This has _out semantics Raises
-  // the <CORBA::NoContext> exception.
-
-  void poa (TAO_POA *);
-  // Set the POA implementation.
-
-  TAO_POA *poa (void) const;
-  // Get the POA imeplemantation
-
-  TAO_ORB_Core &orb_core (void) const;
-  // ORB Core for this current.
-
-  void object_id (const PortableServer::ObjectId &id);
-  // Set the object ID.
-
-  const PortableServer::ObjectId &object_id (void) const;
-  // Get the object ID.
-
-  void object_key (const TAO_ObjectKey &key);
-  // Set the object key.
-
-  const TAO_ObjectKey &object_key (void) const;
-  // Get the object key.
-
-  void servant (PortableServer::Servant servant);
-  // Set the servant for the current upcall.
-
-  PortableServer::Servant servant (void) const;
-  // Get the servant for the current upcall.
-
-  TAO_POA_Current_Impl (void);
-  // Convenience constructor combining construction & initialization.
-
-  void teardown (void);
-  // Teardown the current for this request.
-
-  void setup (TAO_POA *impl,
-              const TAO_ObjectKey &key,
-              PortableServer::Servant servant);
-  // Setup the current.
-
-protected:
-  TAO_POA *poa_;
-  // The POA implementation invoking an upcall
-
-  PortableServer::ObjectId object_id_;
-  // The object ID of the current context.  This is the user id and
-  // not the id the goes into the IOR.  Note also that unlike the
-  // <object_key>, this field is stored by value.
-
-  const TAO_ObjectKey *object_key_;
-  // The object key of the current context.
-
-  PortableServer::Servant servant_;
-  // The servant for the current upcall.
-
-  TAO_POA_Current_Impl *previous_current_impl_;
-  // Current previous from <this>.
-
-  int setup_done_;
-  // Is setup complete?
-
-  // = Hidden because we don't allow these
-  TAO_POA_Current_Impl (const TAO_POA_Current_Impl &);
-  void operator= (const TAO_POA_Current_Impl &);
-};
-
-class TAO_Object_Adapter
-{
-  // = TITLE
-  //     Defines the Object Adapter abstraction.
-  //
-  // = DESCRIPTION
-  //     This class will be used as a facade for the POAs in a server
-public:
-
-  typedef PortableServer::ObjectId poa_name;
-  typedef PortableServer::ObjectId_var poa_name_var;
-  typedef PortableServer::ObjectId_out poa_name_out;
-
-  TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters,
-                      TAO_ORB_Core &orb_core);
-  // Constructor.
-
-  ~TAO_Object_Adapter (void);
-  // Destructor.
-
-  void dispatch_servant (const TAO_ObjectKey &key,
-                         CORBA::ServerRequest &req,
-                         void *context,
-                         CORBA_Environment &ACE_TRY_ENV);
-
-  int locate_servant (const TAO_ObjectKey &key,
-                      CORBA_Environment &ACE_TRY_ENV);
-
-  TAO_SERVANT_LOCATION find_servant (const TAO_ObjectKey &key,
-                                     PortableServer::Servant &servant,
-                                     CORBA_Environment &ACE_TRY_ENV);
-
-  int find_poa (const poa_name &system_name,
-                CORBA::Boolean activate_it,
-                CORBA::Boolean root,
-                const TAO_Temporary_Creation_Time &poa_creation_time,
-                TAO_POA *&poa,
-                CORBA_Environment &ACE_TRY_ENV);
-
-  int bind_poa (const poa_name &folded_name,
-                TAO_POA *poa,
-                poa_name_out system_name);
-
-  int unbind_poa (TAO_POA *poa,
-                  const poa_name &folded_name,
-                  const poa_name &system_name);
-
-  int activate_poa (const poa_name &folded_name,
-                    TAO_POA *&poa,
-                    CORBA_Environment &ACE_TRY_ENV);
-
-  ACE_Lock &lock (void);
-
-  ACE_SYNCH_MUTEX &thread_lock (void);
-
-  ACE_Reverse_Lock<ACE_Lock> &reverse_lock (void);
-
-  static CORBA::ULong transient_poa_name_size (void);
-
-  void deactivate (CORBA::Boolean wait_for_completion,
-                   CORBA::Environment &ACE_TRY_ENV);
-
-  typedef ACE_Unbounded_Set<TAO_POA_Manager *> poa_manager_set;
-
-  poa_manager_set poa_manager_set_;
-
-protected:
-
-  void deactivate_i (CORBA::Boolean wait_for_completion,
-                     CORBA::Environment &ACE_TRY_ENV);
-
-  int locate_servant_i (const TAO_ObjectKey &key,
-                        CORBA_Environment &ACE_TRY_ENV);
-
-  TAO_SERVANT_LOCATION find_servant_i (const TAO_ObjectKey &key,
-                                       PortableServer::Servant &servant,
-                                       CORBA_Environment &ACE_TRY_ENV);
-
-  void dispatch_servant_i (const TAO_ObjectKey &key,
-                           CORBA::ServerRequest &req,
-                           void *context,
-                           CORBA_Environment &ACE_TRY_ENV);
-
-  void locate_poa (const TAO_ObjectKey &key,
-                   PortableServer::ObjectId &id,
-                   TAO_POA *&poa,
-                   CORBA_Environment &ACE_TRY_ENV);
-
-  int find_transient_poa (const poa_name &system_name,
-                          CORBA::Boolean root,
-                          const TAO_Temporary_Creation_Time &poa_creation_time,
-                          TAO_POA *&poa);
-
-  int find_persistent_poa (const poa_name &system_name,
-                           TAO_POA *&poa,
-                           CORBA_Environment &ACE_TRY_ENV);
-
-  int bind_transient_poa (TAO_POA *poa,
-                          poa_name_out system_name);
-
-  int bind_persistent_poa (const poa_name &folded_name,
-                           TAO_POA *poa,
-                           poa_name_out system_name);
-
-  int unbind_transient_poa (const poa_name &system_name);
-
-  int unbind_persistent_poa (const poa_name &folded_name,
-                             const poa_name &system_name);
-
-  static ACE_Lock *create_lock (int enable_locking,
-                                ACE_SYNCH_MUTEX &thread_lock);
-
-public:
-
-  class Hint_Strategy
-  {
-    // = TITLE
-    //     Base class for POA active hint strategy.
-    //
-    // = DESCRIPTION
-    //     This class also provides for common structures used by all
-    //     the derived classes.
-  public:
-
-    virtual ~Hint_Strategy (void);
-
-    virtual int find_persistent_poa (const poa_name &system_name,
-                                     TAO_POA *&poa,
-                                     CORBA_Environment &ACE_TRY_ENV) = 0;
-
-    virtual int bind_persistent_poa (const poa_name &folded_name,
-                                     TAO_POA *poa,
-                                     poa_name_out system_name) = 0;
-
-    virtual int unbind_persistent_poa (const poa_name &folded_name,
-                                       const poa_name &system_name) = 0;
-
-    void object_adapter (TAO_Object_Adapter *oa);
-
-  protected:
-
-    TAO_Object_Adapter *object_adapter_;
-  };
-
-  class Active_Hint_Strategy : public Hint_Strategy
-  {
-    // = TITLE
-    //     This class uses active demux hint for POA active hint
-    //     strategy.
-    //
-    // = DESCRIPTION
-    //     This class will append an active hint to the POA name,
-    //     making the POA lookups fast and predictable.
-  public:
-
-    Active_Hint_Strategy (CORBA::ULong map_size);
-
-    virtual ~Active_Hint_Strategy (void);
-
-    virtual int find_persistent_poa (const poa_name &system_name,
-                                     TAO_POA *&poa,
-                                     CORBA_Environment &ACE_TRY_ENV);
-
-    virtual int bind_persistent_poa (const poa_name &folded_name,
-                                     TAO_POA *poa,
-                                     poa_name_out system_name);
-
-    virtual int unbind_persistent_poa (const poa_name &folded_name,
-                                       const poa_name &system_name);
-
-  protected:
-
-    typedef ACE_Active_Map_Manager_Adapter<
-    poa_name,
-      TAO_POA *,
-      TAO_Preserve_Original_Key_Adapter> persistent_poa_system_map;
-
-    persistent_poa_system_map persistent_poa_system_map_;
-  };
-
-  class No_Hint_Strategy : public Hint_Strategy
-  {
-    // = TITLE
-    //     This class doesn't use any hints for POA active hint
-    //     strategy.
-    //
-    // = DESCRIPTION
-    //     This class will simply use the POA names as is. And since
-    //     no hint is added, the IORs will be smaller.
-  public:
-
-    virtual ~No_Hint_Strategy (void);
-
-    virtual int find_persistent_poa (const poa_name &system_name,
-                                     TAO_POA *&poa,
-                                     CORBA_Environment &ACE_TRY_ENV);
-
-    virtual int bind_persistent_poa (const poa_name &folded_name,
-                                     TAO_POA *poa,
-                                     poa_name_out system_name);
-
-    virtual int unbind_persistent_poa (const poa_name &folded_name,
-                                       const poa_name &system_name);
-
-  };
-
-protected:
-
-  Hint_Strategy *hint_strategy_;
-
-  typedef ACE_Map<
-  poa_name,
-    TAO_POA *> transient_poa_map;
-  // Base class of the id map.
-
-  typedef ACE_Hash_Map_Manager_Ex_Adapter<
-  poa_name,
-    TAO_POA *,
-    TAO_ObjectId_Hash,
-    ACE_Equal_To<poa_name>,
-    TAO_Incremental_Key_Generator> transient_poa_hash_map;
-  // Id hash map.
-
-  typedef ACE_Map_Manager_Adapter<
-  poa_name,
-    TAO_POA *,
-    TAO_Incremental_Key_Generator> transient_poa_linear_map;
-  // Id linear map.
-
-  typedef ACE_Active_Map_Manager_Adapter<
-  poa_name,
-    TAO_POA *,
-    TAO_Ignore_Original_Key_Adapter> transient_poa_active_map;
-  // Id active map.
-
-  typedef ACE_Map<
-  poa_name,
-    TAO_POA *> persistent_poa_name_map;
-  // Base class of the name map.
-
-  typedef ACE_Hash_Map_Manager_Ex_Adapter<
-  poa_name,
-    TAO_POA *,
-    TAO_ObjectId_Hash,
-    ACE_Equal_To<PortableServer::ObjectId>,
-    ACE_Noop_Key_Generator<poa_name> > persistent_poa_name_hash_map;
-  // Id hash map.
-
-  typedef ACE_Map_Manager_Adapter<
-  poa_name,
-    TAO_POA *,
-    ACE_Noop_Key_Generator<poa_name> > persistent_poa_name_linear_map;
-  // Id linear map.
-
-public:
-
-  persistent_poa_name_map *persistent_poa_name_map_;
-  transient_poa_map *transient_poa_map_;
-
-protected:
-
-  static size_t transient_poa_name_size_;
-
-  static void set_transient_poa_name_size (const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters);
-
-  TAO_ORB_Core &orb_core_;
-
-  int enable_locking_;
-
-  ACE_SYNCH_MUTEX thread_lock_;
-
-  ACE_Lock *lock_;
-
-  ACE_Reverse_Lock<ACE_Lock> reverse_lock_;
-
-  ACE_SYNCH_CONDITION non_servant_upcall_condition_;
-  // Condition variable for waiting on non-servant upcalls to end.
-
-  CORBA::Boolean non_servant_upcall_in_progress_;
-  // Flag for knowing when an non-servant upcall is in progress.
-
-  ACE_thread_t non_servant_upcall_thread_;
-  // Id of thread making the non-servant upcall.
-
-public:
-
-  class poa_name_iterator
-  {
-    // = TITLE
-    //     Iterator for a folded poa name.
-  public:
-
-    poa_name_iterator (int begin,
-                       CORBA::ULong size,
-                       const CORBA::Octet *folded_buffer);
-    // Constructor.
-
-    int operator== (const poa_name_iterator &rhs) const;
-    int operator!= (const poa_name_iterator &rhs) const;
-    // Comparison operators.
-
-    ACE_CString operator* () const;
-    // Dereference operator.
-
-    poa_name_iterator &operator++ (void);
-    // Prefix advance.
-
-  protected:
-
-    CORBA::ULong size_;
-    CORBA::ULong position_;
-    const CORBA::Octet *folded_buffer_;
-    CORBA::ULong last_separator_;
-  };
-
-  class iteratable_poa_name
-  {
-    // = TITLE
-    //     This class allows iteration over a folded poa name.
-  public:
-
-    typedef poa_name_iterator iterator;
-
-    iteratable_poa_name (const poa_name &folded_name);
-
-    iterator begin (void) const;
-    iterator end (void) const;
-
-  protected:
-
-    const poa_name &folded_name_;
-  };
-
-  class Non_Servant_Upcall
-  {
-    // = TITLE
-    //     This class helps us with a recursive thread lock without
-    //     using a recursive thread lock.  Non_Servant_Upcall has a
-    //     magic constructor and destructor.  We unlock the
-    //     Object_Adapter lock for the duration of the non-servant
-    //     (i.e., adapter activator and servant activator) upcalls;
-    //     reacquiring once the upcalls complete.  Even though we are
-    //     releasing the lock, other threads will not be able to make
-    //     progress since
-    //     <Object_Adapter::non_servant_upcall_in_progress_> has been
-    //     set.
-  public:
-
-    Non_Servant_Upcall (TAO_Object_Adapter &object_adapter);
-    // Constructor.
-
-    ~Non_Servant_Upcall (void);
-    // Destructor.
-
-  protected:
-
-    TAO_Object_Adapter &object_adapter_;
-  };
-
-  friend class Non_Servant_Upcall;
-
-  class TAO_Export Servant_Upcall
-  {
-    // = TITLE
-    //     This class finds out the POA and the servant to perform an
-    //     upcall.  It can only be instantiated without the object
-    //     adapter's lock held.
-  public:
-
-    friend class TAO_POA;
-
-    Servant_Upcall (TAO_Object_Adapter &object_adapter);
-    // Constructor.
-
-    ~Servant_Upcall (void);
-    // Destructor.
-
-    void prepare_for_upcall (const TAO_ObjectKey &key,
-                             const char *operation,
-                             CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
-    // Locate POA and servant.
-
-    TAO_POA &poa (void) const;
-    // POA accessor.
-
-    TAO_Object_Adapter &object_adapter (void) const;
-    // Object Adapter accessor.
-
-    const PortableServer::ObjectId &id (void) const;
-    // ID accessor.
-
-    PortableServer::Servant servant (void) const;
-    // Servant accessor.
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-    PortableServer::ServantLocator::Cookie locator_cookie (void) const;
-    // Get the Servant Locator's cookie
-
-    void locator_cookie (PortableServer::ServantLocator::Cookie cookie);
-    // Set the Servant Locator's cookie
-
-    const char *operation (void) const;
-    // Get the operation name.
-
-    void operation (const char *);
-    // Set the operation name.
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-    void active_object_map_entry (TAO_Active_Object_Map::Map_Entry *entry);
-    // Set the <active_object_map_entry>.
-
-    TAO_Active_Object_Map::Map_Entry *active_object_map_entry (void) const;
-    // Get the <active_object_map_entry>.
-
-    void using_servant_locator (void);
-    // We are using the servant locator for this upcall.
-
-  protected:
-
-    void wait_for_non_servant_upcalls_to_complete (CORBA::Environment &ACE_TRY_ENV);
-    void servant_locator_cleanup (void);
-    void single_threaded_poa_setup (CORBA::Environment &ACE_TRY_ENV);
-    void single_threaded_poa_cleanup (void);
-    void servant_cleanup (void);
-    void poa_cleanup (void);
-
-    TAO_Object_Adapter &object_adapter_;
-
-    TAO_POA *poa_;
-
-    PortableServer::Servant servant_;
-
-    enum State
-    {
-      INITIAL_STAGE,
-      OBJECT_ADAPTER_LOCK_ACQUIRED,
-      POA_CURRENT_SETUP,
-      OBJECT_ADAPTER_LOCK_RELEASED,
-      SERVANT_LOCK_ACQUIRED
-    };
-
-    State state_;
-
-    PortableServer::ObjectId id_;
-
-    TAO_POA_Current_Impl current_context_;
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-    PortableServer::ServantLocator::Cookie cookie_;
-    // Servant Locator's cookie
-
-    const char *operation_;
-    // Operation name for this current.
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-    TAO_Active_Object_Map::Map_Entry *active_object_map_entry_;
-    // Pointer to the entry in the TAO_Active_Object_Map corresponding
-    // to the servant for this request.
-
-    int using_servant_locator_;
-    // Are we using the servant locator?
-
-  private:
-    Servant_Upcall (const Servant_Upcall &);
-    void operator= (const Servant_Upcall &);
-  };
-
-  friend class Servant_Upcall;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-#if defined (__ACE_INLINE__)
-# include "tao/Object_Adapter.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_OBJECT_ADAPTER_H */
diff --git a/TAO/tao/Object_Adapter.i b/TAO/tao/Object_Adapter.i
deleted file mode 100644
index 0b74301bc99..00000000000
--- a/TAO/tao/Object_Adapter.i
+++ /dev/null
@@ -1,262 +0,0 @@
-// $Id$
-
-
-ACE_INLINE
-TAO_POA_Current::TAO_POA_Current (void)
-{
-}
-
-ACE_INLINE ACE_Lock &
-TAO_Object_Adapter::lock (void)
-{
-  return *this->lock_;
-}
-
-ACE_INLINE ACE_SYNCH_MUTEX &
-TAO_Object_Adapter::thread_lock (void)
-{
-  return this->thread_lock_;
-}
-
-ACE_INLINE ACE_Reverse_Lock<ACE_Lock> &
-TAO_Object_Adapter::reverse_lock (void)
-{
-  return this->reverse_lock_;
-}
-
-/* static */
-ACE_INLINE CORBA::ULong
-TAO_Object_Adapter::transient_poa_name_size ()
-{
-  return TAO_Object_Adapter::transient_poa_name_size_;
-}
-
-ACE_INLINE void
-TAO_Object_Adapter::deactivate (CORBA::Boolean wait_for_completion,
-                                CORBA::Environment &ACE_TRY_ENV)
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
-
-  this->deactivate_i (wait_for_completion,
-                      ACE_TRY_ENV);
-}
-
-ACE_INLINE int
-TAO_Object_Adapter::locate_servant (const TAO_ObjectKey &key,
-                                    CORBA::Environment &ACE_TRY_ENV)
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), -1);
-
-  return this->locate_servant_i (key,
-                                 ACE_TRY_ENV);
-}
-
-ACE_INLINE TAO_SERVANT_LOCATION
-TAO_Object_Adapter::find_servant (const TAO_ObjectKey &key,
-                                  PortableServer::Servant &servant,
-                                  CORBA::Environment &ACE_TRY_ENV)
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), TAO_SERVANT_NOT_FOUND);
-
-  return this->find_servant_i (key,
-                               servant,
-                               ACE_TRY_ENV);
-}
-
-ACE_INLINE int
-TAO_Object_Adapter::find_persistent_poa (const poa_name &system_name,
-                                         TAO_POA *&poa,
-                                         CORBA_Environment &ACE_TRY_ENV)
-{
-  return this->hint_strategy_->find_persistent_poa (system_name,
-                                                    poa,
-                                                    ACE_TRY_ENV);
-}
-
-ACE_INLINE int
-TAO_Object_Adapter::find_poa (const poa_name &system_name,
-                              CORBA::Boolean activate_it,
-                              CORBA::Boolean root,
-                              const TAO_Temporary_Creation_Time &poa_creation_time,
-                              TAO_POA *&poa,
-                              CORBA_Environment &ACE_TRY_ENV)
-{
-  if (activate_it)
-    {
-      return this->find_persistent_poa (system_name,
-                                        poa,
-                                        ACE_TRY_ENV);
-    }
-  else
-    {
-      return this->find_transient_poa (system_name,
-                                       root,
-                                       poa_creation_time,
-                                       poa);
-    }
-}
-
-ACE_INLINE int
-TAO_Object_Adapter::bind_transient_poa (TAO_POA *poa,
-                                        poa_name_out system_name)
-{
-  poa_name name;
-  int result = this->transient_poa_map_->bind_create_key (poa,
-                                                          name);
-
-  if (result == 0)
-    {
-      ACE_NEW_RETURN (system_name,
-                      poa_name (name),
-                      -1);
-    }
-
-  return result;
-}
-
-ACE_INLINE int
-TAO_Object_Adapter::bind_persistent_poa (const poa_name &folded_name,
-                                         TAO_POA *poa,
-                                         poa_name_out system_name)
-{
-  return this->hint_strategy_->bind_persistent_poa (folded_name,
-                                                    poa,
-                                                    system_name);
-}
-
-ACE_INLINE int
-TAO_Object_Adapter::unbind_transient_poa (const poa_name &system_name)
-{
-  return this->transient_poa_map_->unbind (system_name);
-}
-
-ACE_INLINE int
-TAO_Object_Adapter::unbind_persistent_poa (const poa_name &folded_name,
-                                           const poa_name &system_name)
-{
-  return this->hint_strategy_->unbind_persistent_poa (folded_name,
-                                                      system_name);
-}
-
-ACE_INLINE TAO_POA &
-TAO_Object_Adapter::Servant_Upcall::poa (void) const
-{
-  return *this->poa_;
-}
-
-ACE_INLINE PortableServer::Servant
-TAO_Object_Adapter::Servant_Upcall::servant (void) const
-{
-  return this->servant_;
-}
-
-ACE_INLINE TAO_Object_Adapter &
-TAO_Object_Adapter::Servant_Upcall::object_adapter (void) const
-{
-  return this->object_adapter_;
-}
-
-ACE_INLINE const PortableServer::ObjectId &
-TAO_Object_Adapter::Servant_Upcall::id (void) const
-{
-  return this->id_;
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-ACE_INLINE PortableServer::ServantLocator::Cookie
-TAO_Object_Adapter::Servant_Upcall::locator_cookie (void) const
-{
-  return this->cookie_;
-}
-
-ACE_INLINE void
-TAO_Object_Adapter::Servant_Upcall::locator_cookie (PortableServer::ServantLocator::Cookie cookie)
-{
-  this->cookie_ = cookie;
-}
-
-ACE_INLINE const char *
-TAO_Object_Adapter::Servant_Upcall::operation (void) const
-{
-  return this->operation_;
-}
-
-ACE_INLINE void
-TAO_Object_Adapter::Servant_Upcall::operation (const char *name)
-{
-  this->operation_ = name;
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-ACE_INLINE void
-TAO_Object_Adapter::Servant_Upcall::active_object_map_entry (TAO_Active_Object_Map::Map_Entry *entry)
-{
-  this->active_object_map_entry_ = entry;
-}
-
-ACE_INLINE TAO_Active_Object_Map::Map_Entry *
-TAO_Object_Adapter::Servant_Upcall::active_object_map_entry (void) const
-{
-  return this->active_object_map_entry_;
-}
-
-ACE_INLINE void
-TAO_Object_Adapter::Servant_Upcall::using_servant_locator (void)
-{
-  this->using_servant_locator_ = 1;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-ACE_INLINE void
-TAO_POA_Current_Impl::poa (TAO_POA *p)
-{
-  this->poa_ = p;
-}
-
-ACE_INLINE TAO_POA *
-TAO_POA_Current_Impl::poa (void) const
-{
-  return this->poa_;
-}
-
-ACE_INLINE void
-TAO_POA_Current_Impl::object_id (const PortableServer::ObjectId &id)
-{
-  this->object_id_ = id;
-}
-
-ACE_INLINE const PortableServer::ObjectId &
-TAO_POA_Current_Impl::object_id (void) const
-{
-  return this->object_id_;
-}
-
-ACE_INLINE void
-TAO_POA_Current_Impl::object_key (const TAO_ObjectKey &key)
-{
-  this->object_key_ = &key;
-}
-
-ACE_INLINE const TAO_ObjectKey &
-TAO_POA_Current_Impl::object_key (void) const
-{
-  return *this->object_key_;
-}
-
-ACE_INLINE void
-TAO_POA_Current_Impl::servant (PortableServer::Servant servant)
-{
-  this->servant_ = servant;
-}
-
-ACE_INLINE PortableServer::Servant
-TAO_POA_Current_Impl::servant (void) const
-{
-  return this->servant_;
-}
diff --git a/TAO/tao/Object_Key.pidl b/TAO/tao/Object_Key.pidl
deleted file mode 100644
index 742d7aaabf8..00000000000
--- a/TAO/tao/Object_Key.pidl
+++ /dev/null
@@ -1,9 +0,0 @@
-// $Id$
-
-// TAO specific IDL definition of an octet sequence that we use to represent
-// Object keys inside the POA.
-
-module TAO
-{
-  typedef sequence<octet> ObjectKey;
-};
diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp
deleted file mode 100644
index 7b6d0db4b97..00000000000
--- a/TAO/tao/Object_KeyC.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "tao/Object_KeyC.h"
-#include "tao/Typecode.h"
-
-#if !defined (__ACE_INLINE__)
-#include "Object_KeyC.i"
-#endif // !defined INLINE
-
-ACE_RCSID(tao, Object_KeyC, "$Id$")
-
-const CORBA::Long _oc_TAO__tao_seq_Octet[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-
-  0,
-};
-CORBA::TypeCode _tc_TAO_tc_TAO__tao_seq_Octet (CORBA::tk_sequence, sizeof
-                                            (_oc_TAO__tao_seq_Octet), (char *)
-                                            &_oc_TAO__tao_seq_Octet, 0,
-                                            sizeof (TAO_ObjectKey));
-CORBA::TypeCode_ptr TAO_tc__tao_seq_Octet = &_tc_TAO_tc_TAO__tao_seq_Octet;
-
-const CORBA::Long _oc_TAO_ObjectKey[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  22, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f2f), ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63744b65), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x3000fdfd),  // repository ID = IDL:TAO/ObjectKey:1.0
-  10, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63744b65), ACE_NTOHL (0x7900fdfd),  // name = ObjectKey
-  CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-
-  0,
-};
-CORBA::TypeCode _tc_TAO_tc_TAO_ObjectKey (CORBA::tk_alias, sizeof
-                                       (_oc_TAO_ObjectKey), (char *)
-                                       &_oc_TAO_ObjectKey, 0,
-                                       sizeof (TAO_ObjectKey));
-CORBA::TypeCode_ptr TAO_tc_ObjectKey = &_tc_TAO_tc_TAO_ObjectKey;
-
-
-// ****************************************************************
diff --git a/TAO/tao/Object_KeyC.h b/TAO/tao/Object_KeyC.h
deleted file mode 100644
index 7b879a62f12..00000000000
--- a/TAO/tao/Object_KeyC.h
+++ /dev/null
@@ -1,101 +0,0 @@
-// -*- c++ -*-
-// $Id$
-//
-// Hand-modified by Chris Cleeland.
-//
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#ifndef TAO_IDL_OBJECT_KEYC_H
-#define TAO_IDL_OBJECT_KEYC_H
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Sequence.h"
-
-class TAO_Export TAO_ObjectKey : public TAO_Unbounded_Sequence<CORBA::Octet>
-{
-  // = TITLE
-  //   TAO class used to represent Object Keys
-  //
-  // = DESCRIPTION
-  //   The object is basically a sequence of octets, but we derive
-  //   from it to create a unique type; this is useful for
-  //   overloading.
-  //
-public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef TAO_ObjectKey_ptr _ptr_type;
-    typedef TAO_ObjectKey_var _var_type;
-  #endif /* __GNUC__ */
-
-  TAO_ObjectKey (void);
-  TAO_ObjectKey (CORBA::ULong max);
-  TAO_ObjectKey (CORBA::ULong max,
-                  CORBA::ULong length,
-                  CORBA::Octet *data,
-                  CORBA::Boolean release = 0);
-  TAO_ObjectKey (const TAO_ObjectKey &);
-  TAO_ObjectKey& operator= (const TAO_ObjectKey &);
-};
-
-class TAO_Export TAO_ObjectKey_var
-{
-public:
-  TAO_ObjectKey_var (void); // default constructor
-  TAO_ObjectKey_var (TAO_ObjectKey *);
-  TAO_ObjectKey_var (const TAO_ObjectKey_var &); // copy constructor
-  ~TAO_ObjectKey_var (void); // destructor
-
-  TAO_ObjectKey_var &operator= (TAO_ObjectKey *);
-  TAO_ObjectKey_var &operator= (const TAO_ObjectKey_var &);
-  TAO_ObjectKey *operator-> (void);
-  const TAO_ObjectKey *operator-> (void) const;
-
-  operator const TAO_ObjectKey &() const;
-  operator TAO_ObjectKey &();
-  operator TAO_ObjectKey &() const;
-  CORBA::Octet &operator[] (CORBA::ULong index);
-  // in, inout, out, _retn
-  const TAO_ObjectKey &in (void) const;
-  TAO_ObjectKey &inout (void);
-  TAO_ObjectKey *&out (void);
-  TAO_ObjectKey *_retn (void);
-  TAO_ObjectKey *ptr (void) const;
-
-private:
-  TAO_ObjectKey *ptr_;
-};
-
-class TAO_Export TAO_ObjectKey_out
-{
-public:
-  TAO_ObjectKey_out (TAO_ObjectKey *&);
-  TAO_ObjectKey_out (TAO_ObjectKey_var &);
-  TAO_ObjectKey_out (TAO_ObjectKey_out &);
-  TAO_ObjectKey_out &operator= (TAO_ObjectKey_out &);
-  TAO_ObjectKey_out &operator= (TAO_ObjectKey *);
-  operator TAO_ObjectKey *&();
-  TAO_ObjectKey *&ptr (void);
-  TAO_ObjectKey *operator-> (void);
-  CORBA::Octet &operator[] (CORBA::ULong index);
-
-private:
-  TAO_ObjectKey *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const TAO_ObjectKey_var &);
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao/Object_KeyC.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_IDL_OBJECT_KEYC_H */
diff --git a/TAO/tao/Object_KeyC.i b/TAO/tao/Object_KeyC.i
deleted file mode 100644
index 82bfaa7cb26..00000000000
--- a/TAO/tao/Object_KeyC.i
+++ /dev/null
@@ -1,230 +0,0 @@
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington 
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// *************************************************************
-// Inline operations for class TAO_ObjectKey
-// *************************************************************
-
-ACE_INLINE
-TAO_ObjectKey::TAO_ObjectKey (void)
-{
-}
-
-ACE_INLINE
-TAO_ObjectKey::TAO_ObjectKey (CORBA::ULong max)
-  :  TAO_Unbounded_Sequence<CORBA::Octet> (max)
-{
-}
-
-ACE_INLINE
-TAO_ObjectKey::TAO_ObjectKey (CORBA::ULong max,
-                                CORBA::ULong length,
-                                CORBA::Octet *data,
-                                CORBA::Boolean release)
-  :  TAO_Unbounded_Sequence<CORBA::Octet> (max, length, data, release)
-{
-}
-
-ACE_INLINE
-TAO_ObjectKey::TAO_ObjectKey (const TAO_ObjectKey &rhs)
-  :  TAO_Unbounded_Sequence<CORBA::Octet> (rhs)
-{
-}
-
-ACE_INLINE TAO_ObjectKey&
-TAO_ObjectKey::operator= (const TAO_ObjectKey &rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  TAO_Unbounded_Sequence<CORBA::Octet>::operator= (rhs);
-  return *this;
-}
-
-// *************************************************************
-// Inline operations for class TAO_ObjectKey_var
-// *************************************************************
-
-ACE_INLINE
-TAO_ObjectKey_var::TAO_ObjectKey_var (void) // default constructor
-	: ptr_ (0)
-{}
-
-ACE_INLINE
-TAO_ObjectKey_var::TAO_ObjectKey_var (TAO_ObjectKey *p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE
-TAO_ObjectKey_var::TAO_ObjectKey_var (const TAO_ObjectKey_var &p) // copy constructor
-{
-  if (p.ptr_)
-  	this->ptr_ = new TAO_ObjectKey(*p.ptr_);
-  else
-  	this->ptr_ = 0;
-}
-
-ACE_INLINE
-TAO_ObjectKey_var::~TAO_ObjectKey_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE TAO_ObjectKey_var &
-TAO_ObjectKey_var::operator= (TAO_ObjectKey *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE TAO_ObjectKey_var &
-TAO_ObjectKey_var::operator= (const TAO_ObjectKey_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new TAO_ObjectKey (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const TAO_ObjectKey *
-TAO_ObjectKey_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_ObjectKey *
-TAO_ObjectKey_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-TAO_ObjectKey_var::operator const TAO_ObjectKey &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-TAO_ObjectKey_var::operator TAO_ObjectKey &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-TAO_ObjectKey_var::operator TAO_ObjectKey &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::Octet &
-TAO_ObjectKey_var::operator[] (CORBA::ULong slot)
-{
-  return this->ptr_->operator[] (slot);
-}
-
-ACE_INLINE const TAO_ObjectKey &
-TAO_ObjectKey_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TAO_ObjectKey &
-TAO_ObjectKey_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE TAO_ObjectKey *&
-TAO_ObjectKey_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_ObjectKey *
-TAO_ObjectKey_var::_retn (void)
-{
-  TAO_ObjectKey *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE TAO_ObjectKey *
-TAO_ObjectKey_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class TAO_ObjectKey_out
-// *************************************************************
-
-ACE_INLINE
-TAO_ObjectKey_out::TAO_ObjectKey_out (TAO_ObjectKey *&p)
-	: ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-TAO_ObjectKey_out::TAO_ObjectKey_out (TAO_ObjectKey_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-TAO_ObjectKey_out::TAO_ObjectKey_out (TAO_ObjectKey_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE TAO_ObjectKey_out &
-TAO_ObjectKey_out::operator= (TAO_ObjectKey_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE TAO_ObjectKey_out &
-TAO_ObjectKey_out::operator= (TAO_ObjectKey *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-TAO_ObjectKey_out::operator TAO_ObjectKey *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_ObjectKey *&
-TAO_ObjectKey_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_ObjectKey *
-TAO_ObjectKey_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Octet &
-TAO_ObjectKey_out::operator[] (CORBA::ULong slot)
-{
-  return this->ptr_->operator[] (slot);
-}
-
diff --git a/TAO/tao/Operation_Table.cpp b/TAO/tao/Operation_Table.cpp
deleted file mode 100644
index 2e4c547b21c..00000000000
--- a/TAO/tao/Operation_Table.cpp
+++ /dev/null
@@ -1,378 +0,0 @@
-// $Id$
-
-#include "tao/Operation_Table.h"
-#include "tao/Timeprobe.h"
-#include "tao/ORB.h"
-
-ACE_RCSID(tao, Operation_Table, "$Id$")
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-
-static const char *TAO_Operation_Table_Timeprobe_Description[] =
-  {
-    "TAO_Dynamic_Hash_OpTable::find - start",
-    "TAO_Dynamic_Hash_OpTable::find - end",
-
-    "TAO_Linear_Search_OpTable::find - start",
-    "TAO_Linear_Search_OpTable::find - end",
-
-    "TAO_Active_Demux_OpTable::find - start",
-    "TAO_Active_Demux_OpTable::find - end",
-
-    "TAO_Perfect_Hash_OpTable::find - start",
-    "TAO_Perfect_Hash_OpTable::find - end",
-
-    "TAO_Binary_Search_OpTable::find - start",
-    "TAO_Binary_Search_OpTable::find - end"
-  };
-
-enum
-  {
-    // Timeprobe description table start key
-    TAO_DYNAMIC_HASH_OPTABLE_FIND_START = 600,
-    TAO_DYNAMIC_HASH_OPTABLE_FIND_END,
-
-    TAO_LINEAR_SEARCH_OPTABLE_FIND_START,
-    TAO_LINEAR_SEARCH_OPTABLE_FIND_END,
-
-    TAO_ACTIVE_DEMUX_OPTABLE_FIND_START,
-    TAO_ACTIVE_DEMUX_OPTABLE_FIND_END,
-
-    TAO_PERFECT_HASH_OPTABLE_FIND_START,
-    TAO_PERFECT_HASH_OPTABLE_FIND_END,
-
-    TAO_BINARY_SEARCH_OPTABLE_FIND_START,
-    TAO_BINARY_SEARCH_OPTABLE_FIND_END
-  };
-
-// Setup Timeprobes
-ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description,
-                                  TAO_DYNAMIC_HASH_OPTABLE_FIND_START);
-
-#endif /* ACE_ENABLE_TIMEPROBES */
-
-// destructor
-TAO_Operation_Table::~TAO_Operation_Table (void)
-{
-}
-
-// constructor
-TAO_Dynamic_Hash_OpTable::TAO_Dynamic_Hash_OpTable (const TAO_operation_db_entry *db,
-						    CORBA::ULong dbsize,
-						    CORBA::ULong hashtblsize,
-                                                    ACE_Allocator *alloc)
-  : hash_ (hashtblsize, alloc)
-{
-  // Iterate thru each entry in the database and bind the operation
-  // name to its corresponding skeleton.
-
-  for (CORBA::ULong i = 0; i < dbsize; i++)
-    // @@ (ASG): what happens if bind fails ???
-    if (this->bind (db[i].opname_, db[i].skel_ptr_) == -1)
-      ACE_ERROR ((LM_ERROR,
-                  "(%P|%t) %p\n",
-                  "bind failed"));
-}
-
-TAO_Dynamic_Hash_OpTable::~TAO_Dynamic_Hash_OpTable (void)
-{
-  // Initialize an iterator.  We need to go thru each entry and free
-  // up storage allocated to hold the external ids.  In this case,
-  // these are strings.
-  OP_MAP_MANAGER::ITERATOR iterator (this->hash_);
-
-  for (OP_MAP_MANAGER::ENTRY *entry = 0;
-       iterator.next (entry) != 0;
-       iterator.advance ())
-    {
-      // We had allocated memory and stored the string. So we free the
-      // memory.
-      CORBA::string_free ((char *) entry->ext_id_);
-      entry->ext_id_ = 0;
-
-      // We do not own this. So we just set it to 0.
-      entry->int_id_ = 0;
-    }
-}
-
-int
-TAO_Dynamic_Hash_OpTable::bind (const char *opname,
-                                const TAO_Skeleton skel_ptr)
-{
-  return this->hash_.bind (CORBA::string_dup (opname), skel_ptr);
-}
-
-int
-TAO_Dynamic_Hash_OpTable::find (const char *opname,
-                                TAO_Skeleton& skel_ptr,
-                                const unsigned int length)
-{
-  ACE_UNUSED_ARG (length);
-  ACE_FUNCTION_TIMEPROBE (TAO_DYNAMIC_HASH_OPTABLE_FIND_START);
-
-  return this->hash_.find ((const char *)opname, skel_ptr);
-}
-
-// Linear search strategy
-
-TAO_Linear_Search_OpTable::TAO_Linear_Search_OpTable (void)
-{
-}
-
-TAO_Linear_Search_OpTable::~TAO_Linear_Search_OpTable (void)
-{
-}
-
-int
-TAO_Linear_Search_OpTable::bind (const char *opname,
-                                 const TAO_Skeleton skel_ptr)
-{
-  ACE_UNUSED_ARG (opname);
-  ACE_UNUSED_ARG (skel_ptr);
-  return 0;
-}
-
-int
-TAO_Linear_Search_OpTable::find (const char *opname,
-                                 TAO_Skeleton& skelfunc,
-                                 const unsigned int length)
-{
-  ACE_UNUSED_ARG (length);
-  ACE_FUNCTION_TIMEPROBE (TAO_LINEAR_SEARCH_OPTABLE_FIND_START);
-
-  const TAO_operation_db_entry *entry = lookup (opname);
-  if (entry == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "TAO_Linear_Search_Table:find failed\n"),
-                      -1);
-
-  // Valid entry. Figure out the skel_ptr.
-  skelfunc = entry->skel_ptr_;
-
-  return 0;
-}
-
-// Active Demux search strategy
-TAO_Active_Demux_OpTable::TAO_Active_Demux_OpTable (const
-						    TAO_operation_db_entry *db,
-						    CORBA::ULong dbsize)
-  : next_ (0),
-    tablesize_ (dbsize),
-    tbl_ (0)
-{
-  ACE_NEW (tbl_,
-           TAO_Active_Demux_OpTable_Entry[dbsize]);
-
-  // The job of the constructor is to go thru each entry of the
-  // database and bind the operation name to its corresponding
-  // skeleton.
-  for (CORBA::ULong i=0; i < dbsize; i++)
-    // @@ (ASG): what happens if bind fails ???
-    (void) this->bind (db[i].opname_, db[i].skel_ptr_);
-}
-
-TAO_Active_Demux_OpTable::~TAO_Active_Demux_OpTable (void)
-{
-  delete [] this->tbl_;
-}
-
-int
-TAO_Active_Demux_OpTable::bind (const char *opname,
-				const TAO_Skeleton skel_ptr)
-{
-  CORBA::ULong i = ACE_OS::atoi (opname);
-
-  if (i < this->tablesize_)
-    {
-      if (this->tbl_[i].skel_ptr_ != 0)
-        // overwriting previous one
-        return 1;
-      else
-	{
-	  this->tbl_[i].skel_ptr_ = skel_ptr;
-	  return 0;
-	}
-    }
-  return -1; // error
-}
-
-int
-TAO_Active_Demux_OpTable::find (const char *opname,
-                                TAO_Skeleton& skel_ptr,
-                                const unsigned int length)
-{
-  ACE_UNUSED_ARG (length);
-
-  ACE_FUNCTION_TIMEPROBE (TAO_ACTIVE_DEMUX_OPTABLE_FIND_START);
-
-  CORBA::ULong i = ACE_OS::atoi (opname);
-
-  ACE_ASSERT (i < this->tablesize_);
-  skel_ptr = this->tbl_[i].skel_ptr_;
-  return 0; //success
-}
-
-TAO_Active_Demux_OpTable_Entry::TAO_Active_Demux_OpTable_Entry (void)
-{
-  this->skel_ptr_ = 0;
-}
-
-TAO_Active_Demux_OpTable_Entry::~TAO_Active_Demux_OpTable_Entry (void)
-{
-  this->skel_ptr_ = 0;  // cannot delete this as we do not own it
-}
-
-// Do nothing constructor.
-TAO_Perfect_Hash_OpTable::TAO_Perfect_Hash_OpTable (void)
-{
-}
-
-// Do nothing destrctor.
-TAO_Perfect_Hash_OpTable::~TAO_Perfect_Hash_OpTable (void)
-{
-}
-
-// Uses <{opname}> to look up the skeleton function and pass it back
-// in <{skelfunc}>.  Returns non-negative integer on success, or -1 on
-// failure.
-
-int
-TAO_Perfect_Hash_OpTable::find (const char *opname,
-                                TAO_Skeleton &skelfunc,
-                                const unsigned int length)
-{
-  ACE_FUNCTION_TIMEPROBE (TAO_PERFECT_HASH_OPTABLE_FIND_START);
-
-  const TAO_operation_db_entry *entry = lookup (opname,
-                                                length);
-  if (entry == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "TAO_Perfect_Hash_Table:find failed\n"),
-                      -1);
-
-  // Valid entry. Figure out the skel_ptr.
-  skelfunc = entry->skel_ptr_;
-
-  return 0;
-}
-
-int
-TAO_Perfect_Hash_OpTable::bind (const char *opname,
-                                const TAO_Skeleton skel_ptr)
-{
-  ACE_UNUSED_ARG (opname);
-  ACE_UNUSED_ARG (skel_ptr);
-  return 0;
-}
-
-// Do nothing constructor.
-TAO_Binary_Search_OpTable::TAO_Binary_Search_OpTable (void)
-{
-}
-
-// Do nothing destrctor.
-TAO_Binary_Search_OpTable::~TAO_Binary_Search_OpTable (void)
-{
-}
-
-// Uses <{opname}> to look up the skeleton function and pass it back
-// in <{skelfunc}>.  Returns non-negative integer on success, or -1 on
-// failure.
-
-int
-TAO_Binary_Search_OpTable::find (const char *opname,
-                                 TAO_Skeleton &skelfunc,
-                                 const unsigned int /* length */)
-{
-  ACE_FUNCTION_TIMEPROBE (TAO_BINARY_SEARCH_OPTABLE_FIND_START);
-
-  const TAO_operation_db_entry *entry = lookup (opname);
-
-  if (entry == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "TAO_Binary_Search_Table:find failed\n"),
-                      -1);
-  // Valid entry. Figure out the skel_ptr.
-  skelfunc = entry->skel_ptr_;
-
-  return 0;
-}
-
-int
-TAO_Binary_Search_OpTable::bind (const char *opname,
-                                const TAO_Skeleton skel_ptr)
-{
-  ACE_UNUSED_ARG (opname);
-  ACE_UNUSED_ARG (skel_ptr);
-  return 0;
-}
-
-// constructor
-TAO_Operation_Table_Parameters::TAO_Operation_Table_Parameters (void)
-  : strategy_ (0),
-    type_ (TAO_Operation_Table_Parameters::TAO_DYNAMIC_HASH) // default
-{
-}
-
-TAO_Operation_Table_Parameters::~TAO_Operation_Table_Parameters (void)
-{
-}
-
-void
-TAO_Operation_Table_Parameters::lookup_strategy (TAO_Operation_Table_Parameters::DEMUX_STRATEGY s)
-{
-  this->type_ = s;
-}
-
-// get the lookup type
-TAO_Operation_Table_Parameters::DEMUX_STRATEGY
-TAO_Operation_Table_Parameters::lookup_strategy (void) const
-{
-  return this->type_;
-}
-
-// set the concrete strategy
-void
-TAO_Operation_Table_Parameters::concrete_strategy (TAO_Operation_Table *ot)
-{
-  this->strategy_ = ot;
-}
-
-// return the concrete strategy
-TAO_Operation_Table* TAO_Operation_Table_Parameters::concrete_strategy (void)
-{
-  return this->strategy_;
-}
-
-TAO_Operation_Table_Factory::TAO_Operation_Table_Factory (void)
-{
-}
-
-TAO_Operation_Table_Factory::~TAO_Operation_Table_Factory (void)
-{
-}
-
-TAO_Operation_Table *
-TAO_Operation_Table_Factory::opname_lookup_strategy (void)
-{
-  TAO_Operation_Table_Parameters *p =
-    TAO_OP_TABLE_PARAMETERS::instance ();
-
-  return p->concrete_strategy ();
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Hash_Map_Iterator_Base_Ex<const char *, TAO_Skeleton, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<const char *, TAO_Skeleton, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<const char *, TAO_Skeleton, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<const char *, TAO_Skeleton, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<const char *, TAO_Skeleton>;
-template class ACE_Singleton<TAO_Operation_Table_Parameters, ACE_SYNCH_RECURSIVE_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<const char *, TAO_Skeleton, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<const char *, TAO_Skeleton, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<const char *, TAO_Skeleton, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<const char *, TAO_Skeleton, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<const char *, TAO_Skeleton>
-#pragma instantiate ACE_Singleton<TAO_Operation_Table_Parameters, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Operation_Table.h b/TAO/tao/Operation_Table.h
deleted file mode 100644
index f2b76ee0d74..00000000000
--- a/TAO/tao/Operation_Table.h
+++ /dev/null
@@ -1,339 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Operation_Table.h
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#ifndef TAO_OPTABLE_H
-#define TAO_OPTABLE_H
-
-#include "ace/Hash_Map_Manager.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Singleton.h"
-#include "ace/Synch.h"
-#include "tao/corbafwd.h"
-
-class TAO_operation_db_entry
-{
-  // = TITLE
-  //   Define a table entry that holds an operation name and its
-  //   corresponding skeleton.  A table of such entries is used to
-  //   initialize the different lookup strategies.
-public:
-  const char* opname_;
-  // operation name
-
-  TAO_Skeleton skel_ptr_;
-  // skeleton pointer
-};
-
-class TAO_Export TAO_Operation_Table
-{
-  // = TITLE
-  //     Abstract class for maintaining and lookup of CORBA IDL
-  //     operation names.
-public:
-  virtual int find (const char *opname,
-                    TAO_Skeleton &skelfunc,
-                    const unsigned int length = 0) = 0;
-  // Uses <{opname}> to look up the skeleton function and pass it back
-  // in <{skelfunc}>.  Returns non-negative integer on success, or -1
-  // on failure.
-
-  virtual int bind (const char *opname,
-                    const TAO_Skeleton skel_ptr) = 0;
-  // Associate the skeleton <{skel_ptr}> with an operation named
-  // <{opname}>.  Returns -1 on failure, 0 on success, 1 on duplicate.
-
-  virtual ~TAO_Operation_Table (void);
-};
-
-class TAO_Export TAO_Operation_Table_Factory
-{
-  // = TITLE
-  //   Factory for producing operation table lookup objects based on
-  //   the enumerated value of strategy held by the parameters.
-public:
-  TAO_Operation_Table *opname_lookup_strategy (void);
-  // return an instance of the specified lookup strategy
-
-  TAO_Operation_Table_Factory (void);
-  // constructor
-
-  ~TAO_Operation_Table_Factory (void);
-  // destructor
-};
-
-class TAO_Export TAO_Operation_Table_Parameters
-{
-  // = TITLE
-  //    Parameters used to create the operation table.
-public:
-  enum DEMUX_STRATEGY
-  {
-    // various lookup strategies
-    TAO_LINEAR_SEARCH,
-    TAO_DYNAMIC_HASH,
-    TAO_PERFECT_HASH,
-    TAO_BINARY_SEARCH,
-    TAO_ACTIVE_DEMUX,
-    TAO_USER_DEFINED
-  };
-
-  void lookup_strategy (DEMUX_STRATEGY s);
-  // set the lookup strategy from the list of enumerated values
-
-  DEMUX_STRATEGY lookup_strategy (void) const;
-  // Return the enumerated value for the lookup strategy. Default is
-  // Dynamic Hashing.
-
-  void concrete_strategy (TAO_Operation_Table *ot);
-  // Provide a data structure that will do the lookup. This is useful
-  // for user-defined lookup strategies.
-
-  TAO_Operation_Table *concrete_strategy (void);
-  // Return the operation table that is being used to do the lookup.
-
-  TAO_Operation_Table_Parameters (void);
-  // constructor.
-
-  ~TAO_Operation_Table_Parameters (void);
-  // destructor
-private:
-  TAO_Operation_Table *strategy_;
-  // pointer to the object that implements a lookup strategy
-
-  DEMUX_STRATEGY type_;
-  // the enumerated value indicating the lookup strategy
-};
-
-class TAO_Export TAO_Dynamic_Hash_OpTable : public TAO_Operation_Table
-{
-  // = TITLE
-  //     Dynamic Hashing scheme for CORBA IDL operation name lookup.
-public:
-  // = Initialization and termination methods.
-  TAO_Dynamic_Hash_OpTable (const TAO_operation_db_entry *db,
-                            CORBA::ULong dbsize,
-                            CORBA::ULong hashtblsize,
-                            ACE_Allocator *alloc);
-  // Initialize the dynamic hash operation table with a database of
-  // operation names. The hash table size may be different from the
-  // size of the database. Hence we use the third argument to specify
-  // the size of the internal hash table.  The <alloc> argument is
-  // used to determine where the memory comes from (usually from
-  // <ACE_Static_Allocator_Base>).
-
-  ~TAO_Dynamic_Hash_OpTable (void);
-  // destructor
-
-  virtual int bind (const char *opname,
-                    const TAO_Skeleton skel_ptr);
-  // Associate the skeleton <{skel_ptr}> with an operation named
-  // <{opname}>.  Returns -1 on failure, 0 on success, 1 on duplicate.
-
-  virtual int find (const char *opname,
-                    TAO_Skeleton &skelfunc,
-                    const unsigned int length = 0);
-  // Uses <{opname}> to look up the skeleton function and pass it back
-  // in <{skelfunc}>.  Returns non-negative integer on success, or -1
-  // on failure.
-
-private:
-  typedef ACE_Hash_Map_Manager_Ex<const char *,
-                                  TAO_Skeleton,
-                                  ACE_Hash<const char *>,
-                                  ACE_Equal_To<const char *>,
-                                  ACE_Null_Mutex>
-        OP_MAP_MANAGER;
-
-  OP_MAP_MANAGER hash_;
-  // The hash table data structure.
-};
-
-class TAO_Export TAO_Linear_Search_OpTable : public TAO_Operation_Table
-{
-  // = TITLE
-  //    Operation table lookup strategy based on
-  //    linear search.  Not efficient, but it works.
-public:
-  // = Initialization and termination methods.
-  TAO_Linear_Search_OpTable (void);
-  // Default constructor.
-
-  ~TAO_Linear_Search_OpTable (void);
-  // Destructor.
-
-  virtual int find (const char *opname,
-                    TAO_Skeleton &skel_ptr,
-                    const unsigned int length = 0);
-  // Uses <{opname}> to look up the skeleton function and pass it back
-  // in <{skelfunc}>.  Returns non-negative integer on success, or -1
-  // on failure.
-
-  virtual int bind (const char *opname,
-                    const TAO_Skeleton skelptr);
-  // Associate the skeleton <{skel_ptr}> with an operation named
-  // <{opname}>.  Returns -1 on failure, 0 on success, 1 on duplicate.
-
-private:
-  // = Method that should defined by the subclasses. GPERF program
-  //   will generate this routine routines.
-  virtual const TAO_operation_db_entry* lookup (const char *str) = 0;
-};
-
-class TAO_Export TAO_Active_Demux_OpTable_Entry
-{
-  // = TITLE
-  //   Active Demux lookup table entry.
-public:
-  // = Initialization and termination methods.
-  TAO_Active_Demux_OpTable_Entry (void);
-  // constructor
-
-  ~TAO_Active_Demux_OpTable_Entry (void);
-  // destructor
-
-  TAO_Skeleton skel_ptr_;
-  // Skeleton pointer corresponding to the index.
-};
-
-class TAO_Export TAO_Active_Demux_OpTable : public TAO_Operation_Table
-{
-  // = TITLE
-  //   Implements the active demultiplexed lookup strategy. The key is
-  //   assumed to provide an index directly into the internal table.
-public:
-  // = Initialization and termination methods.
-  TAO_Active_Demux_OpTable (const TAO_operation_db_entry *db, CORBA::ULong dbsize);
-  // Initializes the internal table with the database of operations
-
-  ~TAO_Active_Demux_OpTable (void);
-  // destructor.
-
-  virtual int find (const char *opname,
-                    TAO_Skeleton &skel_ptr,
-                    const unsigned int length = 0);
-  // Uses <{opname}> to look up the skeleton function and pass it back
-  // in <{skelfunc}>.  Returns non-negative integer on success, or -1
-  // on failure.
-
-  virtual int bind (const char *opname,
-                    const TAO_Skeleton skelptr);
-  // Associate the skeleton <{skel_ptr}> with an operation named
-  // <{opname}>.  Returns -1 on failure, 0 on success, 1 on duplicate.
-
-private:
-  CORBA::ULong next_;
-  // the next available free slot
-
-  CORBA::ULong tablesize_;
-  // size of the internal table
-
-  TAO_Active_Demux_OpTable_Entry *tbl_;
-  // internal lookup table
-};
-
-class TAO_Export TAO_Perfect_Hash_OpTable : public TAO_Operation_Table
-{
-  // = TITLE
-  //     Helper class  for use of perfect hashing operation lookup
-  //     strategy.
-  //
-  // = DESCRIPTION
-  //     This class declares pure virtual methods called 'lookup ()'
-  //     and 'hash ()' which will be generated by the GPERF
-  //     program. These methods are used by 'bind ()' and 'find ()'
-  //     methods. Subclasses will define the lookup and hash
-  //     functions.
-public:
-  TAO_Perfect_Hash_OpTable (void);
-  // Do nothing constructor.
-
-  virtual ~TAO_Perfect_Hash_OpTable (void);
-  // Do nothing destrctor.
-
-  virtual int find (const char *opname,
-                    TAO_Skeleton &skelfunc,
-                    const unsigned int length = 0);
-  // Uses <{opname}> to look up the skeleton function and pass it back
-  // in <{skelfunc}>.  Returns non-negative integer on success, or -1
-  // on failure.
-
-  virtual int bind (const char *opname,
-                    const TAO_Skeleton skel_ptr);
-  // Associate the skeleton <{skel_ptr}> with an operation named
-  // <{opname}>.  Returns -1 on failure, 0 on success, 1 on duplicate.
-
-private:
-  // = Methods that should defined by the subclasses. GPERF program
-  //   will generate these routines.
-
-  virtual unsigned int hash (const char *str, unsigned int len) = 0;
-
-  virtual const TAO_operation_db_entry* lookup (const char *str, unsigned int len) = 0;
-};
-
-class TAO_Export TAO_Binary_Search_OpTable : public TAO_Operation_Table
-{
-  // = TITLE
-  //     Helper class for using binary search operatin lookup strategy
-  //     in the server skeletons.
-  //
-  // = DESCRIPTION
-  //     This class declares pure virtual method called 'lookup ()'
-  //     which will be generated by the GPERF program. This method is
-  //     used by 'bind ()' and 'find ()' methods. Subclasses will
-  //     define the lookup method.
-public:
-  TAO_Binary_Search_OpTable (void);
-  // Do nothing constructor.
-
-  virtual ~TAO_Binary_Search_OpTable (void);
-  // Do nothing destrctor.
-
-  virtual int find (const char *opname,
-                    TAO_Skeleton &skelfunc,
-                    const unsigned int length = 0);
-  // Uses <{opname}> to look up the skeleton function and pass it back
-  // in <{skelfunc}>.  Returns non-negative integer on success, or -1
-  // on failure.
-
-  virtual int bind (const char *opname,
-                    const TAO_Skeleton skel_ptr);
-  // Associate the skeleton <{skel_ptr}> with an operation named
-  // <{opname}>.  Returns -1 on failure, 0 on success, 1 on duplicate.
-
-private:
-  // = Method that should defined by the subclasses. GPERF program
-  //   will generate this routine routines.
-  virtual const TAO_operation_db_entry* lookup (const char *str) = 0;
-};
-
-
-// Define a singleton instance of operation table parameters.
-typedef ACE_Singleton<TAO_Operation_Table_Parameters,
-                      ACE_SYNCH_RECURSIVE_MUTEX>
-        TAO_OP_TABLE_PARAMETERS;
-
-
-// Define a singleton instance of the operation table factory.
-typedef ACE_Singleton<TAO_Operation_Table_Factory,
-                      ACE_SYNCH_RECURSIVE_MUTEX>
-        TAO_OP_TABLE_FACTORY;
-
-#endif /* TAO_OPTABLE_H */
diff --git a/TAO/tao/POA.cpp b/TAO/tao/POA.cpp
deleted file mode 100644
index f5569af9a86..00000000000
--- a/TAO/tao/POA.cpp
+++ /dev/null
@@ -1,3582 +0,0 @@
-// @(#) $Id$
-
-// auto_ptr class
-#include "ace/Auto_Ptr.h"
-
-#include "tao/POA.h"
-#include "tao/ORB_Core.h"
-#include "tao/ORB.h"
-#include "tao/Server_Strategy_Factory.h"
-#include "tao/Environment.h"
-#include "tao/Exception.h"
-#include "tao/debug.h"
-
-// Forwarding Servant class
-#include "tao/Forwarding_Servant.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/POA.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, POA, "$Id$")
-
-#if !defined (TAO_NO_IOR_TABLE)
-// This is the TAO_Object_key-prefix that is appended to all TAO Object keys.
-// Its an array of octets representing ^t^a^o/0 in octal.
-CORBA::Octet
-TAO_POA::objectkey_prefix [TAO_POA::TAO_OBJECTKEY_PREFIX_SIZE] = {
-  024, // octal for ^t
-  001, // octal for ^a
-  017, // octal for ^o
-  000
-};
-#endif /* TAO_NO_IOR_TABLE */
-
-TAO_POA::TAO_POA (const TAO_POA::String &name,
-                  TAO_POA_Manager &poa_manager,
-                  const TAO_POA_Policies &policies,
-                  TAO_POA *parent,
-                  ACE_Lock &lock,
-                  ACE_SYNCH_MUTEX &thread_lock,
-                  TAO_ORB_Core &orb_core,
-                  CORBA::Environment &ACE_TRY_ENV)
-  : name_ (name),
-    poa_manager_ (poa_manager),
-    policies_ (policies),
-    parent_ (parent),
-    active_object_map_ (0),
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-    adapter_activator_ (),
-    servant_activator_ (),
-    servant_locator_ (),
-    default_servant_ (),
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-    children_ (),
-    lock_ (lock),
-    persistent_ (policies.lifespan () == PortableServer::PERSISTENT),
-    system_id_ (policies.id_assignment () == PortableServer::SYSTEM_ID),
-    creation_time_ (ACE_OS::gettimeofday ()),
-    orb_core_ (orb_core),
-    cleanup_in_progress_ (0),
-    etherealize_objects_ (1),
-    outstanding_requests_ (0),
-    outstanding_requests_condition_ (thread_lock),
-    wait_for_completion_pending_ (0),
-    waiting_destruction_ (0),
-    servant_deactivation_condition_ (thread_lock),
-    waiting_servant_deactivation_ (0)
-{
-  // Set the folded name of this POA.
-  this->set_folded_name ();
-
-  // Create the active object map.
-  TAO_Active_Object_Map *active_object_map = 0;
-  ACE_NEW_THROW_EX (active_object_map,
-                    TAO_Active_Object_Map (!this->system_id (),
-                                           this->policies ().id_uniqueness () == PortableServer::UNIQUE_ID,
-                                           this->persistent (),
-                                           this->orb_core_.server_factory ()->active_object_map_creation_parameters (),
-                                           ACE_TRY_ENV),
-                    CORBA::NO_MEMORY ());
-
-  // Give ownership of the new map to the auto pointer.  Note, that it
-  // is important for the auto pointer to take ownership before
-  // checking for exception since we may need to delete the new map.
-  auto_ptr<TAO_Active_Object_Map> new_active_object_map (active_object_map);
-
-  // Check for exception in construction of the active object map.
-  ACE_CHECK;
-
-  // Register self with manager.
-  int result = this->poa_manager_.register_poa (this);
-  if (result != 0)
-    {
-      ACE_THROW (CORBA::OBJ_ADAPTER ());
-    }
-
-  // Add self to Object Adapter class.
-  result = this->orb_core_.object_adapter ()->bind_poa (this->folded_name_,
-                                                        this,
-                                                        this->system_name_.out ());
-  if (result != 0)
-    {
-      // Remove from POA Manager in case of errors. No checks of
-      // further errors...
-      this->poa_manager_.remove_poa (this);
-
-      ACE_THROW (CORBA::OBJ_ADAPTER ());
-    }
-
-  // Finally everything is fine.  Make sure to take ownership away
-  // from the auto pointer.
-  this->active_object_map_ = new_active_object_map.release ();
-}
-
-TAO_POA::~TAO_POA (void)
-{
-  // Delete the active object map.
-  delete this->active_object_map_;
-
-  // Note: Errors are ignored here since there is nothing we can do
-  // about them.
-
-  // Remove POA from the POAManager.
-  this->poa_manager_.remove_poa (this);
-
-  // Remove POA from the Object Adapter.
-  this->orb_core_.object_adapter ()->unbind_poa (this,
-                                                 this->folded_name_,
-                                                 this->system_name_.in ());
-}
-
-PortableServer::POA_ptr
-TAO_POA::create_POA_i (const char *adapter_name,
-                       PortableServer::POAManager_ptr poa_manager,
-                       const CORBA::PolicyList &policies,
-                       CORBA::Environment &ACE_TRY_ENV)
-{
-  // If any of the policy objects specified are not valid for the ORB
-  // implementation, if conflicting policy objects are specified, or
-  // if any of the specified policy objects require prior
-  // administrative action that has not been performed, an
-  // InvalidPolicy exception is raised containing the index in the
-  // policies parameter value of the first offending policy object.
-  TAO_POA_Policies tao_policies;
-  tao_policies.parse_policies (policies,
-                               ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // If the poa_manager parameter is null, a new POAManager object is
-  // created and associated with the new POA. Otherwise, the specified
-  // POAManager object is associated with the new POA. The POAManager
-  // object can be obtained using the attribute name the_POAManager.
-
-  auto_ptr<TAO_POA_Manager> new_poa_manager_impl;
-  TAO_POA_Manager *poa_manager_impl = 0;
-  if (CORBA::is_nil (poa_manager))
-    {
-      ACE_NEW_THROW_EX (poa_manager_impl,
-                        TAO_POA_Manager (*this->orb_core_.object_adapter ()),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-      // Give ownership to auto pointer.
-      auto_ptr<TAO_POA_Manager> auto_new_poa_manager_impl (poa_manager_impl);
-      new_poa_manager_impl = auto_new_poa_manager_impl;
-    }
-  else
-    {
-      PortableServer::Servant servant = poa_manager->_servant ();
-      if (servant == 0)
-        {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            PortableServer::POA::_nil ());
-        }
-
-      void *ptr = servant->_downcast (servant->_interface_repository_id ());
-      POA_PortableServer::POAManager *mgr = (POA_PortableServer::POAManager *) ptr;
-      poa_manager_impl = ACE_dynamic_cast (TAO_POA_Manager *, mgr);
-    }
-
-  TAO_POA *poa = this->create_POA_i (adapter_name,
-                                     *poa_manager_impl,
-                                     tao_policies,
-                                     ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // Give ownership of the new poa to the auto pointer.
-  auto_ptr<TAO_POA> new_poa (poa);
-
-  PortableServer::POA_var result = new_poa->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // Finally everything is fine.  Make sure to take ownership away
-  // from the auto pointers.
-  new_poa.release ();
-  new_poa_manager_impl.release ();
-
-  return result._retn ();
-}
-
-TAO_POA *
-TAO_POA::create_POA_i (const TAO_POA::String &adapter_name,
-                       TAO_POA_Manager &poa_manager,
-                       const TAO_POA_Policies &policies,
-                       CORBA::Environment &ACE_TRY_ENV)
-{
-  // This operaton creates a new POA as a child of the target POA. The
-  // specified name identifies the new POA with respect to other POAs
-  // with the same parent POA. If the target POA already has a child
-  // POA with the specified name, the AdapterAlreadyExists exception
-  // is raised.
-  int result = this->children_.find (adapter_name);
-
-  // Child was found
-  if (result != -1)
-    {
-      ACE_THROW_RETURN (PortableServer::POA::AdapterAlreadyExists (),
-                        0);
-    }
-
-  //
-  // Child was not found
-  //
-
-  // The specified policy objects are associated with the POA and used
-  // to control its behavior. The policy objects are effectively
-  // copied before this operation returns, so the application is free
-  // to destroy them while the POA is in use. Policies are not
-  // inherited from the parent POA.
-  TAO_POA *poa = 0;
-  ACE_NEW_THROW_EX (poa,
-                    TAO_POA (adapter_name,
-                             poa_manager,
-                             policies,
-                             this,
-                             this->orb_core_.object_adapter ()->lock (),
-                             this->orb_core_.object_adapter ()->thread_lock (),
-                             this->orb_core_,
-                             ACE_TRY_ENV),
-                    CORBA::NO_MEMORY ());
-
-  // Give ownership of the new map to the auto pointer.  Note, that it
-  // is important for the auto pointer to take ownership before
-  // checking for exception since we may need to delete the new map.
-  auto_ptr<TAO_POA> new_poa (poa);
-
-  // Check for exception in construction of the POA.
-  ACE_CHECK_RETURN (0);
-
-  // Add to children map
-  result = this->children_.bind (adapter_name,
-                                 new_poa.get ());
-  if (result != 0)
-    {
-      ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                        0);
-    }
-
-  // Note: Creating a POA using a POA manager that is in the active
-  // state can lead to race conditions if the POA supports preexisting
-  // objects, because the new POA may receive a request before its
-  // adapter activator, servant manager, or default servant have been
-  // initialized. These problems do not occur if the POA is created by
-  // an adapter activator registered with a parent of the new POA,
-  // because requests are queued until the adapter activator
-  // returns. To avoid these problems when a POA must be explicitly
-  // initialized, the application can initialize the POA by invoking
-  // find_POA with a TRUE activate parameter.
-
-  // Everything is fine. Don't let the auto_ptr delete the
-  // implementation.
-  return new_poa.release ();
-}
-
-PortableServer::POA_ptr
-TAO_POA::find_POA (const char *adapter_name,
-                   CORBA::Boolean activate_it,
-                   CORBA::Environment &ACE_TRY_ENV)
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
-
-  // A recursive thread lock without using a recursive thread
-  // lock.  Non_Servant_Upcall has a magic constructor and
-  // destructor.  We unlock the Object_Adapter lock for the
-  // duration of the servant activator upcalls; reacquiring
-  // once the upcalls complete.  Even though we are releasing
-  // the lock, other threads will not be able to make progress
-  // since <Object_Adapter::non_servant_upcall_in_progress_>
-  // has been set.
-  TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this->orb_core_.object_adapter ());
-  ACE_UNUSED_ARG (non_servant_upcall);
-
-  TAO_POA *child = this->find_POA_i (adapter_name,
-                                     activate_it,
-                                     ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // Give ownership of the new poa to the auto pointer.
-  auto_ptr<TAO_POA> new_child (child);
-
-  PortableServer::POA_var result = new_child->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // Finally everything is fine.  Make sure to take ownership away
-  // from the auto pointer.
-  new_child.release ();
-
-  return result._retn ();
-}
-
-TAO_POA *
-TAO_POA::find_POA_i (const ACE_CString &child_name,
-                     CORBA::Boolean activate_it,
-                     CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_POA *child;
-  int result = this->children_.find (child_name,
-                                     child);
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  if (result != 0)
-    {
-      if (activate_it)
-        {
-          if (!CORBA::is_nil (this->adapter_activator_.in ()))
-            {
-              // Check the state of the POA Manager.
-              this->check_poa_manager_state (ACE_TRY_ENV);
-              ACE_CHECK_RETURN (0);
-
-              PortableServer::POA_var self = this->_this (ACE_TRY_ENV);
-              ACE_CHECK_RETURN (0);
-
-              CORBA::Boolean success =
-                this->adapter_activator_->unknown_adapter (self.in (),
-                                                           child_name.c_str (),
-                                                           ACE_TRY_ENV);
-              ACE_CHECK_RETURN (0);
-
-              if (success)
-                {
-                  result = this->children_.find (child_name,
-                                                 child);
-                }
-              else
-                {
-                  result = -1;
-                }
-            }
-          else
-            {
-              result = -1;
-            }
-        }
-      else
-        {
-          result = -1;
-        }
-    }
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  if (result == 0)
-    {
-      return child;
-    }
-  else
-    {
-      // Otherwise, the AdapterNonExistent exception is raised.
-      ACE_THROW_RETURN (PortableServer::POA::AdapterNonExistent (),
-                        0);
-    }
-}
-
-void
-TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
-                    CORBA::Boolean wait_for_completion,
-                    CORBA::Environment &ACE_TRY_ENV)
-{
-  // Is the <wait_for_completion> semantics for this thread correct?
-  TAO_POA::check_for_valid_wait_for_completions (wait_for_completion,
-                                                 ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->cleanup_in_progress_ = 1;
-
-  // This operation destroys the POA and all descendant POAs. The POA
-  // so destroyed (that is, the POA with its name) may be re-created
-  // later in the same process. (This differs from the
-  // POAManager::deactivate operation that does not allow a
-  // re-creation of its associated POA in the same process.)
-
-  // Remove POA from the parent
-  if (this->parent_ != 0)
-    {
-      int result = this->parent_->delete_child (this->name_);
-      if (result != 0)
-        {
-          ACE_THROW (CORBA::OBJ_ADAPTER ());
-        }
-    }
-
-  // Remove all children POAs
-  for (CHILDREN::iterator iterator = this->children_.begin ();
-       iterator != this->children_.end ();
-       ++iterator)
-    {
-      TAO_POA *child_poa = (*iterator).int_id_;
-      child_poa->destroy_i (etherealize_objects,
-                            wait_for_completion,
-                            ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-
-  // When a POA is destroyed, any requests that have started execution
-  // continue to completion. Any requests that have not started
-  // execution are processed as if they were newly arrived, that is,
-  // the POA will attempt to cause recreation of the POA by invoking
-  // one or more adapter activators as described in Section 3.3.3.
-
-  // If the wait_for_completion parameter is TRUE, the destroy
-  // operation will return only after all requests in process have
-  // completed and all invocations of etherealize have
-  // completed. Otherwise, the destroy operation returns after
-  // destroying the POAs.
-
-  this->deactivate_all_objects_i (etherealize_objects,
-                                  wait_for_completion,
-                                  ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // If there are no outstanding requests.
-  if (this->outstanding_requests_ == 0)
-    {
-      // Commit suicide
-      delete this;
-    }
-  else
-    {
-      // Mark that we are ready for destruction.
-      this->waiting_destruction_ = 1;
-    }
-}
-
-int
-TAO_POA::delete_child (const TAO_POA::String &child)
-{
-  int result = 0;
-
-  // If we are not closing down, we must remove this child from our
-  // collection.
-  if (!this->cleanup_in_progress_)
-    {
-      result = this->children_.unbind (child);
-    }
-
-  // If we are closing down, we are currently iterating over our
-  // children and there is not need to remove this child from our
-  // collection.
-
-  return result;
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-PortableServer::ServantManager_ptr
-TAO_POA::get_servant_manager_i (CORBA::Environment &ACE_TRY_ENV)
-{
-  // This operation requires the USE_SERVANT_MANAGER policy; if not
-  // present, the WrongPolicy exception is raised.
-  if (this->policies ().request_processing () != PortableServer::USE_SERVANT_MANAGER)
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        PortableServer::ServantManager::_nil ());
-    }
-
-  // This operation returns the servant manager associated with the
-  // POA.  If no servant manager has been associated with the POA, it
-  // returns a null reference.
-  if (this->policies ().servant_retention () == PortableServer::RETAIN)
-    return PortableServer::ServantManager::_duplicate (this->servant_activator_.in ());
-  else
-    return PortableServer::ServantManager::_duplicate (this->servant_locator_.in ());
-}
-
-void
-TAO_POA::set_servant_manager_i (PortableServer::ServantManager_ptr imgr,
-                                CORBA::Environment &ACE_TRY_ENV)
-{
-  // This operation requires the USE_SERVANT_MANAGER policy; if not
-  // present, the WrongPolicy exception is raised.
-  if (this->policies ().request_processing () != PortableServer::USE_SERVANT_MANAGER)
-    {
-      ACE_THROW (PortableServer::POA::WrongPolicy ());
-    }
-
-  // This operation sets the default servant manager associated with
-  // the POA.
-  if (this->policies ().servant_retention () == PortableServer::RETAIN)
-    {
-      this->servant_activator_ = PortableServer::ServantActivator::_narrow (imgr,
-                                                                            ACE_TRY_ENV);
-      ACE_CHECK;
-
-      if (CORBA::is_nil (this->servant_activator_.in ()))
-        {
-          ACE_THROW (PortableServer::POA::WrongPolicy ());
-        }
-    }
-  else
-    {
-      this->servant_locator_ = PortableServer::ServantLocator::_narrow (imgr,
-                                                                        ACE_TRY_ENV);
-      ACE_CHECK;
-
-      if (CORBA::is_nil (this->servant_locator_.in ()))
-        {
-          ACE_THROW (PortableServer::POA::WrongPolicy ());
-        }
-    }
-}
-
-PortableServer::Servant
-TAO_POA::get_servant_i (CORBA::Environment &ACE_TRY_ENV)
-{
-  // This operation requires the USE_DEFAULT_SERVANT policy; if not
-  // present, the WrongPolicy exception is raised.
-  if (this->policies ().request_processing () != PortableServer::USE_DEFAULT_SERVANT)
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
-    }
-
-  // This operation returns the default servant associated with the
-  // POA.
-  PortableServer::Servant result = this->default_servant_.in ();
-  if (result != 0)
-    {
-      // The POA invokes _add_ref once on the Servant before returning
-      // it. If the application uses reference counting, the caller of
-      // get_servant is responsible for invoking _remove_ref once on
-      // the returned Servant when it is finished with it. A
-      // conforming caller need not invoke _remove_ref on the returned
-      // Servant if the type of the Servant uses the default reference
-      // counting inherited from ServantBase.
-      result->_add_ref (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      return result;
-    }
-  else
-    // If no servant has been associated with the POA, the NoServant
-    // exception is raised.
-    {
-      ACE_THROW_RETURN (PortableServer::POA::NoServant (),
-                        0);
-    }
-}
-
-void
-TAO_POA::set_servant_i (PortableServer::Servant servant,
-                        CORBA::Environment &ACE_TRY_ENV)
-{
-  // This operation requires the USE_DEFAULT_SERVANT policy; if not
-  // present, the WrongPolicy exception is raised.
-  if (this->policies ().request_processing () != PortableServer::USE_DEFAULT_SERVANT)
-    {
-      ACE_THROW (PortableServer::POA::WrongPolicy ());
-    }
-
-  // This operation registers the specified servant with the POA as
-  // the default servant. This servant will be used for all requests
-  // for which no servant is found in the Active Object Map.
-  this->default_servant_ = servant;
-
-  // The implementation of set_servant will invoke _add_ref at least
-  // once on the Servant argument before returning. When the POA no
-  // longer needs the Servant, it will invoke _remove_ref on it the
-  // same number of times.
-  if (servant != 0)
-    {
-      servant->_add_ref (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      // If we are a single threaded POA, set up the appropriate
-      // locking in the servant.
-      this->establish_servant_lock (servant);
-    }
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-int
-TAO_POA::is_servant_in_map (PortableServer::Servant servant)
-{
-  while (1)
-    {
-      int deactivated = 0;
-      int servant_in_map =
-        this->active_object_map ().is_servant_in_map (servant,
-                                                      deactivated);
-
-      if (!servant_in_map)
-        {
-          return 0;
-        }
-      else
-        {
-          if (deactivated)
-            {
-              if (TAO_debug_level > 0)
-                ACE_DEBUG ((LM_DEBUG,
-                            "(%t) TAO_POA::is_servant_in_map: waiting for servant to deactivate\n"));
-
-              ++this->waiting_servant_deactivation_;
-
-              this->servant_deactivation_condition_.wait ();
-
-              --this->waiting_servant_deactivation_;
-            }
-          else
-            {
-              return 1;
-            }
-        }
-    }
-}
-
-int
-TAO_POA::is_user_id_in_map (const PortableServer::ObjectId &id)
-{
-  while (1)
-    {
-      int deactivated = 0;
-      int user_id_in_map =
-        this->active_object_map ().is_user_id_in_map (id,
-                                                      deactivated);
-
-      if (!user_id_in_map)
-        {
-          return 0;
-        }
-      else
-        {
-          if (deactivated)
-            {
-              if (TAO_debug_level > 0)
-                ACE_DEBUG ((LM_DEBUG,
-                            "(%t) TAO_POA::is_user_id_in_map: waiting for servant to deactivate\n"));
-
-              ++this->waiting_servant_deactivation_;
-
-              this->servant_deactivation_condition_.wait ();
-
-              --this->waiting_servant_deactivation_;
-            }
-          else
-            {
-              return 1;
-            }
-        }
-    }
-}
-
-PortableServer::ObjectId *
-TAO_POA::activate_object_i (PortableServer::Servant servant,
-                            CORBA::Environment &ACE_TRY_ENV)
-{
-  // This operation requires the SYSTEM_ID and RETAIN policy; if not
-  // present, the WrongPolicy exception is raised.
-  if (!(this->policies ().id_assignment () == PortableServer::SYSTEM_ID &&
-        this->policies ().servant_retention () == PortableServer::RETAIN))
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
-    }
-
-  // If the POA has the UNIQUE_ID policy and the specified servant is
-  // already in the Active Object Map, the ServantAlreadyActive
-  // exception is raised.
-  if (this->policies ().id_uniqueness () == PortableServer::UNIQUE_ID &&
-      this->is_servant_in_map (servant))
-    {
-      ACE_THROW_RETURN (PortableServer::POA::ServantAlreadyActive (),
-                        0);
-    }
-
-  // Otherwise, the activate_object operation generates an Object Id
-  // and enters the Object Id and the specified servant in the Active
-  // Object Map. The Object Id is returned.
-  PortableServer::ObjectId_var user_id;
-  if (this->active_object_map ().bind_using_system_id_returning_user_id (servant,
-                                                                         user_id.out ()) != 0)
-    {
-      ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                        0);
-    }
-
-  //
-  // Everything is finally ok
-  //
-
-  // The implementation of activate_object will invoke _add_ref at
-  // least once on the Servant argument before returning. When the POA
-  // no longer needs the Servant, it will invoke _remove_ref on it the
-  // same number of times.
-  servant->_add_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  // If we are a single threaded POA, set up the appropriate locking
-  // in the servant.
-  this->establish_servant_lock (servant);
-
-  return user_id._retn ();
-}
-
-void
-TAO_POA::activate_object_with_id_i (const PortableServer::ObjectId &id,
-                                    PortableServer::Servant servant,
-                                    CORBA::Environment &ACE_TRY_ENV)
-{
-  // This operation requires the RETAIN policy; if not present, the
-  // WrongPolicy exception is raised.
-  if (this->policies ().servant_retention () != PortableServer::RETAIN)
-    {
-      ACE_THROW (PortableServer::POA::WrongPolicy ());
-    }
-
-  // If the POA has the SYSTEM_ID policy and it detects that the
-  // Object Id value was not generated by the system or for this POA,
-  // the activate_object_with_id operation may raise the BAD_PARAM
-  // system exception.  An ORB is not required to detect all such
-  // invalid Object Id values, but a portable application must not
-  // invoke activate_object_with_id on a POA that has the SYSTEM_ID
-  // policy with an Object Id value that was not previously generated
-  // by the system for that POA, or, if the POA also has the
-  // PERSISTENT policy, for a previous instantiation of the same POA.
-  if (this->policies ().id_assignment () == PortableServer::SYSTEM_ID &&
-      !this->is_poa_generated_id (id))
-    {
-      ACE_THROW (CORBA::BAD_PARAM ());
-    }
-
-  // If the CORBA object denoted by the Object Id value is already
-  // active in this POA (there is a servant bound to it in the Active
-  // Object Map), the ObjectAlreadyActive exception is raised.
-  if (is_user_id_in_map (id))
-    {
-      ACE_THROW (PortableServer::POA::ObjectAlreadyActive ());
-    }
-
-  // If the POA has the UNIQUE_ID policy and the servant is already in
-  // the Active Object Map, the ServantAlreadyActive exception is
-  // raised.
-  if (this->policies ().id_uniqueness () == PortableServer::UNIQUE_ID &&
-      this->is_servant_in_map (servant))
-    {
-      ACE_THROW (PortableServer::POA::ServantAlreadyActive ());
-    }
-
-  // Otherwise, the activate_object_with_id operation enters an
-  // association between the specified Object Id and the specified
-  // servant in the Active Object Map.
-  if (this->active_object_map ().bind_using_user_id (servant, id) != 0)
-    {
-      ACE_THROW (CORBA::OBJ_ADAPTER ());
-    }
-
-  //
-  // Everything is finally ok
-  //
-
-  // The implementation of activate_object_with_id will invoke
-  // _add_ref at least once on the Servant argument before
-  // returning. When the POA no longer needs the Servant, it will
-  // invoke _remove_ref on it the same number of times.
-  servant->_add_ref (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // If we are a single threaded POA, set up the appropriate locking
-  // in the servant.
-  this->establish_servant_lock (servant);
-}
-
-void
-TAO_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects,
-                                   CORBA::Boolean wait_for_completion,
-                                   CORBA::Environment &ACE_TRY_ENV)
-{
-  this->deactivate_all_objects_i (etherealize_objects,
-                                  ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->wait_for_completions (wait_for_completion,
-                              ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-void
-TAO_POA::wait_for_completions (CORBA::Boolean wait_for_completion,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  while (wait_for_completion &&
-         this->outstanding_requests_ > 0)
-    {
-      this->wait_for_completion_pending_ = 1;
-
-      int result = this->outstanding_requests_condition_.wait ();
-      if (result == -1)
-        {
-          ACE_THROW (CORBA::OBJ_ADAPTER ());
-        }
-    }
-}
-
-/* static */
-void
-TAO_POA::check_for_valid_wait_for_completions (CORBA::Boolean wait_for_completion,
-                                               CORBA::Environment &ACE_TRY_ENV)
-{
-  if (wait_for_completion)
-    {
-      TAO_POA_Current_Impl *poa_current_impl =
-        TAO_TSS_RESOURCES::instance ()->poa_current_impl_;
-
-      // This thread cannot currently be in an upcall.
-      if (poa_current_impl != 0)
-        {
-          ACE_THROW (CORBA::BAD_INV_ORDER ());
-        }
-    }
-}
-
-void
-TAO_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects,
-                                   CORBA::Environment &ACE_TRY_ENV)
-{
-  this->etherealize_objects_ = etherealize_objects;
-
-  // This operation is a no-op for the non-RETAIN policy.
-  if (this->policies ().servant_retention () != PortableServer::RETAIN)
-    {
-      return;
-    }
-
-  // If the etherealize_objects parameter is TRUE, the POA has the
-  // RETAIN policy, and a servant manager is registered with the POA,
-  // the etherealize operation on the servant manager will be called
-  // for each active object in the Active Object Map. The apparent
-  // destruction of the POA occurs before any calls to etherealize are
-  // made.  Thus, for example, an etherealize method that attempts to
-  // invoke operations on the POA will receive the OBJECT_NOT_EXIST
-  // exception.
-
-  // We must copy the user ids into a separate place since we cannot
-  // remove entries while iterating through the map.
-  ACE_Array<PortableServer::ObjectId> ids (this->active_object_map ().current_size ());
-
-  size_t counter = 0;
-  TAO_Active_Object_Map::user_id_map::iterator end
-    = this->active_object_map ().user_id_map_->end ();
-
-  for (TAO_Active_Object_Map::user_id_map::iterator iter
-         = this->active_object_map ().user_id_map_->begin ();
-       iter != end;
-       ++iter)
-    {
-      TAO_Active_Object_Map::user_id_map::value_type map_pair = *iter;
-      TAO_Active_Object_Map::Map_Entry *active_object_map_entry = map_pair.second ();
-
-      if (!active_object_map_entry->deactivated_)
-        {
-          ids[counter] = active_object_map_entry->user_id_;
-          ++counter;
-        }
-    }
-
-  for (size_t i = 0;
-       i < counter;
-       ++i)
-    {
-      this->deactivate_object_i (ids[i],
-                                 ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-}
-
-void
-TAO_POA::deactivate_object_i (const PortableServer::ObjectId &id,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  // This operation requires the RETAIN policy; if not present, the
-  // WrongPolicy exception is raised.
-  if (this->policies ().servant_retention () != PortableServer::RETAIN)
-    {
-      ACE_THROW (PortableServer::POA::WrongPolicy ());
-    }
-
-  TAO_Active_Object_Map::Map_Entry *active_object_map_entry = 0;
-  int result = this->active_object_map ().find_servant_and_system_id_using_user_id (id,
-                                                                                    active_object_map_entry);
-
-  // If there is no active object associated with the specified Object
-  // Id, the operation raises an ObjectNotActive exception.
-  if (result != 0)
-    {
-      ACE_THROW (PortableServer::POA::ObjectNotActive ());
-    }
-
-  // Decrement the reference count.
-  CORBA::UShort new_count = --active_object_map_entry->reference_count_;
-
-  if (new_count == 0)
-    {
-      this->cleanup_servant (active_object_map_entry,
-                             ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      // It should be noted that there may be a period of time between
-      // an object's deactivation and the etherealization (during
-      // which outstanding requests are being processed) in which
-      // arriving requests on that object should not be passed to its
-      // servant. During this period, requests targeted for such an
-      // object act as if the POA were in holding state until
-      // etherealize completes. If etherealize is called as a
-      // consequence of a deactivate call with a etherealize_objects
-      // parameter of TRUE, incoming requests are rejected.
-
-      // Else mark entry as closed...
-      active_object_map_entry->deactivated_ = 1;
-    }
-}
-
-void
-TAO_POA::cleanup_servant (TAO_Active_Object_Map::Map_Entry *active_object_map_entry,
-                          CORBA::Environment &ACE_TRY_ENV)
-{
-  // If a servant manager is associated with the POA,
-  // ServantLocator::etherealize will be invoked with the oid and the
-  // servant. (The deactivate_object operation does not wait for the
-  // etherealize operation to complete before deactivate_object
-  // returns.)
-  //
-  // Note: If the servant associated with the oid is serving multiple
-  // Object Ids, ServantLocator::etherealize may be invoked multiple
-  // times with the same servant when the other objects are
-  // deactivated. It is the responsibility of the object
-  // implementation to refrain from destroying the servant while it is
-  // active with any Id.
-
-  // If the POA has no ServantActivator associated with it, the POA
-  // implementation calls _remove_ref when all operation invocations
-  // have completed. If there is a ServantActivator, the Servant is
-  // consumed by the call to ServantActivator::etherealize instead.
-
-  // First check for a non-zero servant.
-  if (active_object_map_entry->servant_)
-    {
-      // If we are a single threaded POA, teardown the appropriate
-      // locking in the servant.
-      //
-      // Note that teardown of the servant lock must happen before the
-      // _remove_ref() or etherealize() calls since they might end up
-      // deleting the servant.
-      //
-      this->teardown_servant_lock (active_object_map_entry->servant_);
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-      if (this->etherealize_objects_ &&
-          this->policies ().request_processing () == PortableServer::USE_SERVANT_MANAGER &&
-          !CORBA::is_nil (this->servant_activator_.in ()))
-        {
-          PortableServer::POA_var self = this->_this (ACE_TRY_ENV);
-          ACE_CHECK;
-
-          CORBA::Boolean remaining_activations =
-            this->active_object_map ().remaining_activations (active_object_map_entry->servant_);
-
-          // A recursive thread lock without using a recursive thread
-          // lock.  Non_Servant_Upcall has a magic constructor and
-          // destructor.  We unlock the Object_Adapter lock for the
-          // duration of the servant activator upcalls; reacquiring
-          // once the upcalls complete.  Even though we are releasing
-          // the lock, other threads will not be able to make progress
-          // since <Object_Adapter::non_servant_upcall_in_progress_>
-          // has been set.
-          TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this->orb_core_.object_adapter ());
-          ACE_UNUSED_ARG (non_servant_upcall);
-
-          // If the cleanup_in_progress parameter is TRUE, the reason
-          // for the etherealize operation is that either the
-          // deactivate or destroy operation was called with an
-          // etherealize_objects parameter of TRUE. If the parameter
-          // is FALSE, the etherealize operation is called for other
-          // reasons.
-          this->servant_activator_->etherealize (active_object_map_entry->user_id_,
-                                                 self.in (),
-                                                 active_object_map_entry->servant_,
-                                                 this->cleanup_in_progress_,
-                                                 remaining_activations,
-                                                 ACE_TRY_ENV);
-          ACE_CHECK;
-        }
-      else
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-        {
-          active_object_map_entry->servant_->_remove_ref (ACE_TRY_ENV);
-          ACE_CHECK;
-        }
-    }
-
-  // This operation causes the association of the Object Id specified
-  // by the oid parameter and its servant to be removed from the
-  // Active Object Map.
-  int result = this->active_object_map ().unbind_using_user_id (active_object_map_entry->user_id_);
-
-  if (result != 0)
-    {
-      ACE_THROW (CORBA::OBJ_ADAPTER ());
-    }
-}
-
-void
-TAO_POA::check_poa_manager_state (CORBA::Environment &ACE_TRY_ENV)
-{
-  PortableServer::POAManager::State state = this->poa_manager_.get_state_i ();
-
-  if (state == PortableServer::POAManager::ACTIVE)
-    {
-      // When a POA manager is in the active state, the associated
-      // POAs will receive and start processing requests (assuming
-      // that appropriate thread resources are available).
-      return;
-    }
-
-  if (state == PortableServer::POAManager::DISCARDING)
-    {
-      // When a POA manager is in the discarding state, the associated
-      // POAs will discard all incoming requests (whose processing has
-      // not yet begun). When a request is discarded, the TRANSIENT
-      // system exception must be returned to the client-side to
-      // indicate that the request should be re-issued. (Of course, an
-      // ORB may always reject a request for other reasons and raise
-      // some other system exception.)
-      ACE_THROW (CORBA::TRANSIENT (
-        CORBA_SystemException::_tao_minor_code (
-          TAO_POA_DISCARDING,
-          0),
-        CORBA::COMPLETED_NO));
-    }
-
-  if (state == PortableServer::POAManager::HOLDING)
-    {
-      // When a POA manager is in the holding state, the associated
-      // POAs will queue incoming requests. The number of requests
-      // that can be queued is an implementation limit. If this limit
-      // is reached, the POAs may discard requests and return the
-      // TRANSIENT system exception to the client to indicate that the
-      // client should reissue the request. (Of course, an ORB may
-      // always reject a request for other reasons and raise some
-      // other system exception.)
-
-      // Since there is no queuing in TAO, we immediately raise a
-      // TRANSIENT exception.
-      ACE_THROW (CORBA::TRANSIENT (
-        CORBA_SystemException::_tao_minor_code (
-          TAO_POA_HOLDING,
-          0),
-        CORBA::COMPLETED_NO));
-    }
-
-  if (state == PortableServer::POAManager::INACTIVE)
-    {
-      // The inactive state is entered when the associated POAs are to
-      // be shut down. Unlike the discarding state, the inactive state
-      // is not a temporary state. When a POA manager is in the
-      // inactive state, the associated POAs will reject new
-      // requests. The rejection mechanism used is specific to the
-      // vendor. The GIOP location forwarding mechanism and
-      // CloseConnection message are examples of mechanisms that could
-      // be used to indicate the rejection. If the client is
-      // co-resident in the same process, the ORB could raise the
-      // OBJ_ADAPTER exception to indicate that the object
-      // implementation is unavailable.
-      ACE_THROW (CORBA::OBJ_ADAPTER ());
-    }
-}
-
-CORBA::Object_ptr
-TAO_POA::create_reference_i (const char *intf,
-                             CORBA::Environment &ACE_TRY_ENV)
-{
-  // This operation requires the SYSTEM_ID policy; if not present, the
-  // WrongPolicy exception is raised.
-  if (this->policies ().id_assignment () != PortableServer::SYSTEM_ID)
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        CORBA::Object::_nil ());
-    }
-
-  // This operation creates an object reference that encapsulates a
-  // POA-generated Object Id value and the specified interface
-  // repository id. This operation does not cause an activation to
-  // take place. The resulting reference may be passed to clients, so
-  // that subsequent requests on those references will cause the
-  // appropriate servant manager to be invoked, if one is
-  // available. The generated Object Id value may be obtained by
-  // invoking POA::reference_to_id with the created reference.
-  PortableServer::ObjectId_var system_id;
-  if (this->active_object_map ().bind_using_system_id_returning_system_id (0,
-                                                                           system_id.out ()) != 0)
-    {
-      ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                        CORBA::Object::_nil ());
-    }
-
-  // Create object key.
-  TAO_ObjectKey_var key = this->create_object_key (system_id.in ());
-
-  // Ask the ORB to create you a reference
-  return this->orb_core_.orb ()->key_to_object (key.in (),
-                                                intf,
-                                                0,
-                                                1,
-                                                ACE_TRY_ENV);
-}
-
-CORBA::Object_ptr
-TAO_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id,
-                                     const char *intf,
-                                     CORBA::Environment &ACE_TRY_ENV)
-{
-  // If the POA has the SYSTEM_ID policy and it detects that the
-  // Object Id value was not generated by the system or for this POA,
-  // the create_reference_with_id operation may raise the BAD_PARAM
-  // system exception. An ORB is not required to detect all such
-  // invalid Object Id values, but a portable application must not
-  // invoke this operation on a POA that has the SYSTEM_ID policy with
-  // an Object Id value that was not previously generated by the
-  // system for that POA, or, if the POA also has the PERSISTENT
-  // policy, for a previous instantiation of the same POA.
-  if (this->policies ().id_assignment () == PortableServer::SYSTEM_ID &&
-      !this->is_poa_generated_id (user_id))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                        CORBA::Object::_nil ());
-    }
-
-  // This operation creates an object reference that encapsulates the
-  // specified Object Id and interface repository Id values. This
-  // operation does not cause an activation to take place.  The
-  // resulting reference may be passed to clients, so that subsequent
-  // requests on those references will cause the object to be
-  // activated if necessary, or the default servant used, depending on
-  // the applicable policies.
-  PortableServer::Servant servant = 0;
-  PortableServer::ObjectId_var system_id;
-
-  // @@ We need something that can find the system id using appropriate strategy,
-  // at the same time, return the servant if one is available.  Before we have that
-  // function, <create_reference_with_id_i> basically generates broken collocated
-  // object when DIRECT collocation strategy is used.
-
-  if (this->active_object_map ().find_system_id_using_user_id (user_id,
-                                                               system_id.out ()) != 0)
-    {
-      ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                        CORBA::Object::_nil ());
-    }
-
-  // Create object key.
-  TAO_ObjectKey_var key = this->create_object_key (system_id.in ());
-
-  // Ask the ORB to create you a reference
-  return this->orb_core_.orb ()->key_to_object (key.in (),
-                                                intf,
-                                                servant,
-                                                1,
-                                                ACE_TRY_ENV);
-}
-
-PortableServer::ObjectId *
-TAO_POA::servant_to_id_i (PortableServer::Servant servant,
-                          CORBA::Environment &ACE_TRY_ENV)
-{
-  // This operation requires the RETAIN and either the UNIQUE_ID or
-  // IMPLICIT_ACTIVATION policies; if not present, the WrongPolicy
-  // exception is raised.
-  if (!(this->policies ().servant_retention () == PortableServer::RETAIN
-        && (this->policies ().id_uniqueness () == PortableServer::UNIQUE_ID
-            || this->policies ().implicit_activation () == PortableServer::IMPLICIT_ACTIVATION)))
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
-    }
-
-  // This operation has three possible behaviors.
-
-  // If the POA has the UNIQUE_ID policy and the specified servant is
-  // active, the Object Id associated with that servant is returned.
-  PortableServer::ObjectId_var user_id;
-  if (this->policies ().id_uniqueness () == PortableServer::UNIQUE_ID &&
-      this->active_object_map ().find_user_id_using_servant (servant,
-                                                             user_id.out ()) != -1)
-    {
-      return user_id._retn ();
-    }
-
-  // If the POA has the IMPLICIT_ACTIVATION policy and either the POA
-  // has the MULTIPLE_ID policy or the specified servant is not
-  // active, the servant is activated using a POA-generated Object Id
-  // and the Interface Id associated with the servant, and that Object
-  // Id is returned.
-  if (this->policies ().implicit_activation () == PortableServer::IMPLICIT_ACTIVATION)
-    {
-      // If we reach here, then we either have the MULTIPLE_ID policy
-      // or we have the UNIQUE_ID policy and we are not in the active
-      // object map.
-      PortableServer::ObjectId_var user_id;
-      if (this->active_object_map ().bind_using_system_id_returning_user_id (servant,
-                                                                             user_id.out ()) != 0)
-        {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            0);
-        }
-
-      //
-      // Everything is finally ok
-      //
-
-      // If this operation causes the object to be activated, _add_ref
-      // is invoked at least once on the Servant argument before
-      // returning. Otherwise, the POA does not increment or decrement
-      // the reference count of the Servant passed to this function.
-      servant->_add_ref (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      // If we are a single threaded POA, set up the appropriate
-      // locking in the servant.
-      this->establish_servant_lock (servant);
-
-      return user_id._retn ();
-    }
-
-  // Otherwise, the ServantNotActive exception is raised.
-  ACE_THROW_RETURN (PortableServer::POA::ServantNotActive (),
-                    0);
-}
-
-PortableServer::ObjectId *
-TAO_POA::servant_to_system_id_i (PortableServer::Servant servant,
-                                 CORBA::Environment &ACE_TRY_ENV)
-{
-  // This operation requires the RETAIN and either the UNIQUE_ID or
-  // IMPLICIT_ACTIVATION policies; if not present, the WrongPolicy
-  // exception is raised.
-  if (!(this->policies ().servant_retention () == PortableServer::RETAIN
-        && (this->policies ().id_uniqueness () == PortableServer::UNIQUE_ID
-            || this->policies ().implicit_activation () == PortableServer::IMPLICIT_ACTIVATION)))
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
-    }
-
-  // This operation has three possible behaviors.
-
-  // If the POA has the UNIQUE_ID policy and the specified servant is
-  // active, the Object Id associated with that servant is returned.
-  PortableServer::ObjectId_var system_id;
-  if (this->policies ().id_uniqueness () == PortableServer::UNIQUE_ID &&
-      this->active_object_map ().find_system_id_using_servant (servant,
-                                                               system_id.out ()) != -1)
-    {
-      return system_id._retn ();
-    }
-
-  // If the POA has the IMPLICIT_ACTIVATION policy and either the POA
-  // has the MULTIPLE_ID policy or the specified servant is not
-  // active, the servant is activated using a POA-generated Object Id
-  // and the Interface Id associated with the servant, and that Object
-  // Id is returned.
-  if (this->policies ().implicit_activation () == PortableServer::IMPLICIT_ACTIVATION)
-    {
-      // If we reach here, then we either have the MULTIPLE_ID policy
-      // or we xhave the UNIQUE_ID policy and we are not in the active
-      // object map.
-      PortableServer::ObjectId_var system_id;
-      if (this->active_object_map ().bind_using_system_id_returning_system_id (servant,
-                                                                               system_id.out ()) != 0)
-        {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            0);
-        }
-
-      //
-      // Everything is finally ok
-      //
-
-      // If this operation causes the object to be activated, _add_ref
-      // is invoked at least once on the Servant argument before
-      // returning. Otherwise, the POA does not increment or decrement
-      // the reference count of the Servant passed to this function.
-      servant->_add_ref (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      // If we are a single threaded POA, set up the appropriate
-      // locking in the servant.
-      this->establish_servant_lock (servant);
-
-      return system_id._retn ();
-    }
-
-  // Otherwise, the ServantNotActive exception is raised.
-  ACE_THROW_RETURN (PortableServer::POA::ServantNotActive (),
-                    0);
-}
-
-CORBA::Object_ptr
-TAO_POA::servant_to_reference (PortableServer::Servant servant,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  // Note: The allocation of an Object Id value and installation in
-  // the Active Object Map caused by implicit activation may actually
-  // be deferred until an attempt is made to externalize the
-  // reference. The real requirement here is that a reference is
-  // produced that will behave appropriately (that is, yield a
-  // consistent Object Id value when asked politely).
-  PortableServer::ObjectId_var id = this->servant_to_system_id (servant,
-                                                                ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  // Create object key.
-  TAO_ObjectKey_var key = this->create_object_key (id.in ());
-
-  // Ask the ORB to create you a reference
-  return this->orb_core_.orb ()->key_to_object (key.in (),
-                                                servant->_interface_repository_id (),
-                                                servant,
-                                                1,
-                                                ACE_TRY_ENV);
-}
-
-PortableServer::Servant
-TAO_POA::reference_to_servant (CORBA::Object_ptr reference,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  // This operation requires the RETAIN policy or the
-  // USE_DEFAULT_SERVANT policy. If neither policy is present, the
-  // WrongPolicy exception is raised.
-  if (!(this->policies ().servant_retention () == PortableServer::RETAIN
-        || this->policies ().request_processing () == PortableServer::USE_DEFAULT_SERVANT))
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
-    }
-
-  // If the POA has the RETAIN policy and the specified object is
-  // present in the Active Object Map, this operation returns the
-  // servant associated with that object in the Active Object Map.
-  if (this->policies ().servant_retention () == PortableServer::RETAIN)
-    {
-      TAO_ObjectKey_var key = reference->_key (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      // If the object reference was not created by this POA, the
-      // WrongAdapter exception is raised.
-      PortableServer::ObjectId system_id;
-      TAO_Object_Adapter::poa_name poa_system_name;
-      CORBA::Boolean is_root = 0;
-      CORBA::Boolean is_persistent = 0;
-      CORBA::Boolean is_system_id = 0;
-      TAO_Temporary_Creation_Time poa_creation_time;
-
-      int result = this->parse_key (key.in (),
-                                    poa_system_name,
-                                    system_id,
-                                    is_root,
-                                    is_persistent,
-                                    is_system_id,
-                                    poa_creation_time);
-      if (result != 0 ||
-          !this->root () &&
-          poa_system_name != this->system_name () ||
-          is_root != this->root () ||
-          is_persistent != this->persistent () ||
-          is_system_id != this->system_id () ||
-          !this->persistent () &&
-          poa_creation_time != this->creation_time_)
-        {
-          ACE_THROW_RETURN (PortableServer::POA::WrongAdapter (),
-                            0);
-        }
-
-      // Lock access for the duration of this transaction.
-      TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
-
-      // Find user id from system id.
-      PortableServer::ObjectId user_id;
-      if (this->active_object_map ().find_user_id_using_system_id (system_id,
-                                                                   user_id) != 0)
-        {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            0);
-        }
-
-      // This operation returns the active servant associated with the
-      // specified system Object Id value.  If the Object Id value is
-      // not active in the POA, an ObjectNotActive exception is
-      // raised.
-      PortableServer::Servant servant = 0;
-      TAO_Active_Object_Map::Map_Entry *entry = 0;
-
-      if (this->active_object_map ().find_servant_using_system_id_and_user_id (system_id,
-                                                                               user_id,
-                                                                               servant,
-                                                                               entry) != -1)
-        {
-          // The POA invokes _add_ref once on the Servant before
-          // returning it. If the application uses reference counting,
-          // the caller of reference_to_servant is responsible for
-          // invoking _remove_ref once on the returned Servant when it
-          // is finished with it.  A conforming caller need not invoke
-          // _remove_ref on the returned Servant if the type of the
-          // Servant uses the default reference counting inherited
-          // from ServantBase.
-          servant->_add_ref (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-          return servant;
-        }
-      else
-        // Otherwise, the ObjectNotActive exception is raised.
-        {
-          ACE_THROW_RETURN (PortableServer::POA::ObjectNotActive (),
-                            0);
-        }
-    }
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  // Otherwise, if the POA has the USE_DEFAULT_SERVANT policy and a
-  // default servant has been registered with the POA, this operation
-  // returns the default servant.
-  if (this->policies ().request_processing () == PortableServer::USE_DEFAULT_SERVANT)
-    {
-      // Lock access for the duration of this transaction.
-      TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
-
-      PortableServer::Servant result = this->default_servant_.in ();
-      if (result != 0)
-        {
-          // The POA invokes _add_ref once on the Servant before
-          // returning it. If the application uses reference counting,
-          // the caller of reference_to_servant is responsible for
-          // invoking _remove_ref once on the returned Servant when it
-          // is finished with it.  A conforming caller need not invoke
-          // _remove_ref on the returned Servant if the type of the
-          // Servant uses the default reference counting inherited
-          // from ServantBase.
-          result->_add_ref (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-          return result;
-        }
-      else
-        // Otherwise, the ObjectNotActive exception is raised.
-        {
-          ACE_THROW_RETURN (PortableServer::POA::ObjectNotActive (),
-                            0);
-        }
-    }
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  // Not reached
-  return 0;
-}
-
-PortableServer::ObjectId *
-TAO_POA::reference_to_id (CORBA::Object_ptr reference,
-                          CORBA::Environment &ACE_TRY_ENV)
-{
-  // The WrongPolicy exception is declared to allow future extensions.
-
-  // This operation returns the Object Id value encapsulated by the
-  // specified reference.
-
-  // This operation is valid only if the reference was created by the
-  // POA on which the operation is being performed.  If the object
-  // reference was not created by this POA, the WrongAdapter exception
-  // is raised.
-  TAO_ObjectKey_var key = reference->_key (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  PortableServer::ObjectId system_id;
-  TAO_Object_Adapter::poa_name poa_system_name;
-  CORBA::Boolean is_root = 0;
-  CORBA::Boolean is_persistent = 0;
-  CORBA::Boolean is_system_id = 0;
-  TAO_Temporary_Creation_Time poa_creation_time;
-
-  int result = this->parse_key (key.in (),
-                                poa_system_name,
-                                system_id,
-                                is_root,
-                                is_persistent,
-                                is_system_id,
-                                poa_creation_time);
-  if (result != 0 ||
-      !this->root () &&
-      poa_system_name != this->system_name () ||
-      is_root != this->root () ||
-      is_persistent != this->persistent () ||
-      is_system_id != this->system_id () ||
-      !this->persistent () &&
-      poa_creation_time != this->creation_time_)
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongAdapter (),
-                        0);
-    }
-
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
-
-  // The object denoted by the reference does not have to be active
-  // for this operation to succeed.
-  PortableServer::ObjectId_var user_id;
-  if (this->active_object_map ().find_user_id_using_system_id (system_id,
-                                                               user_id.out ()) != 0)
-    {
-      ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                        0);
-    }
-
-  return user_id._retn ();
-}
-
-PortableServer::Servant
-TAO_POA::id_to_servant_i (const PortableServer::ObjectId &id,
-                          CORBA::Environment &ACE_TRY_ENV)
-{
-  // This operation requires the RETAIN policy; if not present, the
-  // WrongPolicy exception is raised.
-  if (this->policies ().servant_retention () != PortableServer::RETAIN)
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
-    }
-
-  // This operation returns the active servant associated with the
-  // specified Object Id value.  If the Object Id value is not active
-  // in the POA, an ObjectNotActive exception is raised.
-  PortableServer::Servant servant = 0;
-  if (this->active_object_map ().find_servant_using_user_id (id,
-                                                             servant) != -1)
-    {
-      // The POA invokes _add_ref once on the Servant before returning
-      // it. If the application uses reference counting, the caller of
-      // id_to_servant is responsible for invoking _remove_ref once on
-      // the returned Servant when it is finished with it. A
-      // conforming caller need not invoke _remove_ref on the returned
-      // Servant if the type of the Servant uses the default reference
-      // counting inherited from ServantBase.
-      servant->_add_ref (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      return servant;
-    }
-  else
-    // Otherwise, the ObjectNotActive exception is raised.
-    {
-      ACE_THROW_RETURN (PortableServer::POA::ObjectNotActive (),
-                        0);
-    }
-}
-
-CORBA::Object_ptr
-TAO_POA::id_to_reference_i (const PortableServer::ObjectId &id,
-                            CORBA::Environment &ACE_TRY_ENV)
-{
-  // This operation requires the RETAIN policy; if not present, the
-  // WrongPolicy exception is raised.
-  if (this->policies ().servant_retention () != PortableServer::RETAIN)
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        CORBA::Object::_nil ());
-    }
-
-  // If an object with the specified Object Id value is currently
-  // active, a reference encapsulating the information used to
-  // activate the object is returned.
-  PortableServer::ObjectId_var system_id;
-  PortableServer::Servant servant;
-  if (this->active_object_map ().find_servant_and_system_id_using_user_id (id,
-                                                                           servant,
-                                                                           system_id.out ()) == 0)
-    {
-      // Create object key.
-      TAO_ObjectKey_var key = this->create_object_key (system_id.in ());
-
-      // Ask the ORB to create you a reference
-      return this->orb_core_.orb ()->key_to_object (key.in (),
-                                                    servant->_interface_repository_id (),
-                                                    servant,
-                                                    1,
-                                                    ACE_TRY_ENV);
-    }
-  else
-    // If the Object Id value is not active in the POA, an
-    // ObjectNotActive exception is raised.
-    {
-      ACE_THROW_RETURN (PortableServer::POA::ObjectNotActive (),
-                        CORBA::Object::_nil ());
-    }
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-void
-TAO_POA::forward_object_i (const PortableServer::ObjectId &oid,
-                           CORBA::Object_ptr forward_to,
-                           CORBA::Environment &ACE_TRY_ENV)
-{
-  // First, deactivate the object
-  this->deactivate_object_i (oid,
-                             ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // Create a forwarding servant
-  TAO_Forwarding_Servant *forwarding_servant = 0;
-  ACE_NEW_THROW_EX (forwarding_servant,
-                    TAO_Forwarding_Servant (forward_to,
-                                            forward_to->_interface_repository_id ()),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK;
-
-  // Give ownership to the auto pointer.
-  auto_ptr<TAO_Forwarding_Servant> new_forwarding_servant (forwarding_servant);
-
-  // Register the forwarding servant with the same object Id.
-  this->activate_object_with_id_i (oid,
-                                   forwarding_servant,
-                                   ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // Finally everything is fine.  Make sure to take ownership away
-  // from the auto pointer.
-  new_forwarding_servant.release ();
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-TAO_SERVANT_LOCATION
-TAO_POA::locate_servant_i (const PortableServer::ObjectId &system_id,
-                           PortableServer::Servant &servant,
-                           CORBA::Environment &ACE_TRY_ENV)
-{
-  // If the POA has the RETAIN policy, the POA looks in the Active
-  // Object Map to find if there is a servant associated with the
-  // Object Id value from the request. If such a servant exists,
-  // return TAO_SERVANT_FOUND.
-  if (this->policies ().servant_retention () == PortableServer::RETAIN)
-    {
-      // Find user id from system id.
-      PortableServer::ObjectId user_id;
-      if (this->active_object_map ().find_user_id_using_system_id (system_id,
-                                                                   user_id) != 0)
-        {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            TAO_SERVANT_NOT_FOUND);
-        }
-
-      TAO_Active_Object_Map::Map_Entry *entry = 0;
-      int result = this->active_object_map ().find_servant_using_system_id_and_user_id (system_id,
-                                                                                        user_id,
-                                                                                        servant,
-                                                                                        entry);
-      if (result == 0)
-        {
-          // Success
-          return TAO_SERVANT_FOUND;
-        }
-    }
-
-  // If the POA has the NON_RETAIN policy or has the RETAIN policy but
-  // didn't find a servant in the Active Object Map, the POA takes the
-  // following actions:
-
-  // If the USE_ACTIVE_OBJECT_MAP_ONLY policy is in effect, the POA raises
-  // the OBJECT_NOT_EXIST system exception.
-  if (this->policies ().request_processing () == PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY)
-    {
-      return TAO_SERVANT_NOT_FOUND;
-    }
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  // If the POA has the USE_DEFAULT_SERVANT policy, a default servant
-  // has been associated with the POA, return TAO_DEFAULT_SERVANT. If
-  // no servant has been associated with the POA, return
-  // TAO_SERVANT_NOT_FOUND.
-  if (this->policies ().request_processing () == PortableServer::USE_DEFAULT_SERVANT)
-    {
-      if (this->default_servant_.in () == 0)
-        {
-          return TAO_SERVANT_NOT_FOUND;
-        }
-      else
-        {
-          // Success
-          return TAO_DEFAULT_SERVANT;
-        }
-    }
-
-  // If the POA has the USE_SERVANT_MANAGER policy, a servant manager
-  // has been associated with the POA, return
-  // TAO_SERVANT_MANAGER. If no servant manager has been
-  // associated with the POA, return TAO_SERVANT_NOT_FOUND.
-  if (this->policies ().request_processing () == PortableServer::USE_SERVANT_MANAGER)
-    {
-      if (CORBA::is_nil (this->servant_activator_.in ()) &&
-          CORBA::is_nil (this->servant_locator_.in ()))
-        {
-          return TAO_SERVANT_NOT_FOUND;
-        }
-      else
-        {
-          // Success
-          return TAO_SERVANT_MANAGER;
-        }
-    }
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  // Failure
-  return TAO_SERVANT_NOT_FOUND;
-}
-
-PortableServer::Servant
-TAO_POA::locate_servant_i (const char *operation,
-                           const PortableServer::ObjectId &system_id,
-                           TAO_Object_Adapter::Servant_Upcall &servant_upcall,
-                           TAO_POA_Current_Impl &poa_current_impl,
-                           CORBA::Environment &ACE_TRY_ENV)
-{
-  if (this->active_object_map ().find_user_id_using_system_id (system_id,
-                                                               poa_current_impl.object_id_) != 0)
-    {
-      ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                        0);
-    }
-
-  // If the POA has the RETAIN policy, the POA looks in the Active
-  // Object Map to find if there is a servant associated with the
-  // Object Id value from the request. If such a servant exists, the
-  // POA invokes the appropriate method on the servant.
-  if (this->policies ().servant_retention () == PortableServer::RETAIN)
-    {
-      PortableServer::Servant servant = 0;
-      int result = this->active_object_map ().find_servant_using_system_id_and_user_id (system_id,
-                                                                                        poa_current_impl.object_id (),
-                                                                                        servant,
-                                                                                        servant_upcall.active_object_map_entry_);
-
-      if (result == 0)
-        {
-          // Increment the reference count.
-          ++servant_upcall.active_object_map_entry ()->reference_count_;
-
-          // Success
-          return servant;
-        }
-    }
-
-  // If the POA has the NON_RETAIN policy or has the RETAIN policy but
-  // didn't find a servant in the Active Object Map, the POA takes the
-  // following actions:
-
-  // If the USE_ACTIVE_OBJECT_MAP_ONLY policy is in effect, the POA raises
-  // the OBJECT_NOT_EXIST system exception.
-  if (this->policies ().request_processing () == PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  // If the POA has the USE_DEFAULT_SERVANT policy, a default servant
-  // has been associated with the POA so the POA will invoke the
-  // appropriate method on that servant. If no servant has been
-  // associated with the POA, the POA raises the OBJ_ADAPTER system
-  // exception.
-  if (this->policies ().request_processing () == PortableServer::USE_DEFAULT_SERVANT)
-    {
-      PortableServer::Servant result = this->default_servant_.in ();
-      if (result == 0)
-        {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            0);
-        }
-      else
-        {
-          // Success
-          return result;
-        }
-    }
-
-  // If the POA has the USE_SERVANT_MANAGER policy, a servant manager
-  // has been associated with the POA so the POA will invoke incarnate
-  // or preinvoke on it to find a servant that may handle the
-  // request. (The choice of method depends on the NON_RETAIN or
-  // RETAIN policy of the POA.) If no servant manager has been
-  // associated with the POA, the POA raises the OBJ_ADAPTER system
-  // exception.
-  //
-  // If a servant manager is located and invoked, but the servant
-  // manager is not directly capable of incarnating the object, it
-  // (the servant manager) may deal with the circumstance in a variety
-  // of ways, all of which are the application's responsibility.  Any
-  // system exception raised by the servant manager will be returned
-  // to the client in the reply. In addition to standard CORBA
-  // exceptions, a servant manager is capable of raising a
-  // ForwardRequest exception. This exception includes an object
-  // reference.
-  //
-  if (this->policies ().request_processing () == PortableServer::USE_SERVANT_MANAGER)
-    {
-      if (CORBA::is_nil (this->servant_activator_.in ()) &&
-          CORBA::is_nil (this->servant_locator_.in ()))
-        {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            0);
-        }
-
-      PortableServer::POA_var poa = this->_this (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      PortableServer::Servant servant = 0;
-      if (this->policies ().servant_retention () == PortableServer::RETAIN)
-        {
-          {
-            // A recursive thread lock without using a recursive
-            // thread lock.  Non_Servant_Upcall has a magic
-            // constructor and destructor.  We unlock the
-            // Object_Adapter lock for the duration of the servant
-            // activator upcalls; reacquiring once the upcalls
-            // complete.  Even though we are releasing the lock, other
-            // threads will not be able to make progress since
-            // <Object_Adapter::non_servant_upcall_in_progress_> has
-            // been set.
-            TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this->orb_core_.object_adapter ());
-            ACE_UNUSED_ARG (non_servant_upcall);
-
-            // @@
-            // Invocations of incarnate on the servant manager are serialized.
-            // Invocations of etherealize on the servant manager are serialized.
-            // Invocations of incarnate and etherealize on the servant manager are mutually exclusive.
-            servant = this->servant_activator_->incarnate (poa_current_impl.object_id (),
-                                                           poa.in (),
-                                                           ACE_TRY_ENV);
-            ACE_CHECK_RETURN (0);
-
-            if (servant == 0)
-              {
-                ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                                  0);
-              }
-          }
-
-          // If the incarnate operation returns a servant that is
-          // already active for a different Object Id and if the POA
-          // also has the UNIQUE_ID policy, the incarnate has violated
-          // the POA policy and is considered to be in error. The POA
-          // will raise an OBJ_ADAPTER system exception for the
-          // request.
-          if (this->policies ().id_uniqueness () == PortableServer::UNIQUE_ID &&
-              this->is_servant_in_map (servant))
-            {
-              ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                                0);
-            }
-
-          // The POA enters the returned Servant value into the Active
-          // Object Map so that subsequent requests with the same
-          // ObjectId value will be delivered directly to that servant
-          // without invoking the servant manager.
-          int result = this->active_object_map ().rebind_using_user_id_and_system_id (servant,
-                                                                                      poa_current_impl.object_id (),
-                                                                                      system_id,
-                                                                                      servant_upcall.active_object_map_entry_);
-          if (result != 0)
-            {
-              ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                                0);
-            }
-          else
-            {
-              // Increment the reference count.
-              ++servant_upcall.active_object_map_entry ()->reference_count_;
-
-              // If this operation causes the object to be activated,
-              // _add_ref is invoked at least once on the Servant
-              // argument before returning. Otherwise, the POA does
-              // not increment or decrement the reference count of the
-              // Servant passed to this function.
-              servant->_add_ref (ACE_TRY_ENV);
-              ACE_CHECK_RETURN (0);
-
-              // If we are a single threaded POA, set up the
-              // appropriate locking in the servant.
-              this->establish_servant_lock (servant);
-
-              // Success
-              return servant;
-            }
-        }
-      else
-        //
-        // Don't retain servant
-        //
-        {
-          // A recursive thread lock without using a recursive thread
-          // lock.  Non_Servant_Upcall has a magic constructor and
-          // destructor.  We unlock the Object_Adapter lock for the
-          // duration of the servant activator upcalls; reacquiring
-          // once the upcalls complete.  Even though we are releasing
-          // the lock, other threads will not be able to make progress
-          // since <Object_Adapter::non_servant_upcall_in_progress_>
-          // has been set.
-          TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this->orb_core_.object_adapter ());
-          ACE_UNUSED_ARG (non_servant_upcall);
-
-          // No serialization of invocations of preinvoke or
-          // postinvoke may be assumed; there may be multiple
-          // concurrent invocations of preinvoke for the same
-          // ObjectId.
-          //
-          // The same thread will be used to preinvoke the object,
-          // process the request, and postinvoke the object.
-          //
-          PortableServer::ServantLocator::Cookie cookie;
-          PortableServer::Servant servant = this->servant_locator_->preinvoke (poa_current_impl.object_id (),
-                                                                               poa.in (),
-                                                                               operation,
-                                                                               cookie,
-                                                                               ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-          if (servant == 0)
-            {
-              ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                                0);
-            }
-
-          // If we are a single threaded POA, set up the
-          // appropriate locking in the servant.
-          this->establish_servant_lock (servant);
-
-          // Remember to invoke <postinvoke>
-          servant_upcall.using_servant_locator ();
-
-          // Remember the cookie
-          servant_upcall.locator_cookie (cookie);
-
-          // Remember operation name.
-          servant_upcall.operation (operation);
-
-          // Success
-          return servant;
-        }
-    }
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  // Failure
-  ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                    0);
-}
-
-/* static */
-int
-TAO_POA::parse_key (const TAO_ObjectKey &key,
-                    TAO_Object_Adapter::poa_name &poa_system_name,
-                    PortableServer::ObjectId &system_id,
-                    CORBA::Boolean &is_root,
-                    CORBA::Boolean &is_persistent,
-                    CORBA::Boolean &is_system_id,
-                    TAO_Temporary_Creation_Time &poa_creation_time)
-{
-  // Start at zero.
-  CORBA::ULong starting_at = 0;
-
-  // Get the object key octets.
-  const CORBA::Octet *key_data = key.get_buffer ();
-
-#if !defined (TAO_NO_IOR_TABLE)
-  // Skip the object key prefix since we have already checked for
-  // this.
-  starting_at += TAO_OBJECTKEY_PREFIX_SIZE;
-#endif /* TAO_NO_IOR_TABLE */
-
-  // Check the root indicator.
-  char root_key_type = key_data[starting_at];
-  if (root_key_type == TAO_POA::root_key_char ())
-    {
-      is_root = 1;
-    }
-  else if (root_key_type == TAO_POA::non_root_key_char ())
-    {
-      is_root = 0;
-    }
-  else
-    {
-      // Incorrect key
-      return -1;
-    }
-
-  // Skip past the system id indicator
-  starting_at += TAO_POA::root_key_type_length ();
-
-  // Check the system id indicator.
-  char system_id_key_type = key_data[starting_at];
-  if (system_id_key_type == TAO_POA::system_id_key_char ())
-    {
-      is_system_id = 1;
-    }
-  else if (system_id_key_type == TAO_POA::user_id_key_char ())
-    {
-      is_system_id = 0;
-    }
-  else
-    {
-      // Incorrect key
-      return -1;
-    }
-
-  // Skip past the system id indicator
-  starting_at += TAO_POA::system_id_key_type_length ();
-
-  // Check the persistence indicator
-  char persistent_key_type = key_data[starting_at];
-  if (persistent_key_type == TAO_POA::persistent_key_char ())
-    {
-      is_persistent = 1;
-    }
-  else if (persistent_key_type == TAO_POA::transient_key_char ())
-    {
-      is_persistent = 0;
-    }
-  else
-    {
-      // Incorrect key
-      return -1;
-    }
-
-  // Skip past the persistent indicator
-  starting_at += TAO_POA::persistent_key_type_length ();
-
-#if !defined (POA_NO_TIMESTAMP)
-  // Grab the timestamp for transient POAs.
-  if (!is_persistent)
-    {
-      // Take the creation time for the timestamp
-      poa_creation_time.creation_time (key_data + starting_at);
-
-      // Skip past the timestamp
-      starting_at += TAO_Creation_Time::creation_time_length ();
-    }
-#else
-  ACE_UNUSED_ARG (poa_creation_time);
-#endif /* POA_NO_TIMESTAMP */
-
-  // Calculate the size of the POA name.
-  CORBA::ULong poa_name_size = 0;
-  if (!is_persistent)
-    {
-      // Transient POAs have fixed size.
-      poa_name_size = TAO_Object_Adapter::transient_poa_name_size ();
-    }
-  else if (is_system_id)
-    {
-      // System ids have fixed size.
-      poa_name_size = key.length () - starting_at - TAO_Active_Object_Map::system_id_size ();
-    }
-  else
-    {
-      // Get the size from the object key.
-      ACE_OS::memcpy (&poa_name_size,
-                      key_data + starting_at,
-                      sizeof (poa_name_size));
-      poa_name_size = ACE_NTOHL (poa_name_size);
-
-      starting_at += sizeof (poa_name_size);
-    }
-
-  // For non-root POAs, grab their name.
-  if (!is_root)
-    {
-      poa_system_name.replace (poa_name_size,
-                               poa_name_size,
-                               (CORBA::Octet *) key_data + starting_at,
-                               0);
-
-      starting_at += poa_name_size;
-    }
-
-  // The rest is the system id.
-  CORBA::ULong system_id_size = key.length () - starting_at;
-
-  // Reset <system_id>.
-  system_id.replace (system_id_size,
-                     system_id_size,
-                     (CORBA::Octet *) key_data + starting_at,
-                     0);
-
-  // Success
-  return 0;
-}
-
-TAO_ObjectKey *
-TAO_POA::create_object_key (const PortableServer::ObjectId &id)
-{
-  // Calculate the prefix size.
-  CORBA::ULong prefix_size = 0;
-#if !defined (TAO_NO_IOR_TABLE)
-  prefix_size += TAO_OBJECTKEY_PREFIX_SIZE;
-#endif /* TAO_NO_IOR_TABLE */
-
-  // If we are dealing with a persistent POA and user ids are being
-  // used, then we need to add the POA name length field to the object
-  // key. Otherwise, the POA name length can be calculated by looking
-  // at the remainder after extracting other parts of the key.
-  int add_poa_name_length =
-    this->persistent_ &&
-    !this->system_id_;
-
-  // Size required by the POA name.
-  CORBA::ULong poa_name = 0;
-
-  // Calculate the space required for the POA name.
-  CORBA::ULong poa_name_length = this->system_name_->length ();
-  if (!this->root ())
-    {
-      poa_name += poa_name_length;
-    }
-
-  // Check if we need to added the length of the POA name.
-  if (add_poa_name_length)
-    {
-      poa_name += sizeof (poa_name_length);
-    }
-
-  // Calculate the space required for the timestamp and the persistent
-  // byte.
-  CORBA::ULong creation_time = this->persistent_key_type_length ();
-#if !defined (POA_NO_TIMESTAMP)
-  // Calculate the space required for the timestamp.
-  CORBA::ULong creation_time_length = TAO_Creation_Time::creation_time_length ();
-  if (!this->persistent_)
-    {
-      creation_time += creation_time_length;
-    }
-#endif /* POA_NO_TIMESTAMP */
-
-  // Calculate the space required for the key.
-  CORBA::ULong buffer_size =
-    prefix_size +
-    this->root_key_type_length () +
-    this->system_id_key_type_length () +
-    creation_time +
-    poa_name +
-    id.length ();
-
-  // Create the buffer for the key.
-  CORBA::Octet *buffer = TAO_ObjectKey::allocbuf (buffer_size);
-
-  // Keeps track of where the next infomation goes; start at 0 byte.
-  CORBA::ULong starting_at = 0;
-
-#if !defined (TAO_NO_IOR_TABLE)
-  // Add the object key prefix.
-  ACE_OS::memcpy (&buffer[starting_at],
-                  &objectkey_prefix[0],
-                  TAO_OBJECTKEY_PREFIX_SIZE);
-
-  starting_at += TAO_OBJECTKEY_PREFIX_SIZE;
-#endif /* TAO_NO_IOR_TABLE */
-
-  // Copy the root byte.
-  buffer[starting_at] = (CORBA::Octet) this->root_key_type ();
-  starting_at += this->root_key_type_length ();
-
-  // Copy the system id byte.
-  buffer[starting_at] = (CORBA::Octet) this->system_id_key_type ();
-  starting_at += this->system_id_key_type_length ();
-
-  // Copy the persistence byte.
-  buffer[starting_at] = (CORBA::Octet) this->persistent_key_type ();
-  starting_at += this->persistent_key_type_length ();
-
-#if !defined (POA_NO_TIMESTAMP)
-  // Then copy the timestamp for transient POAs.
-  if (!this->persistent ())
-    {
-      ACE_OS::memcpy (&buffer[starting_at],
-                      this->creation_time_.creation_time (),
-                      creation_time_length);
-      starting_at += creation_time_length;
-    }
-#endif /* POA_NO_TIMESTAMP */
-
-  // Check if we need to added the length of the POA name.
-  if (add_poa_name_length)
-    {
-      poa_name_length = ACE_HTONL (poa_name_length);
-      ACE_OS::memcpy (&buffer[starting_at],
-                      &poa_name_length,
-                      sizeof (poa_name_length));
-      starting_at += sizeof (poa_name_length);
-    }
-
-  // Put the POA name into the key (for non-root POAs).
-  if (!this->root ())
-    {
-      ACE_OS::memcpy (&buffer[starting_at],
-                      this->system_name_->get_buffer (),
-                      this->system_name_->length ());
-      starting_at += this->system_name_->length ();
-    }
-
-  // Then copy the object id into the key.
-  ACE_OS::memcpy (&buffer[starting_at],
-                  id.get_buffer (),
-                  id.length ());
-
-  // Create the key, giving the ownership of the buffer to the
-  // sequence.
-  TAO_ObjectKey *key = 0;
-  ACE_NEW_RETURN (key,
-                  TAO_ObjectKey (buffer_size,
-                                 buffer_size,
-                                 buffer,
-                                 1),
-                  0);
-
-  return key;
-}
-
-int
-TAO_POA::is_poa_generated_id (const PortableServer::ObjectId &id)
-{
-
-#if defined (POA_NAME_IN_POA_GENERATED_ID)
-
-  // Grab the buffer
-  const char *id_buffer = (const char *) id.get_buffer ();
-
-  // Check to see if the POA name is the first part of the id
-  return
-    this->name_.length () < id.length () &&
-    ACE_OS::strncmp (id_buffer,
-                     this->name_.c_str (),
-                     this->name_.length ()) == 0;
-
-#else /* POA_NAME_IN_POA_GENERATED_ID */
-
-  ACE_UNUSED_ARG (id);
-  return 1;
-
-#endif /* POA_NAME_IN_POA_GENERATED_ID */
-}
-
-void
-TAO_POA::set_folded_name (void)
-{
-  CORBA::ULong length = 0;
-  CORBA::ULong parent_length = 0;
-
-  if (this->parent_ != 0)
-    {
-      parent_length = this->parent_->folded_name ().length ();
-      length += parent_length;
-    }
-
-  length += this->name_.length ();
-  length += TAO_POA::name_separator_length ();
-
-  this->folded_name_.length (length);
-  CORBA::Octet *folded_name_buffer = this->folded_name_.get_buffer ();
-
-  if (this->parent_ != 0)
-    {
-      ACE_OS::memcpy (folded_name_buffer,
-                      this->parent_->folded_name ().get_buffer (),
-                      parent_length);
-    }
-
-  ACE_OS::memcpy (&folded_name_buffer[parent_length],
-                  this->name_.c_str (),
-                  this->name_.length ());
-
-  folded_name_buffer[length - TAO_POA::name_separator_length ()] = TAO_POA::name_separator ();
-}
-
-PortableServer::ObjectId *
-TAO_POA::string_to_ObjectId (const char *string)
-{
-  // Size of string
-  //
-  // We DO NOT include the zero terminator, as this is simply an
-  // artifact of the way strings are stored in C.
-  //
-  CORBA::ULong buffer_size = ACE_OS::strlen (string);
-
-  // Create the buffer for the Id
-  CORBA::Octet *buffer = PortableServer::ObjectId::allocbuf (buffer_size);
-
-  // Copy the contents
-  ACE_OS::memcpy (buffer, string, buffer_size);
-
-  // Create and return a new ID
-  PortableServer::ObjectId *id = 0;
-  ACE_NEW_RETURN (id,
-                  PortableServer::ObjectId (buffer_size,
-                                            buffer_size,
-                                            buffer,
-                                            1),
-                  0);
-
-  return id;
-}
-
-PortableServer::ObjectId *
-TAO_POA::string_to_ObjectId (const char *string,
-                             int size)
-{
-  // Create the buffer for the Id
-  CORBA::Octet *buffer = PortableServer::ObjectId::allocbuf (size);
-
-  // Copy the contents
-  ACE_OS::memcpy (buffer, string, size);
-
-  // Create and return a new ID
-  PortableServer::ObjectId *id = 0;
-  ACE_NEW_RETURN (id,
-                  PortableServer::ObjectId (size,
-                                            size,
-                                            buffer,
-                                            1),
-                  0);
-
-  return id;
-}
-
-PortableServer::ObjectId *
-TAO_POA::wstring_to_ObjectId (const CORBA::WChar *string)
-{
-  // Size of Id
-  //
-  // We DO NOT include the zero terminator, as this is simply an
-  // artifact of the way strings are stored in C.
-  //
-  CORBA::ULong string_length = ACE_OS::wslen (string);
-
-  size_t buffer_size = string_length * sizeof (CORBA::WChar);
-
-  // Create the buffer for the Id
-  CORBA::Octet *buffer = PortableServer::ObjectId::allocbuf (buffer_size);
-
-  // Copy contents
-  ACE_OS::memcpy (buffer, string, buffer_size);
-
-  // Create a new ID
-  PortableServer::ObjectId *id = 0;
-  ACE_NEW_RETURN (id,
-                  PortableServer::ObjectId (buffer_size,
-                                            buffer_size,
-                                            buffer,
-                                            1),
-                  0);
-
-  return id;
-}
-
-CORBA::String
-TAO_POA::ObjectId_to_string (const PortableServer::ObjectId &id)
-{
-  // Create space
-  CORBA::String string = CORBA::string_alloc (id.length ());
-
-  // Copy the data
-  ACE_OS::memcpy (string, id.get_buffer (), id.length ());
-
-  // Null terminate the string
-  string[id.length ()] = '\0';
-
-  // Return string
-  return string;
-}
-
-CORBA::WChar *
-TAO_POA::ObjectId_to_wstring (const PortableServer::ObjectId &id)
-{
-  // Create space
-  CORBA::WChar* string = CORBA::wstring_alloc (id.length ());
-
-  // Copy the data
-  ACE_OS::memcpy (string, id.get_buffer (), id.length () * sizeof (CORBA::WChar));
-
-  // Null terminate the string
-  string[id.length ()] = '\0';
-
-  // Return string
-  return string;
-}
-
-void
-TAO_POA::encode_sequence_to_string (CORBA::String &str,
-                                    const TAO_Unbounded_Sequence<CORBA::Octet> &seq)
-{
-  // We must allocate a buffer which is (gag) 3 times the length
-  // of the sequence, which is the length required in the worst-case
-  // scenario of all non-printable characters.
-  //
-  // There are two strategies here...we could allocate all that space here,
-  // fill it up, then copy-allocate new space of just the right length.
-  // OR, we could just return this space.  The classic time-space tradeoff,
-  // and for now we'll let time win out, which means that we only do the
-  // allocation once.
-  u_int len = 3 * seq.length (); /* space for zero termination not needed */;
-  str = CORBA::string_alloc (len);
-
-  char *cp = str;
-
-  for (u_int i = 0;
-       cp < (cp + len) && i < seq.length();
-       ++i)
-    {
-      u_char byte = seq[i];
-      if (isprint (byte) && byte != '\\')
-        {
-          *cp++ = (char) byte;
-          continue;
-        }
-
-      *cp++ = '\\';
-      *cp++ = ACE::nibble2hex ((byte >> 4) & 0x0f);
-      *cp++ = ACE::nibble2hex (byte & 0x0f);
-    }
-  // Zero terminate
-  *cp = '\0';
-}
-
-void
-TAO_POA::decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq,
-                                    const char *str)
-{
-  if (str == 0)
-    {
-      seq.length (0);
-      return;
-    }
-
-  u_int length = ACE_OS::strlen (str);
-  const char *eos = str + length;
-  const char *cp = str;
-
-  // Set the length of the sequence to be as long as
-  // we'll possibly need...we'll reset it to the actual
-  // length later.
-  seq.length (length);
-
-  u_int i = 0;
-  for (;
-       cp < eos && i < seq.length ();
-       i++)
-    {
-      if (*cp == '\\')
-        {
-          // This is an escaped non-printable,
-          // so we decode the hex values into
-          // the sequence's octet
-          seq[i] = (u_char) (ACE::hex2byte (cp[1]) << 4);
-          seq[i] |= (u_char) ACE::hex2byte (cp[2]);
-          cp += 3;
-        }
-      else
-        // Copy it in
-        seq[i] = *cp++;
-    }
-
-  // Set the length appropriately
-  seq.length (i);
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-PortableServer::ThreadPolicy_ptr
-TAO_POA::create_thread_policy (PortableServer::ThreadPolicyValue value,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  PortableServer::POA_var rootPOA = this->orb_core_.root_poa_reference (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::ThreadPolicy::_nil ());
-
-  TAO_Thread_Policy *thread_policy = 0;
-  ACE_NEW_THROW_EX (thread_policy,
-                    TAO_Thread_Policy (value,
-                                       rootPOA.in ()),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::ThreadPolicy::_nil ());
-
-  // Give ownership of the copy to the auto pointer.
-  auto_ptr<TAO_Thread_Policy> new_thread_policy (thread_policy);
-
-  PortableServer::ThreadPolicy_var result = new_thread_policy->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::ThreadPolicy::_nil ());
-
-  // Give ownership of this servant to the POA.
-  new_thread_policy->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::ThreadPolicy::_nil ());
-
-  // Make sure that the auto_ptr does not delete the implementation
-  // object.
-  new_thread_policy.release ();
-  return result._retn ();
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-PortableServer::LifespanPolicy_ptr
-TAO_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value,
-                                 CORBA::Environment &ACE_TRY_ENV)
-{
-  PortableServer::POA_var rootPOA = this->orb_core_.root_poa_reference (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::LifespanPolicy::_nil ());
-
-  TAO_Lifespan_Policy *lifespan_policy = 0;
-  ACE_NEW_THROW_EX (lifespan_policy,
-                    TAO_Lifespan_Policy (value,
-                                         rootPOA.in ()),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::LifespanPolicy::_nil ());
-
-  // Give ownership of the copy to the auto pointer.
-  auto_ptr<TAO_Lifespan_Policy> new_lifespan_policy (lifespan_policy);
-
-  PortableServer::LifespanPolicy_var result = new_lifespan_policy->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::LifespanPolicy::_nil ());
-
-  // Give ownership of this servant to the POA.
-  new_lifespan_policy->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::LifespanPolicy::_nil ());
-
-  // Make sure that the auto_ptr does not delete the implementation
-  // object.
-  new_lifespan_policy.release ();
-  return result._retn ();
-}
-
-PortableServer::IdUniquenessPolicy_ptr
-TAO_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value,
-                                      CORBA::Environment &ACE_TRY_ENV)
-{
-  PortableServer::POA_var rootPOA = this->orb_core_.root_poa_reference (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::IdUniquenessPolicy::_nil ());
-
-  TAO_Id_Uniqueness_Policy *id_uniqueness_policy = 0;
-  ACE_NEW_THROW_EX (id_uniqueness_policy,
-                    TAO_Id_Uniqueness_Policy (value,
-                                              rootPOA.in ()),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::IdUniquenessPolicy::_nil ());
-
-  // Give ownership of the copy to the auto pointer.
-  auto_ptr<TAO_Id_Uniqueness_Policy> new_id_uniqueness_policy (id_uniqueness_policy);
-
-  PortableServer::IdUniquenessPolicy_var result = new_id_uniqueness_policy->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::IdUniquenessPolicy::_nil ());
-
-  // Give ownership of this servant to the POA.
-  new_id_uniqueness_policy->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::IdUniquenessPolicy::_nil ());
-
-  // Make sure that the auto_ptr does not delete the implementation
-  // object.
-  new_id_uniqueness_policy.release ();
-  return result._retn ();
-}
-
-PortableServer::IdAssignmentPolicy_ptr
-TAO_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value,
-                                      CORBA::Environment &ACE_TRY_ENV)
-{
-  PortableServer::POA_var rootPOA = this->orb_core_.root_poa_reference (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::IdAssignmentPolicy::_nil ());
-
-  TAO_Id_Assignment_Policy *id_assignment_policy = 0;
-  ACE_NEW_THROW_EX (id_assignment_policy,
-                    TAO_Id_Assignment_Policy (value,
-                                              rootPOA.in ()),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::IdAssignmentPolicy::_nil ());
-
-  // Give ownership of the copy to the auto pointer.
-  auto_ptr<TAO_Id_Assignment_Policy> new_id_assignment_policy (id_assignment_policy);
-
-  PortableServer::IdAssignmentPolicy_var result = new_id_assignment_policy->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::IdAssignmentPolicy::_nil ());
-
-  // Give ownership of this servant to the POA.
-  new_id_assignment_policy->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::IdAssignmentPolicy::_nil ());
-
-  // Make sure that the auto_ptr does not delete the implementation
-  // object.
-  new_id_assignment_policy.release ();
-  return result._retn ();
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-PortableServer::ImplicitActivationPolicy_ptr
-TAO_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value,
-                                            CORBA::Environment &ACE_TRY_ENV)
-{
-  PortableServer::POA_var rootPOA = this->orb_core_.root_poa_reference (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::ImplicitActivationPolicy::_nil ());
-
-  TAO_Implicit_Activation_Policy *implicit_activation_policy = 0;
-  ACE_NEW_THROW_EX (implicit_activation_policy,
-                    TAO_Implicit_Activation_Policy (value,
-                                                    rootPOA.in ()),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::ImplicitActivationPolicy::_nil ());
-
-  // Give ownership of the copy to the auto pointer.
-  auto_ptr<TAO_Implicit_Activation_Policy> new_implicit_activation_policy (implicit_activation_policy);
-
-  PortableServer::ImplicitActivationPolicy_var result = new_implicit_activation_policy->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::ImplicitActivationPolicy::_nil ());
-
-  // Give ownership of this servant to the POA.
-  new_implicit_activation_policy->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::ImplicitActivationPolicy::_nil ());
-
-  // Make sure that the auto_ptr does not delete the implementation
-  // object.
-  new_implicit_activation_policy.release ();
-  return result._retn ();
-}
-
-PortableServer::ServantRetentionPolicy_ptr
-TAO_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value,
-                                          CORBA::Environment &ACE_TRY_ENV)
-{
-  PortableServer::POA_var rootPOA = this->orb_core_.root_poa_reference (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::ServantRetentionPolicy::_nil ());
-
-  TAO_Servant_Retention_Policy *servant_retention_policy = 0;
-  ACE_NEW_THROW_EX (servant_retention_policy,
-                    TAO_Servant_Retention_Policy (value,
-                                                  rootPOA.in ()),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::ServantRetentionPolicy::_nil ());
-
-  // Give ownership of the copy to the auto pointer.
-  auto_ptr<TAO_Servant_Retention_Policy> new_servant_retention_policy (servant_retention_policy);
-
-  PortableServer::ServantRetentionPolicy_var result = new_servant_retention_policy->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::ServantRetentionPolicy::_nil ());
-
-  // Give ownership of this servant to the POA.
-  new_servant_retention_policy->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::ServantRetentionPolicy::_nil ());
-
-  // Make sure that the auto_ptr does not delete the implementation
-  // object.
-  new_servant_retention_policy.release ();
-  return result._retn ();
-}
-
-PortableServer::RequestProcessingPolicy_ptr
-TAO_POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value,
-                                           CORBA::Environment &ACE_TRY_ENV)
-{
-  PortableServer::POA_var rootPOA = this->orb_core_.root_poa_reference (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::RequestProcessingPolicy::_nil ());
-
-  TAO_Request_Processing_Policy *request_processing_policy = 0;
-  ACE_NEW_THROW_EX (request_processing_policy,
-                    TAO_Request_Processing_Policy (value,
-                                                   rootPOA.in ()),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::RequestProcessingPolicy::_nil ());
-
-  // Give ownership of the copy to the auto pointer.
-  auto_ptr<TAO_Request_Processing_Policy> new_request_processing_policy (request_processing_policy);
-
-  PortableServer::RequestProcessingPolicy_var result = new_request_processing_policy->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::RequestProcessingPolicy::_nil ());
-
-  // Give ownership of this servant to the POA.
-  new_request_processing_policy->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::RequestProcessingPolicy::_nil ());
-
-  // Make sure that the auto_ptr does not delete the implementation
-  // object.
-  new_request_processing_policy.release ();
-  return result._retn ();
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-TAO_Thread_Policy::TAO_Thread_Policy (PortableServer::ThreadPolicyValue value,
-                                      PortableServer::POA_ptr poa)
-  : value_ (value),
-    poa_ (PortableServer::POA::_duplicate (poa))
-{
-}
-
-PortableServer::ThreadPolicyValue
-TAO_Thread_Policy::value (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return this->value_;
-}
-
-CORBA::Policy_ptr
-TAO_Thread_Policy::copy (CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Thread_Policy *thread_policy_copy = 0;
-  ACE_NEW_THROW_EX (thread_policy_copy,
-                    TAO_Thread_Policy (*this),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Give ownership of the copy to the auto pointer.
-  auto_ptr<TAO_Thread_Policy> new_thread_policy (thread_policy_copy);
-
-  CORBA::Policy_var result = new_thread_policy->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Give ownership of this servant to the POA.
-  new_thread_policy->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Make sure that the auto_ptr does not delete the implementation
-  // object.
-  new_thread_policy.release ();
-  return result._retn ();
-}
-
-void
-TAO_Thread_Policy::destroy (CORBA::Environment &ACE_TRY_ENV)
-{
-  //
-  // Remove self from POA.  Because of reference counting, the POA
-  // will automatically delete the servant when all pending requests
-  // on this servant are complete.
-  //
-
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-CORBA::PolicyType
-TAO_Thread_Policy::policy_type (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return PortableServer::THREAD_POLICY_ID;
-}
-
-PortableServer::POA_ptr
-TAO_Thread_Policy::_default_POA (CORBA::Environment & /* ACE_TRY_ENV */)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-TAO_Lifespan_Policy::TAO_Lifespan_Policy (PortableServer::LifespanPolicyValue value,
-                                          PortableServer::POA_ptr poa)
-  : value_ (value),
-    poa_ (PortableServer::POA::_duplicate (poa))
-{
-}
-
-PortableServer::LifespanPolicyValue
-TAO_Lifespan_Policy::value (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return this->value_;
-}
-
-CORBA::Policy_ptr
-TAO_Lifespan_Policy::copy (CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Lifespan_Policy *lifespan_policy_copy = 0;
-  ACE_NEW_THROW_EX (lifespan_policy_copy,
-                    TAO_Lifespan_Policy (*this),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Give ownership of the copy to the auto pointer.
-  auto_ptr<TAO_Lifespan_Policy> new_lifespan_policy (lifespan_policy_copy);
-
-  CORBA::Policy_var result = new_lifespan_policy->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Give ownership of this servant to the POA.
-  new_lifespan_policy->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Make sure that the auto_ptr does not delete the implementation
-  // object.
-  new_lifespan_policy.release ();
-  return result._retn ();
-}
-
-void
-TAO_Lifespan_Policy::destroy (CORBA::Environment &ACE_TRY_ENV)
-{
-  //
-  // Remove self from POA.  Because of reference counting, the POA
-  // will automatically delete the servant when all pending requests
-  // on this servant are complete.
-  //
-
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-CORBA::PolicyType
-TAO_Lifespan_Policy::policy_type (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return PortableServer::LIFESPAN_POLICY_ID;
-}
-
-PortableServer::POA_ptr
-TAO_Lifespan_Policy::_default_POA (CORBA::Environment & /* ACE_TRY_ENV */)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-TAO_Id_Uniqueness_Policy::TAO_Id_Uniqueness_Policy (PortableServer::IdUniquenessPolicyValue value,
-                                                    PortableServer::POA_ptr poa)
-  : value_ (value),
-    poa_ (PortableServer::POA::_duplicate (poa))
-{
-}
-
-PortableServer::IdUniquenessPolicyValue
-TAO_Id_Uniqueness_Policy::value (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return this->value_;
-}
-
-CORBA::Policy_ptr
-TAO_Id_Uniqueness_Policy::copy (CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Id_Uniqueness_Policy *id_uniqueness_policy_copy = 0;
-  ACE_NEW_THROW_EX (id_uniqueness_policy_copy,
-                    TAO_Id_Uniqueness_Policy (*this),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Give ownership of the copy to the auto pointer.
-  auto_ptr<TAO_Id_Uniqueness_Policy> new_id_uniqueness_policy (id_uniqueness_policy_copy);
-
-  CORBA::Policy_var result = new_id_uniqueness_policy->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Give ownership of this servant to the POA.
-  new_id_uniqueness_policy->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Make sure that the auto_ptr does not delete the implementation
-  // object.
-  new_id_uniqueness_policy.release ();
-  return result._retn ();
-}
-
-void
-TAO_Id_Uniqueness_Policy::destroy (CORBA::Environment &ACE_TRY_ENV)
-{
-  //
-  // Remove self from POA.  Because of reference counting, the POA
-  // will automatically delete the servant when all pending requests
-  // on this servant are complete.
-  //
-
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-CORBA::PolicyType
-TAO_Id_Uniqueness_Policy::policy_type (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return PortableServer::ID_UNIQUENESS_POLICY_ID;
-}
-
-PortableServer::POA_ptr
-TAO_Id_Uniqueness_Policy::_default_POA (CORBA::Environment & /* ACE_TRY_ENV */)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-TAO_Id_Assignment_Policy::TAO_Id_Assignment_Policy (PortableServer::IdAssignmentPolicyValue value,
-                                                    PortableServer::POA_ptr poa)
-  : value_ (value),
-    poa_ (PortableServer::POA::_duplicate (poa))
-{
-}
-
-PortableServer::IdAssignmentPolicyValue
-TAO_Id_Assignment_Policy::value (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return this->value_;
-}
-
-CORBA::Policy_ptr
-TAO_Id_Assignment_Policy::copy (CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Id_Assignment_Policy *id_assignment_policy_copy = 0;
-  ACE_NEW_THROW_EX (id_assignment_policy_copy,
-                    TAO_Id_Assignment_Policy (*this),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Give ownership of the copy to the auto pointer.
-  auto_ptr<TAO_Id_Assignment_Policy> new_id_assignment_policy (id_assignment_policy_copy);
-
-  CORBA::Policy_var result = new_id_assignment_policy->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Give ownership of this servant to the POA.
-  new_id_assignment_policy->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Make sure that the auto_ptr does not delete the implementation
-  // object.
-  new_id_assignment_policy.release ();
-  return result._retn ();
-}
-
-void
-TAO_Id_Assignment_Policy::destroy (CORBA::Environment &ACE_TRY_ENV)
-{
-  //
-  // Remove self from POA.  Because of reference counting, the POA
-  // will automatically delete the servant when all pending requests
-  // on this servant are complete.
-  //
-
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-CORBA::PolicyType
-TAO_Id_Assignment_Policy::policy_type (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return PortableServer::ID_ASSIGNMENT_POLICY_ID;
-}
-
-PortableServer::POA_ptr
-TAO_Id_Assignment_Policy::_default_POA (CORBA::Environment & /* ACE_TRY_ENV */)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-TAO_Implicit_Activation_Policy::TAO_Implicit_Activation_Policy (PortableServer::ImplicitActivationPolicyValue value,
-                                                                PortableServer::POA_ptr poa)
-  : value_ (value),
-    poa_ (PortableServer::POA::_duplicate (poa))
-{
-}
-
-PortableServer::ImplicitActivationPolicyValue
-TAO_Implicit_Activation_Policy::value (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return this->value_;
-}
-
-CORBA::Policy_ptr
-TAO_Implicit_Activation_Policy::copy (CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Implicit_Activation_Policy *implicit_activation_policy_copy = 0;
-  ACE_NEW_THROW_EX (implicit_activation_policy_copy,
-                    TAO_Implicit_Activation_Policy (*this),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Give ownership of the copy to the auto pointer.
-  auto_ptr<TAO_Implicit_Activation_Policy> new_implicit_activation_policy (implicit_activation_policy_copy);
-
-  CORBA::Policy_var result = new_implicit_activation_policy->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Give ownership of this servant to the POA.
-  new_implicit_activation_policy->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Make sure that the auto_ptr does not delete the implementation
-  // object.
-  new_implicit_activation_policy.release ();
-  return result._retn ();
-}
-
-void
-TAO_Implicit_Activation_Policy::destroy (CORBA::Environment &ACE_TRY_ENV)
-{
-  //
-  // Remove self from POA.  Because of reference counting, the POA
-  // will automatically delete the servant when all pending requests
-  // on this servant are complete.
-  //
-
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-CORBA::PolicyType
-TAO_Implicit_Activation_Policy::policy_type (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return PortableServer::IMPLICIT_ACTIVATION_POLICY_ID;
-}
-
-PortableServer::POA_ptr
-TAO_Implicit_Activation_Policy::_default_POA (CORBA::Environment & /* ACE_TRY_ENV */)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-TAO_Servant_Retention_Policy::TAO_Servant_Retention_Policy (PortableServer::ServantRetentionPolicyValue value,
-                                                            PortableServer::POA_ptr poa)
-  : value_ (value),
-    poa_ (PortableServer::POA::_duplicate (poa))
-{
-}
-
-PortableServer::ServantRetentionPolicyValue
-TAO_Servant_Retention_Policy::value (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return this->value_;
-}
-
-CORBA::Policy_ptr
-TAO_Servant_Retention_Policy::copy (CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Servant_Retention_Policy *servant_retention_policy_copy = 0;
-  ACE_NEW_THROW_EX (servant_retention_policy_copy,
-                    TAO_Servant_Retention_Policy (*this),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Give ownership of the copy to the auto pointer.
-  auto_ptr<TAO_Servant_Retention_Policy> new_servant_retention_policy (servant_retention_policy_copy);
-
-  CORBA::Policy_var result = new_servant_retention_policy->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Give ownership of this servant to the POA.
-  new_servant_retention_policy->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Make sure that the auto_ptr does not delete the implementation
-  // object.
-  new_servant_retention_policy.release ();
-  return result._retn ();
-}
-
-void
-TAO_Servant_Retention_Policy::destroy (CORBA::Environment &ACE_TRY_ENV)
-{
-  //
-  // Remove self from POA.  Because of reference counting, the POA
-  // will automatically delete the servant when all pending requests
-  // on this servant are complete.
-  //
-
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-CORBA::PolicyType
-TAO_Servant_Retention_Policy::policy_type (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return PortableServer::SERVANT_RETENTION_POLICY_ID;
-}
-
-PortableServer::POA_ptr
-TAO_Servant_Retention_Policy::_default_POA (CORBA::Environment & /* ACE_TRY_ENV */)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-TAO_Request_Processing_Policy::TAO_Request_Processing_Policy (PortableServer::RequestProcessingPolicyValue value,
-                                                              PortableServer::POA_ptr poa)
-  : value_ (value),
-    poa_ (PortableServer::POA::_duplicate (poa))
-{
-}
-
-PortableServer::RequestProcessingPolicyValue
-TAO_Request_Processing_Policy::value (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return this->value_;
-}
-
-CORBA::Policy_ptr
-TAO_Request_Processing_Policy::copy (CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Request_Processing_Policy *request_processing_policy_copy = 0;
-  ACE_NEW_THROW_EX (request_processing_policy_copy,
-                    TAO_Request_Processing_Policy (*this),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Give ownership of the copy to the auto pointer.
-  auto_ptr<TAO_Request_Processing_Policy> new_request_processing_policy (request_processing_policy_copy);
-
-  CORBA::Policy_var result = new_request_processing_policy->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Give ownership of this servant to the POA.
-  new_request_processing_policy->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Make sure that the auto_ptr does not delete the implementation
-  // object.
-  new_request_processing_policy.release ();
-  return result._retn ();
-}
-
-void
-TAO_Request_Processing_Policy::destroy (CORBA::Environment &ACE_TRY_ENV)
-{
-  //
-  // Remove self from POA.  Because of reference counting, the POA
-  // will automatically delete the servant when all pending requests
-  // on this servant are complete.
-  //
-
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-CORBA::PolicyType
-TAO_Request_Processing_Policy::policy_type (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return PortableServer::REQUEST_PROCESSING_POLICY_ID;
-}
-
-PortableServer::POA_ptr
-TAO_Request_Processing_Policy::_default_POA (CORBA::Environment & /* ACE_TRY_ENV */)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-TAO_POA_Policies::TAO_POA_Policies (void)
-  :  thread_ (PortableServer::ORB_CTRL_MODEL),
-     lifespan_ (PortableServer::TRANSIENT),
-     id_uniqueness_ (PortableServer::UNIQUE_ID),
-     id_assignment_ (PortableServer::SYSTEM_ID),
-     implicit_activation_ (PortableServer::NO_IMPLICIT_ACTIVATION),
-     servant_retention_ (PortableServer::RETAIN),
-     request_processing_ (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY)
-{
-}
-
-void
-TAO_POA_Policies::parse_policies (const CORBA::PolicyList &policies,
-                                  CORBA::Environment &ACE_TRY_ENV)
-{
-  for (CORBA::ULong i = 0;
-       i < policies.length ();
-       i++)
-    {
-      this->parse_policy (policies[i],
-                          ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-
-  if (this->validity_check () == -1)
-    {
-      ACE_THROW (PortableServer::POA::InvalidPolicy ());
-    }
-}
-
-int
-TAO_POA_Policies::validity_check (void)
-{
-  // The NON_RETAIN policy requires either the USE_DEFAULT_SERVANT or
-  // USE_SERVANT_MANAGER policies.
-  if (this->servant_retention_ == PortableServer::NON_RETAIN)
-    if (this->request_processing_ != PortableServer::USE_SERVANT_MANAGER &&
-        this->request_processing_ != PortableServer::USE_DEFAULT_SERVANT)
-      return -1;
-
-  // USE_ACTIVE_OBJECT_MAP_ONLY requires the RETAIN policy.
-  if (this->request_processing_ == PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY)
-    if (this->servant_retention_ != PortableServer::RETAIN)
-      return -1;
-
-  // USE_DEFAULT_SERVANT requires the MULTIPLE_ID policy.
-  if (this->request_processing_ == PortableServer::USE_DEFAULT_SERVANT)
-    if (this->id_uniqueness_ != PortableServer::MULTIPLE_ID)
-      return -1;
-
-  // IMPLICIT_ACTIVATION requires the SYSTEM_ID and RETAIN policies.
-  if (this->implicit_activation_ == PortableServer::IMPLICIT_ACTIVATION)
-    if (this->servant_retention_ != PortableServer::RETAIN ||
-        this->id_assignment_ != PortableServer::SYSTEM_ID)
-      return -1;
-
-  return 0;
-}
-
-void
-TAO_POA_Policies::parse_policy (const CORBA::Policy_ptr policy,
-                                CORBA::Environment &ACE_TRY_ENV)
-{
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  PortableServer::ThreadPolicy_var thread
-    = PortableServer::ThreadPolicy::_narrow (policy,
-                                             ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (!CORBA::is_nil (thread.in ()))
-    {
-      this->thread_ = thread->value (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      return;
-    }
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  PortableServer::LifespanPolicy_var lifespan
-    = PortableServer::LifespanPolicy::_narrow (policy,
-                                               ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (!CORBA::is_nil (lifespan.in ()))
-    {
-      this->lifespan_ = lifespan->value (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      return;
-    }
-
-  PortableServer::IdUniquenessPolicy_var id_uniqueness
-    = PortableServer::IdUniquenessPolicy::_narrow (policy,
-                                                   ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (!CORBA::is_nil (id_uniqueness.in ()))
-    {
-      this->id_uniqueness_ = id_uniqueness->value (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      return;
-    }
-
-  PortableServer::IdAssignmentPolicy_var id_assignment
-    = PortableServer::IdAssignmentPolicy::_narrow (policy,
-                                                   ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (!CORBA::is_nil (id_assignment.in ()))
-    {
-      this->id_assignment_ = id_assignment->value (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      return;
-    }
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  PortableServer::ImplicitActivationPolicy_var implicit_activation
-    = PortableServer::ImplicitActivationPolicy::_narrow (policy,
-                                                         ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (!CORBA::is_nil (implicit_activation.in ()))
-    {
-      this->implicit_activation_ = implicit_activation->value (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      return;
-    }
-
-  PortableServer::ServantRetentionPolicy_var servant_retention
-    = PortableServer::ServantRetentionPolicy::_narrow (policy,
-                                                       ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (!CORBA::is_nil (servant_retention.in ()))
-    {
-      this->servant_retention_ = servant_retention->value (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      return;
-    }
-
-  PortableServer::RequestProcessingPolicy_var request_processing
-    = PortableServer::RequestProcessingPolicy::_narrow (policy,
-                                                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (!CORBA::is_nil (request_processing.in ()))
-    {
-      this->request_processing_ = request_processing->value (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      return;
-    }
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  ACE_THROW (PortableServer::POA::InvalidPolicy ());
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-TAO_Adapter_Activator::TAO_Adapter_Activator (PortableServer::POAManager_ptr poa_manager)
-  : poa_manager_ (PortableServer::POAManager::_duplicate (poa_manager))
-{
-}
-
-CORBA::Boolean
-TAO_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
-                                        const char *name,
-                                        CORBA::Environment &ACE_TRY_ENV)
-{
-  // Default policies
-  CORBA::PolicyList default_policies;
-
-  // This assumes that the lock on the parent is recursive
-  PortableServer::POA_var child = parent->create_POA (name,
-                                                      this->poa_manager_.in (),
-                                                      default_policies,
-                                                      ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  ACE_TRY
-    {
-      PortableServer::AdapterActivator_var activator = this->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      child->the_activator (activator.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      child->destroy (1,
-                      1,
-                      ACE_TRY_ENV);
-
-      return 0;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
-
-  // Finally everything is fine
-  return 1;
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Array<PortableServer::ObjectId>;
-template class ACE_Array_Base<PortableServer::ObjectId>;
-
-template class ACE_Auto_Basic_Ptr<TAO_Id_Assignment_Policy>;
-template class ACE_Auto_Basic_Ptr<TAO_Id_Uniqueness_Policy>;
-template class ACE_Auto_Basic_Ptr<TAO_Lifespan_Policy>;
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-template class ACE_Auto_Basic_Ptr<TAO_Thread_Policy>;
-template class ACE_Auto_Basic_Ptr<TAO_Implicit_Activation_Policy>;
-template class ACE_Auto_Basic_Ptr<TAO_Servant_Retention_Policy>;
-template class ACE_Auto_Basic_Ptr<TAO_Request_Processing_Policy>;
-
-template class ACE_Auto_Basic_Ptr<TAO_Forwarding_Servant>;
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-//template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map_Iterator_Impl>;
-template class ACE_Auto_Basic_Ptr<TAO_POA>;
-template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map>;
-template class ACE_Auto_Basic_Ptr<TAO_POA_Manager>;
-template class ACE_Lock_Adapter<ACE_Null_Mutex>;
-#if defined (ACE_HAS_THREADS)
-template class ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex>;
-template class ACE_Lock_Adapter<ACE_Thread_Mutex>;
-#endif /* ACE_HAS_THREADS */
-template class ACE_Map_Entry<TAO_Unbounded_Sequence<unsigned char>, TAO_ServantBase *>;
-template class ACE_Hash_Map_Entry<ACE_CString, TAO_POA *>;
-template class ACE_Hash<ACE_CString>;
-template class ACE_Equal_To<ACE_CString>;
-template class ACE_Hash_Map_Manager<ACE_CString, TAO_POA *, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator<ACE_CString, TAO_POA *, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_CString, TAO_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator<ACE_CString, TAO_POA *, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, TAO_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Write_Guard<ACE_Lock>;
-template class ACE_Read_Guard<ACE_Lock>;
-template class auto_ptr<TAO_Id_Assignment_Policy>;
-template class auto_ptr<TAO_Id_Uniqueness_Policy>;
-template class auto_ptr<TAO_Lifespan_Policy>;
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-template class auto_ptr<TAO_Thread_Policy>;
-template class auto_ptr<TAO_Implicit_Activation_Policy>;
-template class auto_ptr<TAO_Servant_Retention_Policy>;
-template class auto_ptr<TAO_Request_Processing_Policy>;
-
-template class auto_ptr<TAO_Forwarding_Servant>;
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-//template class auto_ptr<TAO_Active_Object_Map_Iterator_Impl>;
-template class auto_ptr<TAO_POA>;
-template class auto_ptr<TAO_Active_Object_Map>;
-template class auto_ptr<TAO_POA_Manager>;
-template class ACE_Node<TAO_POA *>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Array<PortableServer::ObjectId>
-#pragma instantiate ACE_Array_Base<PortableServer::ObjectId>
-
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Id_Assignment_Policy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Id_Uniqueness_Policy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Lifespan_Policy>
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Thread_Policy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Implicit_Activation_Policy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Servant_Retention_Policy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Request_Processing_Policy>
-
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Forwarding_Servant>
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-//#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map_Iterator_Impl>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_POA>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_POA_Manager>
-#pragma instantiate ACE_Lock_Adapter<ACE_Null_Mutex>
-#if defined (ACE_HAS_THREADS)
-#pragma instantiate ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex>
-#pragma instantiate ACE_Lock_Adapter<ACE_Thread_Mutex>
-#endif /* ACE_HAS_THREADS */
-#pragma instantiate ACE_Map_Entry<TAO_Unbounded_Sequence<unsigned char>, TAO_ServantBase *>
-#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, TAO_POA *>
-#pragma instantiate ACE_Hash<ACE_CString>
-#pragma instantiate ACE_Equal_To<ACE_CString>
-#pragma instantiate ACE_Hash_Map_Manager<ACE_CString, TAO_POA *, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString, TAO_POA *, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, TAO_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString, TAO_POA *, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, TAO_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Write_Guard<ACE_Lock>
-#pragma instantiate ACE_Read_Guard<ACE_Lock>
-#pragma instantiate auto_ptr<TAO_Id_Assignment_Policy>
-#pragma instantiate auto_ptr<TAO_Id_Uniqueness_Policy>
-#pragma instantiate auto_ptr<TAO_Lifespan_Policy>
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#pragma instantiate auto_ptr<TAO_Thread_Policy>
-#pragma instantiate auto_ptr<TAO_Implicit_Activation_Policy>
-#pragma instantiate auto_ptr<TAO_Servant_Retention_Policy>
-#pragma instantiate auto_ptr<TAO_Request_Processing_Policy>
-
-#pragma instantiate auto_ptr<TAO_Forwarding_Servant>
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-//#pragma instantiate auto_ptr<TAO_Active_Object_Map_Iterator_Impl>
-#pragma instantiate auto_ptr<TAO_POA>
-#pragma instantiate auto_ptr<TAO_Active_Object_Map>
-#pragma instantiate auto_ptr<TAO_POA_Manager>
-#pragma instantiate ACE_Node<TAO_POA *>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/POA.h b/TAO/tao/POA.h
deleted file mode 100644
index 5485576e0a3..00000000000
--- a/TAO/tao/POA.h
+++ /dev/null
@@ -1,763 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    POA.h
-//
-// = DESCRIPTION
-//     POA
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-// ============================================================================
-
-#ifndef TAO_POA_H
-#define TAO_POA_H
-
-// String
-#include "ace/SString.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// Map
-#include "ace/Hash_Map_Manager.h"
-
-// Vector
-#include "ace/Containers.h"
-
-// Locking
-#include "ace/Synch.h"
-
-// Object Adapter
-#include "tao/Object_Adapter.h"
-
-// Object_Key
-#include "tao/Object_KeyC.h"
-
-// POA Manager
-#include "tao/POAManager.h"
-
-// Object Adapter
-#include "tao/Object_Adapter.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined (_MSC_VER)
-# pragma warning (disable : 4250)
-#endif /* _MSC_VER */
-
-class TAO_POA;
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-class TAO_Export TAO_Thread_Policy : public virtual PortableServer::RefCountServantBase,
-                                     public virtual POA_PortableServer::ThreadPolicy
-{
-public:
-  TAO_Thread_Policy (PortableServer::ThreadPolicyValue value,
-                     PortableServer::POA_ptr poa);
-
-  PortableServer::ThreadPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-protected:
-  PortableServer::ThreadPolicyValue value_;
-
-  PortableServer::POA_var poa_;
-};
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-class TAO_Export TAO_Lifespan_Policy : public virtual PortableServer::RefCountServantBase,
-                                       public virtual POA_PortableServer::LifespanPolicy
-{
-public:
-  TAO_Lifespan_Policy (PortableServer::LifespanPolicyValue value,
-                       PortableServer::POA_ptr poa);
-
-  PortableServer::LifespanPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-protected:
-  PortableServer::LifespanPolicyValue value_;
-
-  PortableServer::POA_var poa_;
-};
-
-class TAO_Export TAO_Id_Uniqueness_Policy : public virtual PortableServer::RefCountServantBase,
-                                            public virtual POA_PortableServer::IdUniquenessPolicy
-{
-public:
-  TAO_Id_Uniqueness_Policy (PortableServer::IdUniquenessPolicyValue value,
-                            PortableServer::POA_ptr poa);
-
-  PortableServer::IdUniquenessPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-protected:
-  PortableServer::IdUniquenessPolicyValue value_;
-
-  PortableServer::POA_var poa_;
-};
-
-class TAO_Export TAO_Id_Assignment_Policy : public virtual PortableServer::RefCountServantBase,
-                                            public virtual POA_PortableServer::IdAssignmentPolicy
-{
-public:
-  TAO_Id_Assignment_Policy (PortableServer::IdAssignmentPolicyValue value,
-                            PortableServer::POA_ptr poa);
-
-  PortableServer::IdAssignmentPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-protected:
-  PortableServer::IdAssignmentPolicyValue value_;
-
-  PortableServer::POA_var poa_;
-};
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-class TAO_Export TAO_Implicit_Activation_Policy : public virtual PortableServer::RefCountServantBase,
-                                                  public virtual POA_PortableServer::ImplicitActivationPolicy
-{
-public:
-  TAO_Implicit_Activation_Policy (PortableServer::ImplicitActivationPolicyValue value,
-                                  PortableServer::POA_ptr poa);
-
-  PortableServer::ImplicitActivationPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-protected:
-  PortableServer::ImplicitActivationPolicyValue value_;
-
-  PortableServer::POA_var poa_;
-};
-
-class TAO_Export TAO_Servant_Retention_Policy : public virtual PortableServer::RefCountServantBase,
-                                                public virtual POA_PortableServer::ServantRetentionPolicy
-{
-public:
-  TAO_Servant_Retention_Policy (PortableServer::ServantRetentionPolicyValue value,
-                                PortableServer::POA_ptr poa);
-
-  PortableServer::ServantRetentionPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-protected:
-  PortableServer::ServantRetentionPolicyValue value_;
-
-  PortableServer::POA_var poa_;
-};
-
-class TAO_Export TAO_Request_Processing_Policy : public virtual PortableServer::RefCountServantBase,
-                                                 public virtual POA_PortableServer::RequestProcessingPolicy
-{
-public:
-  TAO_Request_Processing_Policy (PortableServer::RequestProcessingPolicyValue value,
-                                 PortableServer::POA_ptr poa);
-
-  PortableServer::RequestProcessingPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-protected:
-  PortableServer::RequestProcessingPolicyValue value_;
-
-  PortableServer::POA_var poa_;
-};
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-class TAO_Export TAO_POA_Policies
-{
-public:
-
-  TAO_POA_Policies (void);
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  PortableServer::ThreadPolicyValue thread (void) const;
-  void thread (PortableServer::ThreadPolicyValue value);
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  PortableServer::LifespanPolicyValue lifespan (void) const;
-  void lifespan (PortableServer::LifespanPolicyValue value);
-
-  PortableServer::IdUniquenessPolicyValue id_uniqueness (void) const;
-  void id_uniqueness (PortableServer::IdUniquenessPolicyValue value);
-
-  PortableServer::IdAssignmentPolicyValue id_assignment (void) const;
-  void id_assignment (PortableServer::IdAssignmentPolicyValue value);
-
-  PortableServer::ImplicitActivationPolicyValue implicit_activation (void) const;
-  void implicit_activation (PortableServer::ImplicitActivationPolicyValue value);
-
-  PortableServer::ServantRetentionPolicyValue servant_retention (void) const;
-  void servant_retention (PortableServer::ServantRetentionPolicyValue value);
-
-  PortableServer::RequestProcessingPolicyValue request_processing (void) const;
-  void request_processing (PortableServer::RequestProcessingPolicyValue value);
-
-  void parse_policies (const CORBA::PolicyList &policies,
-                       CORBA_Environment &ACE_TRY_ENV);
-
-protected:
-
-  void parse_policy (const CORBA::Policy_ptr policy,
-                     CORBA_Environment &ACE_TRY_ENV);
-
-  int validity_check (void);
-
-  PortableServer::ThreadPolicyValue thread_;
-
-  PortableServer::LifespanPolicyValue lifespan_;
-
-  PortableServer::IdUniquenessPolicyValue id_uniqueness_;
-
-  PortableServer::IdAssignmentPolicyValue id_assignment_;
-
-  PortableServer::ImplicitActivationPolicyValue implicit_activation_;
-
-  PortableServer::ServantRetentionPolicyValue servant_retention_;
-
-  PortableServer::RequestProcessingPolicyValue request_processing_;
-};
-
-class TAO_Temporary_Creation_Time;
-
-class TAO_Creation_Time
-{
-public:
-
-  TAO_Creation_Time (const ACE_Time_Value &creation_time);
-
-  TAO_Creation_Time (void);
-
-  void creation_time (const void *creation_time);
-
-  const void *creation_time (void) const;
-
-  static CORBA::ULong creation_time_length (void);
-
-  int operator== (const TAO_Creation_Time &rhs) const;
-
-  int operator!= (const TAO_Creation_Time &rhs) const;
-
-  int operator== (const TAO_Temporary_Creation_Time &rhs) const;
-
-  int operator!= (const TAO_Temporary_Creation_Time &rhs) const;
-
-protected:
-
-  enum
-  {
-    SEC_FIELD = 0,
-    USEC_FIELD = 1
-  };
-
-  // Timestamp
-  CORBA::ULong time_stamp_[2];
-
-};
-
-// Special creation time only useful in the lifetime of the upcall
-class TAO_Temporary_Creation_Time
-{
-public:
-
-  TAO_Temporary_Creation_Time (void);
-
-  void creation_time (const void *creation_time);
-
-  int operator== (const TAO_Creation_Time &rhs) const;
-
-  int operator!= (const TAO_Creation_Time &rhs) const;
-
-protected:
-
-  void *time_stamp_;
-};
-
-class TAO_Export TAO_POA : public POA_PortableServer::POA
-{
-public:
-
-  friend class TAO_Object_Adapter;
-  friend class TAO_Object_Adapter::Servant_Upcall;
-  friend class TAO_POA_Current_Impl;
-  friend class TAO_POA_Manager;
-
-  typedef ACE_CString String;
-
-  PortableServer::POA_ptr create_POA (const char *adapter_name,
-                                      PortableServer::POAManager_ptr poa_manager,
-                                      const CORBA::PolicyList &policies,
-                                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  PortableServer::POA_ptr find_POA (const char *adapter_name,
-                                    CORBA::Boolean activate_it,
-                                    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  void destroy (CORBA::Boolean etherealize_objects,
-                CORBA::Boolean wait_for_completion,
-                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value,
-                                                         CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value,
-                                                             CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value,
-                                                                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value,
-                                                                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value,
-                                                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value,
-                                                                              CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value,
-                                                                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  CORBA::String the_name (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  PortableServer::POA_ptr the_parent (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  PortableServer::POAManager_ptr the_POAManager (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  PortableServer::AdapterActivator_ptr the_activator (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  void the_activator (PortableServer::AdapterActivator_ptr adapter_activator,
-                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  PortableServer::ServantManager_ptr get_servant_manager (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  void set_servant_manager (PortableServer::ServantManager_ptr imgr,
-                            CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  PortableServer::Servant get_servant (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  void set_servant (PortableServer::Servant servant,
-                    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant,
-                                             CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  void activate_object_with_id (const PortableServer::ObjectId &id,
-                                PortableServer::Servant p_servant,
-                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  void deactivate_object (const PortableServer::ObjectId &oid,
-                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  CORBA::Object_ptr create_reference (const char *intf,
-                                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid,
-                                              const char *intf,
-                                              CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant,
-                                           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant,
-                                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference,
-                                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference,
-                                             CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid,
-                                         CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid,
-                                     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  void forward_object (const PortableServer::ObjectId &oid,
-                       CORBA::Object_ptr forward_to,
-                       CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  // Utility functions for the other
-  static void encode_sequence_to_string (CORBA::String &str,
-                                         const TAO_Unbounded_Sequence<CORBA::Octet> &seq);
-  static void decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq,
-                                         const char *str);
-
-  static char* ObjectId_to_string (const PortableServer::ObjectId &id);
-
-  static CORBA::WChar* ObjectId_to_wstring (const PortableServer::ObjectId &id);
-
-  static PortableServer::ObjectId *string_to_ObjectId (const char *id);
-
-  static PortableServer::ObjectId *string_to_ObjectId (const char *string,
-                                                       int size);
-
-  static PortableServer::ObjectId *wstring_to_ObjectId (const CORBA::WChar *id);
-
-  TAO_POA (const String &name,
-           TAO_POA_Manager &poa_manager,
-           const TAO_POA_Policies &policies,
-           TAO_POA *parent,
-           ACE_Lock &lock,
-           ACE_SYNCH_MUTEX &thread_lock,
-           TAO_ORB_Core &orb_core,
-           CORBA_Environment &ACE_TRY_ENV);
-
-  ~TAO_POA (void);
-
-  static char name_separator (void);
-
-  static CORBA::ULong name_separator_length (void);
-
-  enum
-  {
-    TAO_OBJECTKEY_PREFIX_SIZE = 4
-  };
-
-  static CORBA::Octet objectkey_prefix[TAO_OBJECTKEY_PREFIX_SIZE];
-
-  const TAO_Object_Adapter::poa_name &folded_name (void) const;
-
-  const TAO_Object_Adapter::poa_name &system_name (void) const;
-
-  static void check_for_valid_wait_for_completions (CORBA::Boolean wait_for_completion,
-                                                    CORBA::Environment &ACE_TRY_ENV);
-
-  TAO_ORB_Core &orb_core (void) const;
-  // ORB Core for POA.
-
-protected:
-
-  const ACE_CString &name (void) const;
-
-  PortableServer::POA_ptr create_POA_i (const char *adapter_name,
-                                        PortableServer::POAManager_ptr poa_manager,
-                                        const CORBA::PolicyList &policies,
-                                        CORBA_Environment &ACE_TRY_ENV);
-
-  TAO_POA *create_POA_i (const String &adapter_name,
-                         TAO_POA_Manager &poa_manager,
-                         const TAO_POA_Policies &policies,
-                         CORBA_Environment &ACE_TRY_ENV);
-
-  TAO_POA *find_POA_i (const ACE_CString &child_name,
-                       CORBA::Boolean activate_it,
-                       CORBA::Environment &ACE_TRY_ENV);
-
-  void destroy_i (CORBA::Boolean etherealize_objects,
-                  CORBA::Boolean wait_for_completion,
-                  CORBA_Environment &ACE_TRY_ENV);
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  PortableServer::ServantManager_ptr get_servant_manager_i (CORBA_Environment &ACE_TRY_ENV);
-
-  void set_servant_manager_i (PortableServer::ServantManager_ptr imgr,
-                              CORBA_Environment &ACE_TRY_ENV);
-
-  PortableServer::Servant get_servant_i (CORBA_Environment &ACE_TRY_ENV);
-
-  void set_servant_i (PortableServer::Servant servant,
-                      CORBA_Environment &ACE_TRY_ENV);
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  int is_servant_in_map (PortableServer::Servant servant);
-
-  int is_user_id_in_map (const PortableServer::ObjectId &user_id);
-
-  PortableServer::ObjectId *activate_object_i (PortableServer::Servant p_servant,
-                                               CORBA_Environment &ACE_TRY_ENV);
-
-  void activate_object_with_id_i (const PortableServer::ObjectId &id,
-                                  PortableServer::Servant p_servant,
-                                  CORBA_Environment &ACE_TRY_ENV);
-
-  void deactivate_all_objects_i (CORBA::Boolean etherealize_objects,
-                                 CORBA::Environment &ACE_TRY_ENV);
-
-  void deactivate_all_objects_i (CORBA::Boolean etherealize_objects,
-                                 CORBA::Boolean wait_for_completion,
-                                 CORBA::Environment &ACE_TRY_ENV);
-
-  void wait_for_completions (CORBA::Boolean wait_for_completion,
-                             CORBA::Environment &ACE_TRY_ENV);
-
-  void check_poa_manager_state (CORBA::Environment &ACE_TRY_ENV);
-
-  void deactivate_object_i (const PortableServer::ObjectId &oid,
-                            CORBA_Environment &ACE_TRY_ENV);
-
-  void cleanup_servant (TAO_Active_Object_Map::Map_Entry *active_object_map_entry,
-                        CORBA::Environment &ACE_TRY_ENV);
-
-  CORBA::Object_ptr create_reference_i (const char *intf,
-                                        CORBA_Environment &ACE_TRY_ENV);
-
-  CORBA::Object_ptr create_reference_with_id_i (const PortableServer::ObjectId &oid,
-                                                const char *intf,
-                                                CORBA_Environment &ACE_TRY_ENV);
-  PortableServer::ObjectId *servant_to_id_i (PortableServer::Servant servant,
-                                             CORBA_Environment &ACE_TRY_ENV);
-
-  PortableServer::ObjectId *servant_to_system_id (PortableServer::Servant p_servant,
-                                                  CORBA_Environment &ACE_TRY_ENV);
-
-  PortableServer::ObjectId *servant_to_system_id_i (PortableServer::Servant p_servant,
-                                                    CORBA_Environment &ACE_TRY_ENV);
-
-  PortableServer::Servant id_to_servant_i (const PortableServer::ObjectId &oid,
-                                           CORBA_Environment &ACE_TRY_ENV);
-
-  CORBA::Object_ptr id_to_reference_i (const PortableServer::ObjectId &oid,
-                                       CORBA_Environment &ACE_TRY_ENV);
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  void forward_object_i (const PortableServer::ObjectId &oid,
-                         CORBA::Object_ptr forward_to,
-                         CORBA_Environment &ACE_TRY_ENV);
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  ACE_Lock &lock (void);
-
-  TAO_POA_Policies &policies (void);
-
-  TAO_Active_Object_Map &active_object_map (void) const;
-
-  int delete_child (const String &child);
-
-  void set_folded_name (void);
-
-  TAO_ObjectKey *create_object_key (const PortableServer::ObjectId &id);
-
-  int is_poa_generated_id (const PortableServer::ObjectId &id);
-
-  static int parse_key (const TAO_ObjectKey &key,
-                        TAO_Object_Adapter::poa_name &poa_system_name,
-                        PortableServer::ObjectId &system_id,
-                        CORBA::Boolean &is_root,
-                        CORBA::Boolean &is_persistent,
-                        CORBA::Boolean &is_system_id,
-                        TAO_Temporary_Creation_Time &poa_creation_time);
-
-protected:
-  TAO_SERVANT_LOCATION locate_servant_i (const PortableServer::ObjectId &id,
-                                         PortableServer::Servant &servant,
-                                         CORBA_Environment &ACE_TRY_ENV);
-
-  PortableServer::Servant locate_servant_i (const char *operation,
-                                            const PortableServer::ObjectId &id,
-                                            TAO_Object_Adapter::Servant_Upcall &servant_upcall,
-                                            TAO_POA_Current_Impl &poa_current_impl,
-                                            CORBA_Environment &ACE_TRY_ENV);
-
-  const TAO_Creation_Time &creation_time (void);
-
-  CORBA::Boolean persistent (void);
-
-  char persistent_key_type (void);
-
-  static char persistent_key_char (void);
-
-  static char transient_key_char (void);
-
-  static CORBA::ULong persistent_key_type_length (void);
-
-  CORBA::Boolean system_id (void);
-
-  char system_id_key_type (void);
-
-  static char system_id_key_char (void);
-
-  static char user_id_key_char (void);
-
-  static CORBA::ULong system_id_key_type_length (void);
-
-  CORBA::Boolean root (void);
-
-  char root_key_type (void);
-
-  static char root_key_char (void);
-
-  static char non_root_key_char (void);
-
-  static CORBA::ULong root_key_type_length (void);
-
-  CORBA::ULong outstanding_requests (void) const;
-
-  void outstanding_requests (CORBA::ULong new_outstanding_requests);
-
-  CORBA::ULong increment_outstanding_requests (void);
-
-  CORBA::ULong decrement_outstanding_requests (void);
-
-  void establish_servant_lock (PortableServer::Servant servant);
-
-  void teardown_servant_lock (PortableServer::Servant servant);
-
-  String name_;
-
-  TAO_Object_Adapter::poa_name folded_name_;
-
-  TAO_Object_Adapter::poa_name_var system_name_;
-
-  TAO_POA_Manager &poa_manager_;
-
-  TAO_POA_Policies policies_;
-
-  TAO_POA *parent_;
-
-  TAO_Active_Object_Map *active_object_map_;
-
-  int delete_active_object_map_;
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  PortableServer::AdapterActivator_var adapter_activator_;
-
-  PortableServer::ServantActivator_var servant_activator_;
-
-  PortableServer::ServantLocator_var servant_locator_;
-
-  PortableServer::ServantBase_var default_servant_;
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  typedef ACE_Hash_Map_Manager<ACE_CString, TAO_POA *, ACE_Null_Mutex>
-  CHILDREN;
-
-  CHILDREN children_;
-
-  ACE_Lock &lock_;
-
-  int persistent_;
-
-  int system_id_;
-
-  TAO_Creation_Time creation_time_;
-
-  TAO_ORB_Core &orb_core_;
-
-  CORBA::Boolean cleanup_in_progress_;
-
-  CORBA::Boolean etherealize_objects_;
-
-  CORBA::ULong outstanding_requests_;
-
-  ACE_SYNCH_CONDITION outstanding_requests_condition_;
-
-  CORBA::Boolean wait_for_completion_pending_;
-
-  CORBA::Boolean waiting_destruction_;
-
-  ACE_SYNCH_CONDITION servant_deactivation_condition_;
-
-  CORBA::ULong waiting_servant_deactivation_;
-};
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-class TAO_Export TAO_Adapter_Activator : public POA_PortableServer::AdapterActivator
-{
-public:
-
-  TAO_Adapter_Activator (PortableServer::POAManager_ptr poa_manager);
-
-  CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent,
-                                  const char *name,
-                                  CORBA_Environment &ACE_TRY_ENV);
-
-protected:
-
-  PortableServer::POAManager_var poa_manager_;
-  // POA Manager
-};
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#if defined (__ACE_INLINE__)
-# include "tao/POA.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_POA_H */
diff --git a/TAO/tao/POA.i b/TAO/tao/POA.i
deleted file mode 100644
index ce527e6d073..00000000000
--- a/TAO/tao/POA.i
+++ /dev/null
@@ -1,649 +0,0 @@
-// $Id$
-
-// Exception macros
-#include "tao/poa_macros.h"
-#include "tao/Environment.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-ACE_INLINE PortableServer::ThreadPolicyValue
-TAO_POA_Policies::thread (void) const
-{
-  return this->thread_;
-}
-
-ACE_INLINE void
-TAO_POA_Policies::thread (PortableServer::ThreadPolicyValue value)
-{
-  this->thread_ = value;
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-ACE_INLINE PortableServer::LifespanPolicyValue
-TAO_POA_Policies::lifespan (void) const
-{
-  return this->lifespan_;
-}
-
-ACE_INLINE void
-TAO_POA_Policies::lifespan (PortableServer::LifespanPolicyValue value)
-{
-  this->lifespan_ = value;
-}
-
-ACE_INLINE PortableServer::IdUniquenessPolicyValue
-TAO_POA_Policies::id_uniqueness (void) const
-{
-  return this->id_uniqueness_;
-}
-
-ACE_INLINE void
-TAO_POA_Policies::id_uniqueness (PortableServer::IdUniquenessPolicyValue value)
-{
-  this->id_uniqueness_ = value;
-}
-
-ACE_INLINE PortableServer::IdAssignmentPolicyValue
-TAO_POA_Policies::id_assignment (void) const
-{
-  return this->id_assignment_;
-}
-
-ACE_INLINE void
-TAO_POA_Policies::id_assignment (PortableServer::IdAssignmentPolicyValue value)
-{
-  this->id_assignment_ = value;
-}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicyValue
-TAO_POA_Policies::implicit_activation (void) const
-{
-  return this->implicit_activation_;
-}
-
-ACE_INLINE void
-TAO_POA_Policies::implicit_activation (PortableServer::ImplicitActivationPolicyValue value)
-{
-  this->implicit_activation_ = value;
-}
-
-ACE_INLINE PortableServer::ServantRetentionPolicyValue
-TAO_POA_Policies::servant_retention (void) const
-{
-  return this->servant_retention_;
-}
-
-ACE_INLINE void
-TAO_POA_Policies::servant_retention (PortableServer::ServantRetentionPolicyValue value)
-{
-  this->servant_retention_ = value;
-}
-
-ACE_INLINE PortableServer::RequestProcessingPolicyValue
-TAO_POA_Policies::request_processing (void) const
-{
-  return this->request_processing_;
-}
-
-ACE_INLINE void
-TAO_POA_Policies::request_processing (PortableServer::RequestProcessingPolicyValue value)
-{
-  this->request_processing_ = value;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_Creation_Time::creation_time_length (void)
-{
-  return 2 * sizeof (CORBA::ULong);
-}
-
-ACE_INLINE
-TAO_Creation_Time::TAO_Creation_Time (const ACE_Time_Value &creation_time)
-{
-  this->time_stamp_[TAO_Creation_Time::SEC_FIELD]  = (CORBA::ULong) creation_time.sec ();
-  this->time_stamp_[TAO_Creation_Time::USEC_FIELD] = (CORBA::ULong) creation_time.usec ();
-}
-
-ACE_INLINE
-TAO_Creation_Time::TAO_Creation_Time (void)
-{
-  this->time_stamp_[TAO_Creation_Time::SEC_FIELD]  = 0;
-  this->time_stamp_[TAO_Creation_Time::USEC_FIELD] = 0;
-}
-
-ACE_INLINE void
-TAO_Creation_Time::creation_time (const void *creation_time)
-{
-  ACE_OS::memcpy (&this->time_stamp_,
-                  creation_time,
-                  TAO_Creation_Time::creation_time_length ());
-}
-
-ACE_INLINE const void *
-TAO_Creation_Time::creation_time (void) const
-{
-  return &this->time_stamp_;
-}
-
-ACE_INLINE int
-TAO_Creation_Time::operator== (const TAO_Creation_Time &rhs) const
-{
-#if defined (POA_NO_TIMESTAMP)
-  ACE_UNUSED_ARG (rhs);
-  return 1;
-#else
-  return ACE_OS::memcmp (&this->time_stamp_,
-                         &rhs.time_stamp_,
-                         TAO_Creation_Time::creation_time_length ()) == 0;
-#endif /* POA_NO_TIMESTAMP */
-}
-
-ACE_INLINE int
-TAO_Creation_Time::operator!= (const TAO_Creation_Time &rhs) const
-{
-#if defined (POA_NO_TIMESTAMP)
-  ACE_UNUSED_ARG (rhs);
-  return 0;
-#else
-  return ACE_OS::memcmp (&this->time_stamp_,
-                         &rhs.time_stamp_,
-                         TAO_Creation_Time::creation_time_length ()) != 0;
-#endif /* POA_NO_TIMESTAMP */
-}
-
-ACE_INLINE int
-TAO_Temporary_Creation_Time::operator== (const TAO_Creation_Time &rhs) const
-{
-#if defined (POA_NO_TIMESTAMP)
-  ACE_UNUSED_ARG (rhs);
-  return 1;
-#else
-  return ACE_OS::memcmp (this->time_stamp_,
-                         rhs.creation_time (),
-                         TAO_Creation_Time::creation_time_length ()) == 0;
-#endif /* POA_NO_TIMESTAMP */
-}
-
-ACE_INLINE int
-TAO_Temporary_Creation_Time::operator!= (const TAO_Creation_Time &rhs) const
-{
-#if defined (POA_NO_TIMESTAMP)
-  ACE_UNUSED_ARG (rhs);
-  return 0;
-#else
-  return ACE_OS::memcmp (this->time_stamp_,
-                         rhs.creation_time (),
-                         TAO_Creation_Time::creation_time_length ()) != 0;
-#endif /* POA_NO_TIMESTAMP */
-}
-
-ACE_INLINE int
-TAO_Creation_Time::operator== (const TAO_Temporary_Creation_Time &rhs) const
-{
-  return rhs == *this;
-}
-
-ACE_INLINE int
-TAO_Creation_Time::operator!= (const TAO_Temporary_Creation_Time &rhs) const
-{
-  return rhs != *this;
-}
-
-ACE_INLINE
-TAO_Temporary_Creation_Time::TAO_Temporary_Creation_Time (void)
-  : time_stamp_ (0)
-{
-}
-
-ACE_INLINE void
-TAO_Temporary_Creation_Time::creation_time (const void *creation_time)
-{
-  this->time_stamp_ = (void *) creation_time;
-}
-
-ACE_INLINE ACE_Lock &
-TAO_POA::lock (void)
-{
-  return this->lock_;
-}
-
-ACE_INLINE PortableServer::POA_ptr
-TAO_POA::create_POA (const char *adapter_name,
-                     PortableServer::POAManager_ptr poa_manager,
-                     const CORBA::PolicyList &policies,
-                     CORBA::Environment &ACE_TRY_ENV)
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
-
-  return this->create_POA_i (adapter_name,
-                             poa_manager,
-                             policies,
-                             ACE_TRY_ENV);
-}
-
-ACE_INLINE void
-TAO_POA::destroy (CORBA::Boolean etherealize_objects,
-                  CORBA::Boolean wait_for_completion,
-                  CORBA::Environment &ACE_TRY_ENV)
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
-
-  this->destroy_i (etherealize_objects,
-                   wait_for_completion,
-                   ACE_TRY_ENV);
-}
-
-ACE_INLINE TAO_POA_Policies &
-TAO_POA::policies (void)
-{
-  return this->policies_;
-}
-
-ACE_INLINE TAO_Active_Object_Map &
-TAO_POA::active_object_map (void) const
-{
-  return *this->active_object_map_;
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-ACE_INLINE PortableServer::ServantManager_ptr
-TAO_POA::get_servant_manager (CORBA::Environment &ACE_TRY_ENV)
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), PortableServer::ServantManager::_nil ());
-
-  return this->get_servant_manager_i (ACE_TRY_ENV);
-}
-
-ACE_INLINE void
-TAO_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
-
-  this->set_servant_manager_i (imgr,
-                               ACE_TRY_ENV);
-}
-
-ACE_INLINE PortableServer::Servant
-TAO_POA::get_servant (CORBA::Environment &ACE_TRY_ENV)
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
-
-  return this->get_servant_i (ACE_TRY_ENV);
-}
-
-ACE_INLINE void
-TAO_POA::set_servant (PortableServer::Servant servant,
-                      CORBA::Environment &ACE_TRY_ENV)
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
-
-  this->set_servant_i (servant,
-                       ACE_TRY_ENV);
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-ACE_INLINE PortableServer::ObjectId *
-TAO_POA::activate_object (PortableServer::Servant servant,
-                          CORBA::Environment &ACE_TRY_ENV)
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
-
-  return this->activate_object_i (servant,
-                                  ACE_TRY_ENV);
-}
-
-ACE_INLINE void
-TAO_POA::activate_object_with_id (const PortableServer::ObjectId &id,
-                                  PortableServer::Servant servant,
-                                  CORBA::Environment &ACE_TRY_ENV)
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
-
-  this->activate_object_with_id_i (id,
-                                   servant,
-                                   ACE_TRY_ENV);
-}
-
-ACE_INLINE void
-TAO_POA::deactivate_object (const PortableServer::ObjectId &oid,
-                            CORBA::Environment &ACE_TRY_ENV)
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
-
-  this->deactivate_object_i (oid,
-                             ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object_ptr
-TAO_POA::create_reference (const char *intf,
-                           CORBA::Environment &ACE_TRY_ENV)
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), CORBA::Object::_nil ());
-
-  return this->create_reference_i (intf,
-                                   ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object_ptr
-TAO_POA::create_reference_with_id (const PortableServer::ObjectId &id,
-                                   const char *intf,
-                                   CORBA::Environment &ACE_TRY_ENV)
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), CORBA::Object::_nil ());
-
-  return this->create_reference_with_id_i (id,
-                                           intf,
-                                           ACE_TRY_ENV);
-}
-
-ACE_INLINE PortableServer::ObjectId *
-TAO_POA::servant_to_id (PortableServer::Servant servant,
-                        CORBA::Environment &ACE_TRY_ENV)
-{
-  // If we had upgradeable locks, this would initially be a read lock
-  //
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
-
-  return this->servant_to_id_i (servant,
-                                ACE_TRY_ENV);
-}
-
-ACE_INLINE PortableServer::ObjectId *
-TAO_POA::servant_to_system_id (PortableServer::Servant servant,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
-
-  return this->servant_to_system_id_i (servant,
-                                       ACE_TRY_ENV);
-}
-
-ACE_INLINE PortableServer::Servant
-TAO_POA::id_to_servant (const PortableServer::ObjectId &oid,
-                        CORBA::Environment &ACE_TRY_ENV)
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
-
-  return this->id_to_servant_i (oid,
-                                ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object_ptr
-TAO_POA::id_to_reference (const PortableServer::ObjectId &oid,
-                          CORBA::Environment &ACE_TRY_ENV)
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0);
-
-  return this->id_to_reference_i (oid, ACE_TRY_ENV);
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-ACE_INLINE void
-TAO_POA::forward_object (const PortableServer::ObjectId &oid,
-                         CORBA::Object_ptr forward_to,
-                         CORBA::Environment &ACE_TRY_ENV)
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
-
-  this->forward_object_i (oid,
-                          forward_to,
-                          ACE_TRY_ENV);
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-ACE_INLINE PortableServer::POA_ptr
-TAO_POA::the_parent (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (this->parent_ != 0)
-    return this->parent_->_this (ACE_TRY_ENV);
-  else
-    return PortableServer::POA::_nil ();
-}
-
-ACE_INLINE PortableServer::POAManager_ptr
-TAO_POA::the_POAManager (CORBA::Environment &ACE_TRY_ENV)
-{
-  return this->poa_manager_._this (ACE_TRY_ENV);
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-ACE_INLINE PortableServer::AdapterActivator_ptr
-TAO_POA::the_activator (CORBA::Environment &ACE_TRY_ENV)
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), PortableServer::AdapterActivator::_nil ());
-
-  return PortableServer::AdapterActivator::_duplicate (this->adapter_activator_.in ());
-}
-
-ACE_INLINE void
-TAO_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator,
-                        CORBA::Environment &ACE_TRY_ENV)
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
-
-  this->adapter_activator_ = PortableServer::AdapterActivator::_duplicate (adapter_activator);
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-ACE_INLINE const TAO_Creation_Time &
-TAO_POA::creation_time (void)
-{
-  return this->creation_time_;
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_POA::system_id (void)
-{
-  return this->system_id_;
-}
-
-
-ACE_INLINE CORBA::Boolean
-TAO_POA::root (void)
-{
-  return this->parent_ == 0;
-}
-
-
-ACE_INLINE CORBA::Boolean
-TAO_POA::persistent (void)
-{
-  return this->persistent_;
-}
-
-ACE_INLINE const ACE_CString &
-TAO_POA::name (void) const
-{
-  return this->name_;
-}
-
-ACE_INLINE CORBA::String
-TAO_POA::the_name (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-
-  return CORBA::string_dup (this->name_.c_str ());
-}
-
-ACE_INLINE const TAO_Object_Adapter::poa_name &
-TAO_POA::folded_name (void) const
-{
-  return this->folded_name_;
-}
-
-ACE_INLINE const TAO_Object_Adapter::poa_name &
-TAO_POA::system_name (void) const
-{
-  return this->system_name_.in ();
-}
-
-ACE_INLINE char
-TAO_POA::name_separator (void)
-{
-  return '\0';
-}
-
-ACE_INLINE CORBA::ULong
-TAO_POA::name_separator_length (void)
-{
-  return sizeof (char);
-}
-
-ACE_INLINE char
-TAO_POA::persistent_key_char (void)
-{
-  return 'P';
-}
-
-ACE_INLINE char
-TAO_POA::transient_key_char (void)
-{
-  return 'T';
-}
-
-ACE_INLINE char
-TAO_POA::persistent_key_type (void)
-{
-  if (this->persistent ())
-    return TAO_POA::persistent_key_char ();
-  else
-    return TAO_POA::transient_key_char ();
-}
-
-ACE_INLINE CORBA::ULong
-TAO_POA::persistent_key_type_length (void)
-{
-  return sizeof (char);
-}
-
-ACE_INLINE char
-TAO_POA::system_id_key_char (void)
-{
-  return 'S';
-}
-
-ACE_INLINE char
-TAO_POA::user_id_key_char (void)
-{
-  return 'U';
-}
-
-ACE_INLINE char
-TAO_POA::system_id_key_type (void)
-{
-  if (this->system_id ())
-    return TAO_POA::system_id_key_char ();
-  else
-    return TAO_POA::user_id_key_char ();
-}
-
-ACE_INLINE CORBA::ULong
-TAO_POA::system_id_key_type_length (void)
-{
-  return sizeof (char);
-}
-
-ACE_INLINE char
-TAO_POA::root_key_char (void)
-{
-  return 'R';
-}
-
-ACE_INLINE char
-TAO_POA::non_root_key_char (void)
-{
-  return 'N';
-}
-
-ACE_INLINE char
-TAO_POA::root_key_type (void)
-{
-  if (this->root ())
-    return TAO_POA::root_key_char ();
-  else
-    return TAO_POA::non_root_key_char ();
-}
-
-ACE_INLINE CORBA::ULong
-TAO_POA::root_key_type_length (void)
-{
-  return sizeof (char);
-}
-
-ACE_INLINE CORBA::ULong
-TAO_POA::outstanding_requests (void) const
-{
-  return this->outstanding_requests_;
-}
-
-ACE_INLINE void
-TAO_POA::outstanding_requests (CORBA::ULong new_outstanding_requests)
-{
-  this->outstanding_requests_ = new_outstanding_requests;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_POA::increment_outstanding_requests (void)
-{
-  return ++this->outstanding_requests_;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_POA::decrement_outstanding_requests (void)
-{
-  return --this->outstanding_requests_;
-}
-
-ACE_INLINE void
-TAO_POA::establish_servant_lock (PortableServer::Servant servant)
-{
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-  if (this->policies ().thread () == PortableServer::SINGLE_THREAD_MODEL)
-    {
-      servant->_increment_single_threaded_poa_lock_count ();
-    }
-#endif /* TAO_HAS_MINIMUM_CORBA */
-}
-
-ACE_INLINE void
-TAO_POA::teardown_servant_lock (PortableServer::Servant servant)
-{
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-  if (this->policies ().thread () == PortableServer::SINGLE_THREAD_MODEL)
-    {
-      servant->_decrement_single_threaded_poa_lock_count ();
-    }
-#endif /* TAO_HAS_MINIMUM_CORBA */
-}
-
-ACE_INLINE TAO_ORB_Core &
-TAO_POA::orb_core (void) const
-{
-  return this->orb_core_;
-}
diff --git a/TAO/tao/POA.pidl b/TAO/tao/POA.pidl
deleted file mode 100644
index a02445c38db..00000000000
--- a/TAO/tao/POA.pidl
+++ /dev/null
@@ -1,412 +0,0 @@
-// $Id$
-
-// POA related IDL from "ORB Portability Joint Submission", orbos/97-04-14,
-//    Section 3.4
-//
-// Changes to IDL in that section:
-//   1.  Take out "..." in CORBA module which indicated "everything else
-//       in the CORBA module".
-//   2.  Add some definition from the full CORBA module which are needed
-//       for compiling the PortableServer module.
-//   3.  Add fake definitions of "native" since it does not yet exist
-//       in IDL. These fake definitions allow the rest of the module to
-//       compile as if "native" were indeed an IDL keyword.
-//   4.  Took out an extra semi-colon accidentally added during last
-//       editing pass
-// These changes (except removal of "...") are marked with beginning and
-//   ending comment lines containing "****change****".
-
-// IDL
-#pragma prefix "omg.org"
-
-// IDL
-module CORBA
-{
-  typedef string Identifier;
-  typedef string RepositoryId;
-
-  interface Current{};
-
-  // Basic Policy definition
-  typedef unsigned long PolicyType;
-
-  interface Policy
-    {
-      readonly attribute PolicyType policy_type;
-      Policy copy( );
-      void destroy( );
-    };
-
-  typedef sequence <Policy>  PolicyList;
-
-  // ....
-};
-
-module PortableServer
-{
-  // forward reference
-  interface POA;
-
-  native Servant;
-  typedef sequence<octet> ObjectId;
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-  exception ForwardRequest
-    {
-      Object forward_reference;
-    };
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  const CORBA::PolicyType THREAD_POLICY_ID = 16;
-  const CORBA::PolicyType LIFESPAN_POLICY_ID = 17;
-  const CORBA::PolicyType ID_UNIQUENESS_POLICY_ID = 18;
-  const CORBA::PolicyType ID_ASSIGNMENT_POLICY_ID = 19;
-  const CORBA::PolicyType IMPLICIT_ACTIVATION_POLICY_ID = 20;
-  const CORBA::PolicyType SERVANT_RETENTION_POLICY_ID = 21;
-  const CORBA::PolicyType REQUEST_PROCESSING_POLICY_ID = 22;
-
-  // **********************************************
-  //
-  // Policy interfaces
-  //
-  // **********************************************
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-  enum ThreadPolicyValue {
-    ORB_CTRL_MODEL,
-    SINGLE_THREAD_MODEL
-  };
-  interface ThreadPolicy : CORBA::Policy
-    {
-      readonly attribute ThreadPolicyValue value;
-    };
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  enum LifespanPolicyValue {
-    TRANSIENT,
-    PERSISTENT
-  };
-  interface LifespanPolicy : CORBA::Policy
-    {
-      readonly attribute LifespanPolicyValue value;
-    };
-
-  enum IdUniquenessPolicyValue {
-    UNIQUE_ID,
-    MULTIPLE_ID
-  };
-  interface IdUniquenessPolicy : CORBA::Policy
-    {
-      readonly attribute IdUniquenessPolicyValue value;
-    };
-
-  enum IdAssignmentPolicyValue {
-    USER_ID,
-    SYSTEM_ID
-  };
-  interface IdAssignmentPolicy : CORBA::Policy
-    {
-      readonly attribute IdAssignmentPolicyValue value;
-    };
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-  enum ImplicitActivationPolicyValue {
-    IMPLICIT_ACTIVATION,
-    NO_IMPLICIT_ACTIVATION
-  };
-  interface ImplicitActivationPolicy : CORBA::Policy
-    {
-      readonly attribute ImplicitActivationPolicyValue value;
-    };
-
-  enum ServantRetentionPolicyValue {
-    RETAIN,
-    NON_RETAIN
-  };
-  interface ServantRetentionPolicy : CORBA::Policy
-    {
-      readonly attribute ServantRetentionPolicyValue value;
-    };
-
-  enum RequestProcessingPolicyValue {
-    USE_ACTIVE_OBJECT_MAP_ONLY,
-    USE_DEFAULT_SERVANT,
-    USE_SERVANT_MANAGER
-  };
-  interface RequestProcessingPolicy : CORBA::Policy
-    {
-      readonly attribute RequestProcessingPolicyValue value;
-    };
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  // **************************************************
-  //
-  // POAManager interface
-  //
-  // **************************************************
-
-  interface POAManager
-    {
-      enum State
-      {
-        HOLDING,
-        ACTIVE,
-        DISCARDING,
-        INACTIVE
-      };
-      exception AdapterInactive{};
-
-      void activate()
-        raises(AdapterInactive);
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-      void hold_requests(in boolean wait_for_completion)
-        raises(AdapterInactive);
-      void discard_requests(in boolean wait_for_completion)
-        raises(AdapterInactive);
-      void deactivate(  in boolean etherealize_objects,
-                        in boolean wait_for_completion)
-        raises(AdapterInactive);
-#endif /* TAO_HAS_MINIMUM_CORBA */
-      State get_state ();
-    };
-
-  // **************************************************
-  //
-  // AdapterActivator interface
-  //
-  // **************************************************
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-  interface AdapterActivator
-    {
-      boolean unknown_adapter(in POA parent, in string name);
-    };
-
-  // **************************************************
-  //
-  // ServantManager interface
-  //
-  // **************************************************
-
-  interface ServantManager
-    { };
-
-  interface ServantActivator : ServantManager {
-    Servant incarnate (
-                       in ObjectId      oid,
-                       in POA   adapter )
-      raises (ForwardRequest);
-
-    void etherealize (
-                      in ObjectId       oid,
-                      in POA    adapter,
-                      in Servant        serv,
-                      in boolean        cleanup_in_progress,
-                      in boolean        remaining_activations );
-  };
-
-  interface ServantLocator : ServantManager {
-    native      Cookie;
-
-    Servant preinvoke(
-                      in ObjectId       oid,
-                      in POA    adapter,
-                      in CORBA::Identifier     operation,
-                      out Cookie        the_cookie )
-      raises (ForwardRequest);
-
-    void postinvoke(
-                    in ObjectId         oid,
-                    in POA      adapter,
-                    in CORBA::Identifier       operation,
-                    in Cookie   the_cookie,
-                    in Servant  the_servant     );
-  };
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-
-  // **************************************************
-  //
-  // POA interface
-  //
-  // **************************************************
-
-  interface POA
-    {
-      exception AdapterAlreadyExists {};
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-      exception AdapterInactive {};
-#endif /* TAO_HAS_MINIMUM_CORBA */
-      exception AdapterNonExistent {};
-      exception InvalidPolicy { unsigned short index; };
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-      exception NoServant {};
-#endif /* TAO_HAS_MINIMUM_CORBA */
-      exception ObjectAlreadyActive {};
-      exception ObjectNotActive {};
-      exception ServantAlreadyActive {};
-      exception ServantNotActive {};
-      exception WrongAdapter {};
-      exception WrongPolicy {};
-
-      //--------------------------------------------------
-      //
-      // POA creation and destruction
-      //
-      //--------------------------------------------------
-
-      POA create_POA(in string adapter_name,
-                     in POAManager a_POAManager,
-                     in CORBA::PolicyList policies)
-        raises (AdapterAlreadyExists, InvalidPolicy);
-
-      POA find_POA(in string adapter_name,  in boolean activate_it)
-        raises (AdapterNonExistent);
-
-      void destroy(     in boolean etherealize_objects,
-                        in boolean wait_for_completion);
-
-      // **************************************************
-      //
-      // Factories for Policy objects
-      //
-      // **************************************************
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-      ThreadPolicy
-        create_thread_policy(in ThreadPolicyValue value);
-#endif /* TAO_HAS_MINIMUM_CORBA */
-      LifespanPolicy
-        create_lifespan_policy(in LifespanPolicyValue value);
-      IdUniquenessPolicy
-        create_id_uniqueness_policy
-        (in IdUniquenessPolicyValue value);
-      IdAssignmentPolicy
-        create_id_assignment_policy
-        (in IdAssignmentPolicyValue value);
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-      ImplicitActivationPolicy
-        create_implicit_activation_policy
-        (in ImplicitActivationPolicyValue value);
-      ServantRetentionPolicy
-        create_servant_retention_policy
-        (in ServantRetentionPolicyValue value);
-      RequestProcessingPolicy
-        create_request_processing_policy
-        (in RequestProcessingPolicyValue value);
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-      //--------------------------------------------------
-      //
-      // POA attributes
-      //
-      //--------------------------------------------------
-
-      readonly attribute string the_name;
-      readonly attribute POA the_parent;
-      readonly attribute POAManager the_POAManager;
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-      attribute AdapterActivator the_activator;
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-
-      //--------------------------------------------------
-      //
-      // Servant Manager registration:
-      //
-      //--------------------------------------------------
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-      ServantManager get_servant_manager()
-        raises (WrongPolicy);
-
-      void set_servant_manager( in ServantManager imgr)
-        raises (WrongPolicy);
-
-      //--------------------------------------------------
-      //
-      // operations for the USE_DEFAULT_SERVANT policy
-      //
-      //--------------------------------------------------
-
-      Servant get_servant()
-        raises (NoServant, WrongPolicy);
-
-      void set_servant( in Servant p_servant)
-        raises (WrongPolicy);
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-      // **************************************************
-      //
-      // object activation and deactivation
-      //
-      // **************************************************
-
-      ObjectId activate_object( in Servant p_servant )
-        raises (ServantAlreadyActive, WrongPolicy);
-
-      void activate_object_with_id(
-                                   in ObjectId id,
-                                   in Servant p_servant)
-        raises (ServantAlreadyActive, ObjectAlreadyActive,
-                WrongPolicy);
-
-      void deactivate_object(in ObjectId oid)
-        raises (ObjectNotActive, WrongPolicy);
-
-      // **************************************************
-      //
-      // reference creation operations
-      //
-      // **************************************************
-
-      Object create_reference (
-                               in CORBA::RepositoryId intf )
-        raises (WrongPolicy);
-
-      Object create_reference_with_id (
-                                       in ObjectId oid,
-                                       in CORBA::RepositoryId intf )
-        raises (WrongPolicy);
-
-
-      //--------------------------------------------------
-      //
-      // Identity mapping operations:
-      //
-      //--------------------------------------------------
-
-      ObjectId servant_to_id(in Servant p_servant)
-        raises (ServantNotActive, WrongPolicy);
-
-      Object servant_to_reference(in Servant p_servant)
-        raises (ServantNotActive, WrongPolicy);
-
-      Servant reference_to_servant(in Object reference)
-        raises (ObjectNotActive, WrongAdapter, WrongPolicy);
-
-      ObjectId reference_to_id(in Object reference)
-        raises (WrongAdapter, WrongPolicy);
-
-      Servant id_to_servant(in ObjectId oid)
-        raises (ObjectNotActive, WrongPolicy);
-
-      Object id_to_reference(in ObjectId oid)
-        raises (ObjectNotActive, WrongPolicy);
-
-    };
-
-
-  // **************************************************
-  //
-  // Current interface
-  //
-  // **************************************************
-
-  interface Current : CORBA::Current
-    {
-      exception NoContext { };
-
-      POA get_POA() raises (NoContext);
-      ObjectId get_object_id() raises (NoContext);
-    };
-
-};
diff --git a/TAO/tao/POAC.cpp b/TAO/tao/POAC.cpp
deleted file mode 100644
index 277ac7d3f6f..00000000000
--- a/TAO/tao/POAC.cpp
+++ /dev/null
@@ -1,3371 +0,0 @@
-// $Id$
-//
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Take care: The typecodes are platform dependent, therefore
-// a ifdef is needed right now. This is going to be changed in
-// the future.
-
-#include "tao/POAC.h"
-#include "tao/POAS.h"
-#include "tao/POA.h"
-#include "tao/Typecode.h"
-#include "tao/Any.h"
-#include "tao/Invocation.h"
-#include "tao/Stub.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/POAC.i"
-#endif // !defined INLINE
-
-ACE_RCSID(tao, POAC, "$Id$")
-
-#if !defined (_PORTABLESERVER__TAO_SEQ_OCTET_CS_)
-#define _PORTABLESERVER__TAO_SEQ_OCTET_CS_
-
-static const CORBA::Long _oc_PortableServer__tao_seq_Octet[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  CORBA::tk_octet,
-
-  0,
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer__tao_seq_Octet
-(CORBA::tk_sequence, sizeof (_oc_PortableServer__tao_seq_Octet), (char *)
- &_oc_PortableServer__tao_seq_Octet, 0, sizeof (PortableServer::_tao_seq_Octet));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc__tao_seq_Octet, &_tc_TAO_tc_PortableServer__tao_seq_Octet)
-TAO_NAMESPACE_END
-
-#endif /* end #if !defined */
-
-static const CORBA::Long _oc_PortableServer_ObjectId[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f4f), ACE_NTOHL (0x626a6563), ACE_NTOHL (0x7449643a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableServer/ObjectId:1.0
-  9, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63744964), ACE_NTOHL (0x0),  // name = ObjectId
-  CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-
-  0,
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ObjectId (CORBA::tk_alias, sizeof
-                                                           (_oc_PortableServer_ObjectId),
-                                                           (char *) &_oc_PortableServer_ObjectId,
-                                                           0, sizeof (PortableServer::ObjectId));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ObjectId, &_tc_TAO_tc_PortableServer_ObjectId)
-TAO_NAMESPACE_END
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-// default constructor
-PortableServer::ForwardRequest::ForwardRequest (void)
-  : CORBA_UserException (PortableServer::_tc_ForwardRequest)
-{
-}
-
-// destructor - all members are of self managing types
-PortableServer::ForwardRequest::~ForwardRequest (void)
-{
-}
-
-// copy constructor
-PortableServer::ForwardRequest::ForwardRequest (const PortableServer::ForwardRequest &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-  this->forward_reference = CORBA::Object::_duplicate (_tao_excp.forward_reference.in ());
-}
-
-// assignment operator
-PortableServer::ForwardRequest&
-PortableServer::ForwardRequest::operator= (const PortableServer::ForwardRequest &_tao_excp)
-{
-  this->CORBA_UserException::operator= (_tao_excp);
-  this->forward_reference = CORBA::Object::_duplicate (_tao_excp.forward_reference.in ());
-  return *this;
-}
-
-PortableServer::ForwardRequest::ForwardRequest(
-                                               const CORBA::Object_ptr  _tao_forward_reference)
-  : CORBA_UserException  (PortableServer::_tc_ForwardRequest)
-{
-  this->forward_reference = CORBA::Object::_duplicate (_tao_forward_reference);
-}
-
-void PortableServer::ForwardRequest::_raise (void)
-{
-  TAO_RAISE(*this);
-}
-
-// narrow
-PortableServer::ForwardRequest_ptr
-PortableServer::ForwardRequest::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/ForwardRequest:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (PortableServer::ForwardRequest_ptr, exc);
-  else
-    return 0;
-}
-
-// = TAO extension
-CORBA::Exception *PortableServer::ForwardRequest::_alloc (void)
-{
-  return new PortableServer::ForwardRequest;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const PortableServer::ForwardRequest &_tao_elem) // copying
-{
-  PortableServer::ForwardRequest *_tao_any_val = new PortableServer::ForwardRequest (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::_tc_ForwardRequest, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, PortableServer::ForwardRequest *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::_tc_ForwardRequest, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::ForwardRequest *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (PortableServer::_tc_ForwardRequest, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableServer::ForwardRequest *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, PortableServer::ForwardRequest, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (PortableServer::_tc_ForwardRequest, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (PortableServer::_tc_ForwardRequest, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-static const CORBA::Long _oc_PortableServer_ForwardRequest[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  46, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f46), ACE_NTOHL (0x6f727761), ACE_NTOHL (0x72645265), ACE_NTOHL (0x71756573), ACE_NTOHL (0x743a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableServer/ForwardRequest:1.0
-  15, ACE_NTOHL (0x466f7277), ACE_NTOHL (0x61726452), ACE_NTOHL (0x65717565), ACE_NTOHL (0x73740000),  // name = ForwardRequest
-  1, // member count
-    18, ACE_NTOHL (0x666f7277), ACE_NTOHL (0x6172645f), ACE_NTOHL (0x72656665), ACE_NTOHL (0x72656e63), ACE_NTOHL (0x65000000),  // name = forward_reference
-    CORBA::tk_objref,
-52, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Object:1.0
-    7, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63740000),  // name = Object,
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ForwardRequest (CORBA::tk_except,
-                                                                 sizeof (_oc_PortableServer_ForwardRequest),
-                                                                 (char *) &_oc_PortableServer_ForwardRequest,
-                                                                 0,
-                                                                 sizeof (PortableServer::ForwardRequest));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ForwardRequest, &_tc_TAO_tc_PortableServer_ForwardRequest)
-TAO_NAMESPACE_END
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, THREAD_POLICY_ID, 16)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, LIFESPAN_POLICY_ID, 17)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, ID_UNIQUENESS_POLICY_ID, 18)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, ID_ASSIGNMENT_POLICY_ID, 19)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, IMPLICIT_ACTIVATION_POLICY_ID, 20)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, SERVANT_RETENTION_POLICY_ID, 21)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, REQUEST_PROCESSING_POLICY_ID, 22)
-TAO_NAMESPACE_END
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-static const CORBA::Long _oc_PortableServer_ThreadPolicyValue[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  49, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f54), ACE_NTOHL (0x68726561), ACE_NTOHL (0x64506f6c), ACE_NTOHL (0x69637956), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableServer/ThreadPolicyValue:1.0
-  18, ACE_NTOHL (0x54687265), ACE_NTOHL (0x6164506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65000000),  // name = ThreadPolicyValue
-  2, // member count
-    15, ACE_NTOHL (0x4f52425f), ACE_NTOHL (0x4354524c), ACE_NTOHL (0x5f4d4f44), ACE_NTOHL (0x454c0000),  // name = ORB_CTRL_MODEL
-    20, ACE_NTOHL (0x53494e47), ACE_NTOHL (0x4c455f54), ACE_NTOHL (0x48524541), ACE_NTOHL (0x445f4d4f), ACE_NTOHL (0x44454c00),  // name = SINGLE_THREAD_MODEL
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ThreadPolicyValue (CORBA::tk_enum,
-                                                                    sizeof (_oc_PortableServer_ThreadPolicyValue),
-                                                                    (char *) &_oc_PortableServer_ThreadPolicyValue,
-                                                                    0,
-                                                                    sizeof (PortableServer::ThreadPolicyValue));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ThreadPolicyValue, &_tc_TAO_tc_PortableServer_ThreadPolicyValue)
-TAO_NAMESPACE_END
-
-PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_duplicate (PortableServer::ThreadPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-
-  return obj;
-} // end of _duplicate
-
-PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_narrow (
-                                                                        CORBA::Object_ptr obj,
-                                                                        CORBA::Environment &ACE_TRY_ENV
-                                                                        )
-{
-  if (CORBA::is_nil (obj))
-    return PortableServer::ThreadPolicy::_nil ();
-  CORBA::Boolean check =
-    !obj->_is_a ("IDL:omg.org/PortableServer/ThreadPolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::ThreadPolicy::_nil ());
-  if (check)
-    return PortableServer::ThreadPolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/PortableServer/ThreadPolicy:1.0");
-#if defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-  else
-    ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::ThreadPolicy::_nil ());
-#else
-  if (servant == 0)
-    return new PortableServer::ThreadPolicy(stub);
-#endif /* TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-  return new POA_PortableServer::_tao_collocated_ThreadPolicy(
-      ACE_reinterpret_cast(POA_PortableServer::ThreadPolicy_ptr, servant),
-      stub
-    );
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-PortableServer::ThreadPolicyValue PortableServer::ThreadPolicy::value(CORBA::Environment &ACE_TRY_ENV)
-{
-    PortableServer::ThreadPolicyValue _tao_retval = (PortableServer::ThreadPolicyValue)0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""value",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (! (_tao_in >> _tao_retval))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-CORBA::Boolean PortableServer::ThreadPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
-{
-  if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ThreadPolicy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-    return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
-}
-
-const char* PortableServer::ThreadPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/ThreadPolicy:1.0";
-}
-
-static const CORBA::Long _oc_PortableServer_ThreadPolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  44, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f54), ACE_NTOHL (0x68726561), ACE_NTOHL (0x64506f6c), ACE_NTOHL (0x6963793a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableServer/ThreadPolicy:1.0
-  13, ACE_NTOHL (0x54687265), ACE_NTOHL (0x6164506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x0),  // name = ThreadPolicy,
-};
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ThreadPolicy (CORBA::tk_objref,
-                                                               sizeof (_oc_PortableServer_ThreadPolicy),
-                                                               (char *) &_oc_PortableServer_ThreadPolicy,
-                                                               0,
-                                                               sizeof (PortableServer::ThreadPolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ThreadPolicy, &_tc_TAO_tc_PortableServer_ThreadPolicy)
-TAO_NAMESPACE_END
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-static const CORBA::Long _oc_PortableServer_LifespanPolicyValue[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  51, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f4c), ACE_NTOHL (0x69666573), ACE_NTOHL (0x70616e50), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x7956616c), ACE_NTOHL (0x75653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/LifespanPolicyValue:1.0
-  20, ACE_NTOHL (0x4c696665), ACE_NTOHL (0x7370616e), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c756500),  // name = LifespanPolicyValue
-  2, // member count
-    10, ACE_NTOHL (0x5452414e), ACE_NTOHL (0x5349454e), ACE_NTOHL (0x54000000),  // name = TRANSIENT
-    11, ACE_NTOHL (0x50455253), ACE_NTOHL (0x49535445), ACE_NTOHL (0x4e540000),  // name = PERSISTENT
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_LifespanPolicyValue (CORBA::tk_enum,
-                                                                      sizeof (_oc_PortableServer_LifespanPolicyValue),
-                                                                      (char *) &_oc_PortableServer_LifespanPolicyValue,
-                                                                      0,
-                                                                      sizeof (PortableServer::LifespanPolicyValue));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_LifespanPolicyValue, &_tc_TAO_tc_PortableServer_LifespanPolicyValue)
-TAO_NAMESPACE_END
-
-PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_duplicate (PortableServer::LifespanPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-
-  return obj;
-} // end of _duplicate
-
-PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_narrow (
-                                                                            CORBA::Object_ptr obj,
-                                                                            CORBA::Environment &ACE_TRY_ENV
-                                                                            )
-{
-  if (CORBA::is_nil (obj))
-    return PortableServer::LifespanPolicy::_nil ();
-  CORBA::Boolean check =
-    !obj->_is_a ("IDL:omg.org/PortableServer/LifespanPolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::LifespanPolicy::_nil ());
-  if (check)
-    return PortableServer::LifespanPolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/PortableServer/LifespanPolicy:1.0");
-#if defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-  else
-    ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::LifespanPolicy::_nil ());
-#else
-  if (servant == 0)
-    return new PortableServer::LifespanPolicy(stub);
-#endif /* TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-  return new POA_PortableServer::_tao_collocated_LifespanPolicy(
-      ACE_reinterpret_cast(POA_PortableServer::LifespanPolicy_ptr, servant),
-      stub
-    );
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-PortableServer::LifespanPolicyValue PortableServer::LifespanPolicy::value(CORBA::Environment &ACE_TRY_ENV)
-{
-    PortableServer::LifespanPolicyValue _tao_retval = (PortableServer::LifespanPolicyValue)0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""value",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-CORBA::Boolean PortableServer::LifespanPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
-{
-  if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/LifespanPolicy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-    return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
-}
-
-const char* PortableServer::LifespanPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/LifespanPolicy:1.0";
-}
-
-static const CORBA::Long _oc_PortableServer_LifespanPolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  46, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f4c), ACE_NTOHL (0x69666573), ACE_NTOHL (0x70616e50), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableServer/LifespanPolicy:1.0
-  15, ACE_NTOHL (0x4c696665), ACE_NTOHL (0x7370616e), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63790000),  // name = LifespanPolicy,
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_LifespanPolicy (CORBA::tk_objref,
-                                                                 sizeof (_oc_PortableServer_LifespanPolicy),
-                                                                 (char *) &_oc_PortableServer_LifespanPolicy,
-                                                                 0,
-                                                                 sizeof (PortableServer::LifespanPolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_LifespanPolicy, &_tc_TAO_tc_PortableServer_LifespanPolicy)
-TAO_NAMESPACE_END
-
-
-static const CORBA::Long _oc_PortableServer_IdUniquenessPolicyValue[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  55, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x64556e69), ACE_NTOHL (0x7175656e), ACE_NTOHL (0x65737350), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x7956616c), ACE_NTOHL (0x75653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/IdUniquenessPolicyValue:1.0
-  24, ACE_NTOHL (0x4964556e), ACE_NTOHL (0x69717565), ACE_NTOHL (0x6e657373), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c756500),  // name = IdUniquenessPolicyValue
-  2, // member count
-    10, ACE_NTOHL (0x554e4951), ACE_NTOHL (0x55455f49), ACE_NTOHL (0x44000000),  // name = UNIQUE_ID
-    12, ACE_NTOHL (0x4d554c54), ACE_NTOHL (0x49504c45), ACE_NTOHL (0x5f494400),  // name = MULTIPLE_ID
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdUniquenessPolicyValue (CORBA::tk_enum,
-                                                                          sizeof (_oc_PortableServer_IdUniquenessPolicyValue),
-                                                                          (char *) &_oc_PortableServer_IdUniquenessPolicyValue,
-                                                                          0,
-                                                                          sizeof (PortableServer::IdUniquenessPolicyValue));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IdUniquenessPolicyValue, &_tc_TAO_tc_PortableServer_IdUniquenessPolicyValue)
-TAO_NAMESPACE_END
-
-PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_duplicate (PortableServer::IdUniquenessPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-
-  return obj;
-} // end of _duplicate
-
-PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_narrow (
-                                                                                    CORBA::Object_ptr obj,
-                                                                                    CORBA::Environment &ACE_TRY_ENV
-                                                                                    )
-{
-  if (CORBA::is_nil (obj))
-    return PortableServer::IdUniquenessPolicy::_nil ();
-  CORBA::Boolean check =
-    !obj->_is_a ("IDL:omg.org/PortableServer/IdUniquenessPolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::IdUniquenessPolicy::_nil ());
-  if (check)
-    return PortableServer::IdUniquenessPolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/PortableServer/IdUniquenessPolicy:1.0");
-#if defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-  else
-    ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::IdUniquenessPolicy::_nil ());
-#else
-  if (servant == 0)
-    return new PortableServer::IdUniquenessPolicy(stub);
-#endif /* TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-  return new POA_PortableServer::_tao_collocated_IdUniquenessPolicy(
-      ACE_reinterpret_cast(POA_PortableServer::IdUniquenessPolicy_ptr, servant),
-      stub
-    );
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-PortableServer::IdUniquenessPolicyValue PortableServer::IdUniquenessPolicy::value(CORBA::Environment &ACE_TRY_ENV)
-{
-    PortableServer::IdUniquenessPolicyValue _tao_retval = (PortableServer::IdUniquenessPolicyValue)0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""value",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-CORBA::Boolean PortableServer::IdUniquenessPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
-{
-  if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/IdUniquenessPolicy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-    return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
-}
-
-const char* PortableServer::IdUniquenessPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/IdUniquenessPolicy:1.0";
-}
-
-static const CORBA::Long _oc_PortableServer_IdUniquenessPolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  50, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x64556e69), ACE_NTOHL (0x7175656e), ACE_NTOHL (0x65737350), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableServer/IdUniquenessPolicy:1.0
-  19, ACE_NTOHL (0x4964556e), ACE_NTOHL (0x69717565), ACE_NTOHL (0x6e657373), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63790000),  // name = IdUniquenessPolicy,
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdUniquenessPolicy (CORBA::tk_objref,
-                                                                     sizeof (_oc_PortableServer_IdUniquenessPolicy),
-                                                                     (char *) &_oc_PortableServer_IdUniquenessPolicy,
-                                                                     0,
-                                                                     sizeof (PortableServer::IdUniquenessPolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IdUniquenessPolicy, &_tc_TAO_tc_PortableServer_IdUniquenessPolicy)
-TAO_NAMESPACE_END
-
-static const CORBA::Long _oc_PortableServer_IdAssignmentPolicyValue[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  55, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x64417373), ACE_NTOHL (0x69676e6d), ACE_NTOHL (0x656e7450), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x7956616c), ACE_NTOHL (0x75653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/IdAssignmentPolicyValue:1.0
-  24, ACE_NTOHL (0x49644173), ACE_NTOHL (0x7369676e), ACE_NTOHL (0x6d656e74), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c756500),  // name = IdAssignmentPolicyValue
-  2, // member count
-    8, ACE_NTOHL (0x55534552), ACE_NTOHL (0x5f494400),  // name = USER_ID
-    10, ACE_NTOHL (0x53595354), ACE_NTOHL (0x454d5f49), ACE_NTOHL (0x44000000),  // name = SYSTEM_ID
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdAssignmentPolicyValue (CORBA::tk_enum,
-                                                                          sizeof (_oc_PortableServer_IdAssignmentPolicyValue),
-                                                                          (char *) &_oc_PortableServer_IdAssignmentPolicyValue,
-                                                                          0,
-                                                                          sizeof (PortableServer::IdAssignmentPolicyValue));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IdAssignmentPolicyValue, &_tc_TAO_tc_PortableServer_IdAssignmentPolicyValue)
-TAO_NAMESPACE_END
-
-PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_duplicate (PortableServer::IdAssignmentPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-
-  return obj;
-} // end of _duplicate
-
-PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_narrow (
-                                                                                    CORBA::Object_ptr obj,
-                                                                                    CORBA::Environment &ACE_TRY_ENV
-                                                                                    )
-{
-  if (CORBA::is_nil (obj))
-    return PortableServer::IdAssignmentPolicy::_nil ();
-  CORBA::Boolean check =
-    !obj->_is_a ("IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::IdAssignmentPolicy::_nil ());
-  if (check)
-    return PortableServer::IdAssignmentPolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0");
-#if defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-  else
-    ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::IdAssignmentPolicy::_nil ());
-#else
-  if (servant == 0)
-    return new PortableServer::IdAssignmentPolicy(stub);
-#endif /* TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-  return new POA_PortableServer::_tao_collocated_IdAssignmentPolicy(
-      ACE_reinterpret_cast(POA_PortableServer::IdAssignmentPolicy_ptr, servant),
-      stub
-    );
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-PortableServer::IdAssignmentPolicyValue PortableServer::IdAssignmentPolicy::value(CORBA::Environment &ACE_TRY_ENV)
-{
-    PortableServer::IdAssignmentPolicyValue _tao_retval = (PortableServer::IdAssignmentPolicyValue)0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""value",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-CORBA::Boolean PortableServer::IdAssignmentPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
-{
-  if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-    return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
-}
-
-const char* PortableServer::IdAssignmentPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0";
-}
-
-static const CORBA::Long _oc_PortableServer_IdAssignmentPolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  50, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x64417373), ACE_NTOHL (0x69676e6d), ACE_NTOHL (0x656e7450), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0
-  19, ACE_NTOHL (0x49644173), ACE_NTOHL (0x7369676e), ACE_NTOHL (0x6d656e74), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63790000),  // name = IdAssignmentPolicy,
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdAssignmentPolicy (CORBA::tk_objref,
-                                                                     sizeof (_oc_PortableServer_IdAssignmentPolicy),
-                                                                     (char *) &_oc_PortableServer_IdAssignmentPolicy,
-                                                                     0,
-                                                                     sizeof (PortableServer::IdAssignmentPolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IdAssignmentPolicy, &_tc_TAO_tc_PortableServer_IdAssignmentPolicy)
-TAO_NAMESPACE_END
-
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicyValue[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  61, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x6d706c69), ACE_NTOHL (0x63697441), ACE_NTOHL (0x63746976), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e506f6c), ACE_NTOHL (0x69637956), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableServer/ImplicitActivationPolicyValue:1.0
-  30, ACE_NTOHL (0x496d706c), ACE_NTOHL (0x69636974), ACE_NTOHL (0x41637469), ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65000000),  // name = ImplicitActivationPolicyValue
-  2, // member count
-    20, ACE_NTOHL (0x494d504c), ACE_NTOHL (0x49434954), ACE_NTOHL (0x5f414354), ACE_NTOHL (0x49564154), ACE_NTOHL (0x494f4e00),  // name = IMPLICIT_ACTIVATION
-    23, ACE_NTOHL (0x4e4f5f49), ACE_NTOHL (0x4d504c49), ACE_NTOHL (0x4349545f), ACE_NTOHL (0x41435449), ACE_NTOHL (0x56415449), ACE_NTOHL (0x4f4e0000),  // name = NO_IMPLICIT_ACTIVATION
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ImplicitActivationPolicyValue (CORBA::tk_enum,
-                                                                                sizeof (_oc_PortableServer_ImplicitActivationPolicyValue),
-                                                                                (char *) &_oc_PortableServer_ImplicitActivationPolicyValue,
-                                                                                0,
-                                                                                sizeof (PortableServer::ImplicitActivationPolicyValue));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ImplicitActivationPolicyValue, &_tc_TAO_tc_PortableServer_ImplicitActivationPolicyValue)
-TAO_NAMESPACE_END
-
-PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationPolicy::_duplicate (PortableServer::ImplicitActivationPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-
-  return obj;
-} // end of _duplicate
-
-PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationPolicy::_narrow (
-                                                                                                CORBA::Object_ptr obj,
-                                                                                                CORBA::Environment &ACE_TRY_ENV
-                                                                                                )
-{
-  if (CORBA::is_nil (obj))
-    return PortableServer::ImplicitActivationPolicy::_nil ();
-  CORBA::Boolean check =
-    !obj->_is_a ("IDL:omg.org/PortableServer/ImplicitActivationPolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::ImplicitActivationPolicy::_nil ());
-  if (check)
-    return PortableServer::ImplicitActivationPolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/PortableServer/ImplicitActivationPolicy:1.0");
-#if defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-  else
-    ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::ImplicitActivationPolicy::_nil ());
-#else
-  if (servant == 0)
-    return new PortableServer::ImplicitActivationPolicy(stub);
-#endif /* TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-  return new POA_PortableServer::_tao_collocated_ImplicitActivationPolicy(
-      ACE_reinterpret_cast(POA_PortableServer::ImplicitActivationPolicy_ptr, servant),
-      stub
-    );
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-PortableServer::ImplicitActivationPolicyValue PortableServer::ImplicitActivationPolicy::value(CORBA::Environment &ACE_TRY_ENV)
-{
-    PortableServer::ImplicitActivationPolicyValue _tao_retval = (PortableServer::ImplicitActivationPolicyValue)0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""value",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-CORBA::Boolean PortableServer::ImplicitActivationPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
-{
-  if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ImplicitActivationPolicy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-    return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
-}
-
-const char* PortableServer::ImplicitActivationPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/ImplicitActivationPolicy:1.0";
-}
-
-static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  56, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x6d706c69), ACE_NTOHL (0x63697441), ACE_NTOHL (0x63746976), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e506f6c), ACE_NTOHL (0x6963793a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableServer/ImplicitActivationPolicy:1.0
-  25, ACE_NTOHL (0x496d706c), ACE_NTOHL (0x69636974), ACE_NTOHL (0x41637469), ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x0),  // name = ImplicitActivationPolicy,
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ImplicitActivationPolicy (CORBA::tk_objref,
-                                                                           sizeof (_oc_PortableServer_ImplicitActivationPolicy),
-                                                                           (char *) &_oc_PortableServer_ImplicitActivationPolicy,
-                                                                           0,
-                                                                           sizeof (PortableServer::ImplicitActivationPolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ImplicitActivationPolicy, &_tc_TAO_tc_PortableServer_ImplicitActivationPolicy)
-TAO_NAMESPACE_END
-
-
-static const CORBA::Long _oc_PortableServer_ServantRetentionPolicyValue[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  59, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e745265), ACE_NTOHL (0x74656e74), ACE_NTOHL (0x696f6e50), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x7956616c), ACE_NTOHL (0x75653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/ServantRetentionPolicyValue:1.0
-  28, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e7452), ACE_NTOHL (0x6574656e), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c756500),  // name = ServantRetentionPolicyValue
-  2, // member count
-    7, ACE_NTOHL (0x52455441), ACE_NTOHL (0x494e0000),  // name = RETAIN
-    11, ACE_NTOHL (0x4e4f4e5f), ACE_NTOHL (0x52455441), ACE_NTOHL (0x494e0000),  // name = NON_RETAIN
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantRetentionPolicyValue (CORBA::tk_enum,
-                                                                              sizeof (_oc_PortableServer_ServantRetentionPolicyValue),
-                                                                              (char *) &_oc_PortableServer_ServantRetentionPolicyValue,
-                                                                              0,
-                                                                              sizeof (PortableServer::ServantRetentionPolicyValue));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServantRetentionPolicyValue, &_tc_TAO_tc_PortableServer_ServantRetentionPolicyValue)
-TAO_NAMESPACE_END
-
-PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolicy::_duplicate (PortableServer::ServantRetentionPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-
-  return obj;
-} // end of _duplicate
-
-PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolicy::_narrow (
-                                                                                            CORBA::Object_ptr obj,
-                                                                                            CORBA::Environment &ACE_TRY_ENV
-                                                                                            )
-{
-  if (CORBA::is_nil (obj))
-    return PortableServer::ServantRetentionPolicy::_nil ();
-  CORBA::Boolean check =
-    !obj->_is_a ("IDL:omg.org/PortableServer/ServantRetentionPolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::ServantRetentionPolicy::_nil ());
-  if (check)
-    return PortableServer::ServantRetentionPolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/PortableServer/ServantRetentionPolicy:1.0");
-#if defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-  else
-    ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::ServantRetentionPolicy::_nil ());
-#else
-  if (servant == 0)
-    return new PortableServer::ServantRetentionPolicy(stub);
-#endif /* TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-  return new POA_PortableServer::_tao_collocated_ServantRetentionPolicy(
-      ACE_reinterpret_cast(POA_PortableServer::ServantRetentionPolicy_ptr, servant),
-      stub
-    );
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-PortableServer::ServantRetentionPolicyValue PortableServer::ServantRetentionPolicy::value(CORBA::Environment &ACE_TRY_ENV)
-{
-    PortableServer::ServantRetentionPolicyValue _tao_retval = (PortableServer::ServantRetentionPolicyValue)0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""value",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-CORBA::Boolean PortableServer::ServantRetentionPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
-{
-  if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ServantRetentionPolicy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-    return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
-}
-
-const char* PortableServer::ServantRetentionPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/ServantRetentionPolicy:1.0";
-}
-
-static const CORBA::Long _oc_PortableServer_ServantRetentionPolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  54, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e745265), ACE_NTOHL (0x74656e74), ACE_NTOHL (0x696f6e50), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableServer/ServantRetentionPolicy:1.0
-  23, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e7452), ACE_NTOHL (0x6574656e), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63790000),  // name = ServantRetentionPolicy,
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantRetentionPolicy (CORBA::tk_objref,
-                                                                         sizeof (_oc_PortableServer_ServantRetentionPolicy),
-                                                                         (char *) &_oc_PortableServer_ServantRetentionPolicy,
-                                                                         0,
-                                                                         sizeof (PortableServer::ServantRetentionPolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServantRetentionPolicy, &_tc_TAO_tc_PortableServer_ServantRetentionPolicy)
-TAO_NAMESPACE_END
-
-static const CORBA::Long _oc_PortableServer_RequestProcessingPolicyValue[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  60, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f52), ACE_NTOHL (0x65717565), ACE_NTOHL (0x73745072), ACE_NTOHL (0x6f636573), ACE_NTOHL (0x73696e67), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c75653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableServer/RequestProcessingPolicyValue:1.0
-  29, ACE_NTOHL (0x52657175), ACE_NTOHL (0x65737450), ACE_NTOHL (0x726f6365), ACE_NTOHL (0x7373696e), ACE_NTOHL (0x67506f6c), ACE_NTOHL (0x69637956), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x0),  // name = RequestProcessingPolicyValue
-  3, // member count
-    27, ACE_NTOHL (0x5553455f), ACE_NTOHL (0x41435449), ACE_NTOHL (0x56455f4f), ACE_NTOHL (0x424a4543), ACE_NTOHL (0x545f4d41), ACE_NTOHL (0x505f4f4e), ACE_NTOHL (0x4c590000),  // name = USE_ACTIVE_OBJECT_MAP_ONLY
-    20, ACE_NTOHL (0x5553455f), ACE_NTOHL (0x44454641), ACE_NTOHL (0x554c545f), ACE_NTOHL (0x53455256), ACE_NTOHL (0x414e5400),  // name = USE_DEFAULT_SERVANT
-    20, ACE_NTOHL (0x5553455f), ACE_NTOHL (0x53455256), ACE_NTOHL (0x414e545f), ACE_NTOHL (0x4d414e41), ACE_NTOHL (0x47455200),  // name = USE_SERVANT_MANAGER
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_RequestProcessingPolicyValue (CORBA::tk_enum,
-                                                                               sizeof (_oc_PortableServer_RequestProcessingPolicyValue),
-                                                                               (char *) &_oc_PortableServer_RequestProcessingPolicyValue,
-                                                                               0,
-                                                                               sizeof (PortableServer::RequestProcessingPolicyValue));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RequestProcessingPolicyValue, &_tc_TAO_tc_PortableServer_RequestProcessingPolicyValue)
-TAO_NAMESPACE_END
-
-PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPolicy::_duplicate (PortableServer::RequestProcessingPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-
-  return obj;
-} // end of _duplicate
-
-PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPolicy::_narrow (
-                                                                                              CORBA::Object_ptr obj,
-                                                                                              CORBA::Environment &ACE_TRY_ENV
-                                                                                              )
-{
-  if (CORBA::is_nil (obj))
-    return PortableServer::RequestProcessingPolicy::_nil ();
-  CORBA::Boolean check =
-    !obj->_is_a ("IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::RequestProcessingPolicy::_nil ());
-  if (check)
-    return PortableServer::RequestProcessingPolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0");
-#if defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-  else
-    ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::RequestProcessingPolicy::_nil ());
-#else
-  if (servant == 0)
-    return new PortableServer::RequestProcessingPolicy(stub);
-#endif /* TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-  return new POA_PortableServer::_tao_collocated_RequestProcessingPolicy(
-      ACE_reinterpret_cast(POA_PortableServer::RequestProcessingPolicy_ptr, servant),
-      stub
-    );
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-PortableServer::RequestProcessingPolicyValue PortableServer::RequestProcessingPolicy::value(CORBA::Environment &ACE_TRY_ENV)
-{
-    PortableServer::RequestProcessingPolicyValue _tao_retval = (PortableServer::RequestProcessingPolicyValue)0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""value",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-CORBA::Boolean PortableServer::RequestProcessingPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
-{
-  if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-    return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
-}
-
-const char* PortableServer::RequestProcessingPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0";
-}
-
-static const CORBA::Long _oc_PortableServer_RequestProcessingPolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  55, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f52), ACE_NTOHL (0x65717565), ACE_NTOHL (0x73745072), ACE_NTOHL (0x6f636573), ACE_NTOHL (0x73696e67), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63793a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0
-  24, ACE_NTOHL (0x52657175), ACE_NTOHL (0x65737450), ACE_NTOHL (0x726f6365), ACE_NTOHL (0x7373696e), ACE_NTOHL (0x67506f6c), ACE_NTOHL (0x69637900),  // name = RequestProcessingPolicy,
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_RequestProcessingPolicy (CORBA::tk_objref,
-                                                                          sizeof (_oc_PortableServer_RequestProcessingPolicy),
-                                                                          (char *) &_oc_PortableServer_RequestProcessingPolicy,
-                                                                          0,
-                                                                          sizeof (PortableServer::RequestProcessingPolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RequestProcessingPolicy, &_tc_TAO_tc_PortableServer_RequestProcessingPolicy)
-TAO_NAMESPACE_END
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-PortableServer::POAManager_ptr PortableServer::POAManager::_duplicate (PortableServer::POAManager_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-
-  return obj;
-} // end of _duplicate
-
-PortableServer::POAManager_ptr PortableServer::POAManager::_narrow (
-                                                                    CORBA::Object_ptr obj,
-                                                                    CORBA::Environment &ACE_TRY_ENV
-                                                                    )
-{
-  if (CORBA::is_nil (obj))
-    return PortableServer::POAManager::_nil ();
-  CORBA::Boolean check =
-    !obj->_is_a ("IDL:omg.org/PortableServer/POAManager:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::POAManager::_nil ());
-  if (check)
-    return PortableServer::POAManager::_nil ();
-  if (!obj->_is_collocated () || !obj->_servant())
-      // This can only be colocated
-      ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::POAManager::_nil ());
-
-  TAO_Stub *stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = obj->_servant ()->_downcast ("IDL:omg.org/PortableServer/POAManager:1.0");
-  return new POA_PortableServer::_tao_collocated_POAManager(
-                                                            ACE_reinterpret_cast(POA_PortableServer::POAManager_ptr, servant),
-                                                            stub
-                                                            );
-}
-
-// default constructor
-PortableServer::POAManager::AdapterInactive::AdapterInactive (void)
-  : CORBA_UserException (PortableServer::POAManager::_tc_AdapterInactive)
-{
-}
-
-// destructor - all members are of self managing types
-PortableServer::POAManager::AdapterInactive::~AdapterInactive (void)
-{
-}
-
-// copy constructor
-PortableServer::POAManager::AdapterInactive::AdapterInactive (const PortableServer::POAManager::AdapterInactive &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-}
-
-// assignment operator
-PortableServer::POAManager::AdapterInactive&
-PortableServer::POAManager::AdapterInactive::operator= (const PortableServer::POAManager::AdapterInactive &_tao_excp)
-{
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-void PortableServer::POAManager::AdapterInactive::_raise (void)
-{
-  TAO_RAISE(*this);
-}
-
-// narrow
-PortableServer::POAManager::AdapterInactive_ptr
-PortableServer::POAManager::AdapterInactive::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POAManager/AdapterInactive:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (PortableServer::POAManager::AdapterInactive_ptr, exc);
-  else
-    return 0;
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *PortableServer::POAManager::AdapterInactive::_alloc (void)
-{
-  return new PortableServer::POAManager::AdapterInactive;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const PortableServer::POAManager::AdapterInactive &_tao_elem) // copying
-{
-  PortableServer::POAManager::AdapterInactive *_tao_any_val = new PortableServer::POAManager::AdapterInactive (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POAManager::_tc_AdapterInactive, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, PortableServer::POAManager::AdapterInactive *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POAManager::_tc_AdapterInactive, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POAManager::AdapterInactive *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (PortableServer::POAManager::_tc_AdapterInactive, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableServer::POAManager::AdapterInactive *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, PortableServer::POAManager::AdapterInactive, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (PortableServer::POAManager::_tc_AdapterInactive, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (PortableServer::POAManager::_tc_AdapterInactive, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-static const CORBA::Long _oc_PortableServer_POAManager_AdapterInactive[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  58, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f414d61), ACE_NTOHL (0x6e616765), ACE_NTOHL (0x722f4164), ACE_NTOHL (0x61707465), ACE_NTOHL (0x72496e61), ACE_NTOHL (0x63746976), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableServer/POAManager/AdapterInactive:1.0
-  16, ACE_NTOHL (0x41646170), ACE_NTOHL (0x74657249), ACE_NTOHL (0x6e616374), ACE_NTOHL (0x69766500),  // name = AdapterInactive
-  0, // member count
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAManager_AdapterInactive
-(CORBA::tk_except, sizeof (_oc_PortableServer_POAManager_AdapterInactive),
- (char *) &_oc_PortableServer_POAManager_AdapterInactive, 0, sizeof
- (PortableServer::POAManager::AdapterInactive));
-CORBA::TypeCode_ptr PortableServer::POAManager::_tc_AdapterInactive = &_tc_TAO_tc_PortableServer_POAManager_AdapterInactive;
-
-CORBA::Boolean PortableServer::POAManager::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
-{
-  if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/POAManager:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-    return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
-}
-
-const char* PortableServer::POAManager::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/POAManager:1.0";
-}
-
-static const CORBA::Long _oc_PortableServer_POAManager[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  42, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f414d61), ACE_NTOHL (0x6e616765), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableServer/POAManager:1.0
-  11, ACE_NTOHL (0x504f414d), ACE_NTOHL (0x616e6167), ACE_NTOHL (0x65720000),  // name = POAManager,
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAManager (CORBA::tk_objref,
-                                                             sizeof (_oc_PortableServer_POAManager),
-                                                             (char *) &_oc_PortableServer_POAManager,
-                                                             0,
-                                                             sizeof (PortableServer::POAManager));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_POAManager, &_tc_TAO_tc_PortableServer_POAManager)
-TAO_NAMESPACE_END
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_duplicate (PortableServer::AdapterActivator_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-
-  return obj;
-} // end of _duplicate
-
-PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_narrow (
-                                                                                CORBA::Object_ptr obj,
-                                                                                CORBA::Environment &ACE_TRY_ENV
-                                                                                )
-{
-  if (CORBA::is_nil (obj))
-    return PortableServer::AdapterActivator::_nil ();
-  CORBA::Boolean check =
-    !obj->_is_a ("IDL:omg.org/PortableServer/AdapterActivator:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::AdapterActivator::_nil ());
-  if (check)
-    return PortableServer::AdapterActivator::_nil ();
-  if (!obj->_is_collocated () || !obj->_servant())
-      // This can only be colocated
-      ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::AdapterActivator::_nil ());
-
-  TAO_Stub *stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = obj->_servant ()->_downcast ("IDL:omg.org/PortableServer/AdapterActivator:1.0");
-  return new POA_PortableServer::_tao_collocated_AdapterActivator(
-                                                                  ACE_reinterpret_cast(POA_PortableServer::AdapterActivator_ptr, servant),
-                                                                  stub
-                                                                  );
-}
-
-CORBA::Boolean PortableServer::AdapterActivator::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
-{
-  if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/AdapterActivator:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-    return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
-}
-
-const char* PortableServer::AdapterActivator::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/AdapterActivator:1.0";
-}
-
-static const CORBA::Long _oc_PortableServer_AdapterActivator[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  48, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f41), ACE_NTOHL (0x64617074), ACE_NTOHL (0x65724163), ACE_NTOHL (0x74697661), ACE_NTOHL (0x746f723a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableServer/AdapterActivator:1.0
-  17, ACE_NTOHL (0x41646170), ACE_NTOHL (0x74657241), ACE_NTOHL (0x63746976), ACE_NTOHL (0x61746f72), ACE_NTOHL (0x0),  // name = AdapterActivator,
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_AdapterActivator (CORBA::tk_objref,
-                                                                   sizeof (_oc_PortableServer_AdapterActivator),
-                                                                   (char *) &_oc_PortableServer_AdapterActivator,
-                                                                   0,
-                                                                   sizeof (PortableServer::AdapterActivator));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AdapterActivator, &_tc_TAO_tc_PortableServer_AdapterActivator)
-TAO_NAMESPACE_END
-
-PortableServer::ServantManager_ptr PortableServer::ServantManager::_duplicate (PortableServer::ServantManager_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-
-  return obj;
-} // end of _duplicate
-
-PortableServer::ServantManager_ptr PortableServer::ServantManager::_narrow (
-                                                                            CORBA::Object_ptr obj,
-                                                                            CORBA::Environment &ACE_TRY_ENV
-                                                                            )
-{
-  if (CORBA::is_nil (obj))
-    return PortableServer::ServantManager::_nil ();
-  CORBA::Boolean check =
-    !obj->_is_a ("IDL:omg.org/PortableServer/ServantManager:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::ServantManager::_nil ());
-  if (check)
-    return PortableServer::ServantManager::_nil ();
-  if (!obj->_is_collocated () || !obj->_servant())
-    // This can only be colocated
-    ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::ServantManager::_nil ());
-
-  TAO_Stub *stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = obj->_servant ()->_downcast ("IDL:omg.org/PortableServer/ServantManager:1.0");
-  return new POA_PortableServer::_tao_collocated_ServantManager(
-                                                                ACE_reinterpret_cast(POA_PortableServer::ServantManager_ptr, servant),
-                                                                stub
-                                                                );
-}
-
-CORBA::Boolean PortableServer::ServantManager::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
-{
-  if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ServantManager:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-    return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
-}
-
-const char* PortableServer::ServantManager::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/ServantManager:1.0";
-}
-
-static const CORBA::Long _oc_PortableServer_ServantManager[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  46, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e744d61), ACE_NTOHL (0x6e616765), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableServer/ServantManager:1.0
-  15, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e744d), ACE_NTOHL (0x616e6167), ACE_NTOHL (0x65720000),  // name = ServantManager,
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantManager (CORBA::tk_objref,
-                                                                 sizeof (_oc_PortableServer_ServantManager),
-                                                                 (char *) &_oc_PortableServer_ServantManager,
-                                                                 0,
-                                                                 sizeof (PortableServer::ServantManager));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServantManager, &_tc_TAO_tc_PortableServer_ServantManager)
-TAO_NAMESPACE_END
-
-PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_duplicate (PortableServer::ServantActivator_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-
-  return obj;
-} // end of _duplicate
-
-PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_narrow (
-                                                                                CORBA::Object_ptr obj,
-                                                                                CORBA::Environment &ACE_TRY_ENV
-                                                                                )
-{
-  if (CORBA::is_nil (obj))
-    return PortableServer::ServantActivator::_nil ();
-  CORBA::Boolean check =
-    !obj->_is_a ("IDL:omg.org/PortableServer/ServantActivator:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::ServantActivator::_nil ());
-  if (check)
-    return PortableServer::ServantActivator::_nil ();
-  if (!obj->_is_collocated () || !obj->_servant())
-      // This can only be colocated
-    ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::ServantActivator::_nil ());
-
-  TAO_Stub *stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = obj->_servant ()->_downcast ("IDL:omg.org/PortableServer/ServantActivator:1.0");
-  return new POA_PortableServer::_tao_collocated_ServantActivator(
-                                                                  ACE_reinterpret_cast(POA_PortableServer::ServantActivator_ptr, servant),
-                                                                  stub
-                                                                  );
-}
-
-CORBA::Boolean PortableServer::ServantActivator::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
-{
-  if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ServantActivator:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ServantManager:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-    return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
-}
-
-const char* PortableServer::ServantActivator::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/ServantActivator:1.0";
-}
-
-static const CORBA::Long _oc_PortableServer_ServantActivator[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  48, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e744163), ACE_NTOHL (0x74697661), ACE_NTOHL (0x746f723a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableServer/ServantActivator:1.0
-  17, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e7441), ACE_NTOHL (0x63746976), ACE_NTOHL (0x61746f72), ACE_NTOHL (0x0),  // name = ServantActivator,
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantActivator (CORBA::tk_objref,
-                                                                   sizeof (_oc_PortableServer_ServantActivator),
-                                                                   (char *) &_oc_PortableServer_ServantActivator,
-                                                                   0,
-                                                                   sizeof (PortableServer::ServantActivator));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServantActivator, &_tc_TAO_tc_PortableServer_ServantActivator)
-TAO_NAMESPACE_END
-
-PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_duplicate (PortableServer::ServantLocator_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-
-  return obj;
-} // end of _duplicate
-
-PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_narrow (
-                                                                            CORBA::Object_ptr obj,
-                                                                            CORBA::Environment &ACE_TRY_ENV
-                                                                            )
-{
-  if (CORBA::is_nil (obj))
-    return PortableServer::ServantLocator::_nil ();
-  CORBA::Boolean check =
-    !obj->_is_a ("IDL:omg.org/PortableServer/ServantLocator:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::ServantLocator::_nil ());
-  if (check)
-    return PortableServer::ServantLocator::_nil ();
-  if (!obj->_is_collocated () || !obj->_servant())
-    // This can only be colocated
-    ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::ServantLocator::_nil ());
-
-  TAO_Stub *stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = obj->_servant ()->_downcast ("IDL:omg.org/PortableServer/ServantLocator:1.0");
-  return new POA_PortableServer::_tao_collocated_ServantLocator(
-                                                                ACE_reinterpret_cast(POA_PortableServer::ServantLocator_ptr, servant),
-                                                                stub
-                                                                );
-}
-
-CORBA::Boolean PortableServer::ServantLocator::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
-{
-  if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ServantLocator:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ServantManager:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-    return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
-}
-
-const char* PortableServer::ServantLocator::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/ServantLocator:1.0";
-}
-
-static const CORBA::Long _oc_PortableServer_ServantLocator[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  46, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e744c6f), ACE_NTOHL (0x6361746f), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableServer/ServantLocator:1.0
-  15, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e744c), ACE_NTOHL (0x6f636174), ACE_NTOHL (0x6f720000),  // name = ServantLocator,
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantLocator (CORBA::tk_objref,
-                                                                 sizeof (_oc_PortableServer_ServantLocator),
-                                                                 (char *) &_oc_PortableServer_ServantLocator,
-                                                                 0,
-                                                                 sizeof (PortableServer::ServantLocator));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServantLocator, &_tc_TAO_tc_PortableServer_ServantLocator)
-TAO_NAMESPACE_END
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-PortableServer::POA_ptr PortableServer::POA::_duplicate (PortableServer::POA_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-
-  return obj;
-} // end of _duplicate
-
-PortableServer::POA_ptr PortableServer::POA::_narrow (
-                                                      CORBA::Object_ptr obj,
-                                                      CORBA::Environment &ACE_TRY_ENV
-                                                      )
-{
-  if (CORBA::is_nil (obj))
-    return PortableServer::POA::_nil ();
-  CORBA::Boolean check =
-    !obj->_is_a ("IDL:omg.org/PortableServer/POA:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-  if (check)
-    return PortableServer::POA::_nil ();
-  if (!obj->_is_collocated () || !obj->_servant())
-    // This can only be colocated
-    ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::POA::_nil ());
-
-  TAO_Stub *stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = obj->_servant ()->_downcast ("IDL:omg.org/PortableServer/POA:1.0");
-  return new POA_PortableServer::_tao_collocated_POA(
-                                                     ACE_reinterpret_cast(POA_PortableServer::POA_ptr, servant),
-                                                     stub
-                                                     );
-}
-
-// default constructor
-PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (void)
-  : CORBA_UserException (PortableServer::POA::_tc_AdapterAlreadyExists)
-{
-}
-
-// destructor - all members are of self managing types
-PortableServer::POA::AdapterAlreadyExists::~AdapterAlreadyExists (void)
-{
-}
-
-// copy constructor
-PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (const PortableServer::POA::AdapterAlreadyExists &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-}
-
-// assignment operator
-PortableServer::POA::AdapterAlreadyExists&
-PortableServer::POA::AdapterAlreadyExists::operator= (const PortableServer::POA::AdapterAlreadyExists &_tao_excp)
-{
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-void PortableServer::POA::AdapterAlreadyExists::_raise (void)
-{
-  TAO_RAISE(*this);
-}
-
-// narrow
-PortableServer::POA::AdapterAlreadyExists_ptr
-PortableServer::POA::AdapterAlreadyExists::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (PortableServer::POA::AdapterAlreadyExists_ptr, exc);
-  else
-    return 0;
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *PortableServer::POA::AdapterAlreadyExists::_alloc (void)
-{
-  return new PortableServer::POA::AdapterAlreadyExists;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::AdapterAlreadyExists &_tao_elem) // copying
-{
-  PortableServer::POA::AdapterAlreadyExists *_tao_any_val = new PortableServer::POA::AdapterAlreadyExists (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_AdapterAlreadyExists, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, PortableServer::POA::AdapterAlreadyExists *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_AdapterAlreadyExists, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::AdapterAlreadyExists *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (PortableServer::POA::_tc_AdapterAlreadyExists, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableServer::POA::AdapterAlreadyExists *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, PortableServer::POA::AdapterAlreadyExists, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (PortableServer::POA::_tc_AdapterAlreadyExists, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_AdapterAlreadyExists, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-static const CORBA::Long _oc_PortableServer_POA_AdapterAlreadyExists[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  56, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f41), ACE_NTOHL (0x64617074), ACE_NTOHL (0x6572416c), ACE_NTOHL (0x72656164), ACE_NTOHL (0x79457869), ACE_NTOHL (0x7374733a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:1.0
-  21, ACE_NTOHL (0x41646170), ACE_NTOHL (0x74657241), ACE_NTOHL (0x6c726561), ACE_NTOHL (0x64794578), ACE_NTOHL (0x69737473), ACE_NTOHL (0x0),  // name = AdapterAlreadyExists
-  0, // member count
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_AdapterAlreadyExists
-(CORBA::tk_except, sizeof (_oc_PortableServer_POA_AdapterAlreadyExists),
- (char *) &_oc_PortableServer_POA_AdapterAlreadyExists, 0, sizeof
- (PortableServer::POA::AdapterAlreadyExists));
-CORBA::TypeCode_ptr PortableServer::POA::_tc_AdapterAlreadyExists = &_tc_TAO_tc_PortableServer_POA_AdapterAlreadyExists;
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-// default constructor
-PortableServer::POA::AdapterInactive::AdapterInactive (void)
-  : CORBA_UserException (PortableServer::POA::_tc_AdapterInactive)
-{
-}
-
-// destructor - all members are of self managing types
-PortableServer::POA::AdapterInactive::~AdapterInactive (void)
-{
-}
-
-// copy constructor
-PortableServer::POA::AdapterInactive::AdapterInactive (const PortableServer::POA::AdapterInactive &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-}
-
-// assignment operator
-PortableServer::POA::AdapterInactive&
-PortableServer::POA::AdapterInactive::operator= (const PortableServer::POA::AdapterInactive &_tao_excp)
-{
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-void PortableServer::POA::AdapterInactive::_raise (void)
-{
-  TAO_RAISE(*this);
-}
-
-// narrow
-PortableServer::POA::AdapterInactive_ptr
-PortableServer::POA::AdapterInactive::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/AdapterInactive:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (PortableServer::POA::AdapterInactive_ptr, exc);
-  else
-    return 0;
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *PortableServer::POA::AdapterInactive::_alloc (void)
-{
-  return new PortableServer::POA::AdapterInactive;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::AdapterInactive &_tao_elem) // copying
-{
-  PortableServer::POA::AdapterInactive *_tao_any_val = new PortableServer::POA::AdapterInactive (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_AdapterInactive, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, PortableServer::POA::AdapterInactive *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_AdapterInactive, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::AdapterInactive *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (PortableServer::POA::_tc_AdapterInactive, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableServer::POA::AdapterInactive *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, PortableServer::POA::AdapterInactive, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (PortableServer::POA::_tc_AdapterInactive, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_AdapterInactive, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-static const CORBA::Long _oc_PortableServer_POA_AdapterInactive[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  51, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f41), ACE_NTOHL (0x64617074), ACE_NTOHL (0x6572496e), ACE_NTOHL (0x61637469), ACE_NTOHL (0x76653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/POA/AdapterInactive:1.0
-  16, ACE_NTOHL (0x41646170), ACE_NTOHL (0x74657249), ACE_NTOHL (0x6e616374), ACE_NTOHL (0x69766500),  // name = AdapterInactive
-  0, // member count
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_AdapterInactive
-(CORBA::tk_except, sizeof (_oc_PortableServer_POA_AdapterInactive), (char *)
- &_oc_PortableServer_POA_AdapterInactive, 0, sizeof
- (PortableServer::POA::AdapterInactive));
-CORBA::TypeCode_ptr PortableServer::POA::_tc_AdapterInactive = &_tc_TAO_tc_PortableServer_POA_AdapterInactive;
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-// default constructor
-PortableServer::POA::AdapterNonExistent::AdapterNonExistent (void)
-  : CORBA_UserException (PortableServer::POA::_tc_AdapterNonExistent)
-{
-}
-
-// destructor - all members are of self managing types
-PortableServer::POA::AdapterNonExistent::~AdapterNonExistent (void)
-{
-}
-
-// copy constructor
-PortableServer::POA::AdapterNonExistent::AdapterNonExistent (const PortableServer::POA::AdapterNonExistent &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-}
-
-// assignment operator
-PortableServer::POA::AdapterNonExistent&
-PortableServer::POA::AdapterNonExistent::operator= (const PortableServer::POA::AdapterNonExistent &_tao_excp)
-{
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-void PortableServer::POA::AdapterNonExistent::_raise (void)
-{
-  TAO_RAISE(*this);
-}
-
-// narrow
-PortableServer::POA::AdapterNonExistent_ptr
-PortableServer::POA::AdapterNonExistent::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/AdapterNonExistent:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (PortableServer::POA::AdapterNonExistent_ptr, exc);
-  else
-    return 0;
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *PortableServer::POA::AdapterNonExistent::_alloc (void)
-{
-  return new PortableServer::POA::AdapterNonExistent;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::AdapterNonExistent &_tao_elem) // copying
-{
-  PortableServer::POA::AdapterNonExistent *_tao_any_val = new PortableServer::POA::AdapterNonExistent (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_AdapterNonExistent, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, PortableServer::POA::AdapterNonExistent *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_AdapterNonExistent, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::AdapterNonExistent *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (PortableServer::POA::_tc_AdapterNonExistent, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableServer::POA::AdapterNonExistent *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, PortableServer::POA::AdapterNonExistent, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (PortableServer::POA::_tc_AdapterNonExistent, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_AdapterNonExistent, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-static const CORBA::Long _oc_PortableServer_POA_AdapterNonExistent[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  54, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f41), ACE_NTOHL (0x64617074), ACE_NTOHL (0x65724e6f), ACE_NTOHL (0x6e457869), ACE_NTOHL (0x7374656e), ACE_NTOHL (0x743a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableServer/POA/AdapterNonExistent:1.0
-  19, ACE_NTOHL (0x41646170), ACE_NTOHL (0x7465724e), ACE_NTOHL (0x6f6e4578), ACE_NTOHL (0x69737465), ACE_NTOHL (0x6e740000),  // name = AdapterNonExistent
-  0, // member count
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_AdapterNonExistent
-(CORBA::tk_except, sizeof (_oc_PortableServer_POA_AdapterNonExistent), (char *)
- &_oc_PortableServer_POA_AdapterNonExistent, 0, sizeof
- (PortableServer::POA::AdapterNonExistent));
-CORBA::TypeCode_ptr PortableServer::POA::_tc_AdapterNonExistent = &_tc_TAO_tc_PortableServer_POA_AdapterNonExistent;
-
-// default constructor
-PortableServer::POA::InvalidPolicy::InvalidPolicy (void)
-  : CORBA_UserException (PortableServer::POA::_tc_InvalidPolicy)
-{
-}
-
-// destructor - all members are of self managing types
-PortableServer::POA::InvalidPolicy::~InvalidPolicy (void)
-{
-}
-
-// copy constructor
-PortableServer::POA::InvalidPolicy::InvalidPolicy (const PortableServer::POA::InvalidPolicy &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-  this->index = _tao_excp.index;
-}
-
-// assignment operator
-PortableServer::POA::InvalidPolicy&
-PortableServer::POA::InvalidPolicy::operator= (const PortableServer::POA::InvalidPolicy &_tao_excp)
-{
-  this->CORBA_UserException::operator= (_tao_excp);
-  this->index = _tao_excp.index;
-  return *this;
-}
-
-PortableServer::POA::InvalidPolicy::InvalidPolicy(
-                                                  CORBA::UShort _tao_index)
-  : CORBA_UserException  (PortableServer::POA::_tc_InvalidPolicy)
-{
-  this->index = _tao_index;
-}
-
-void PortableServer::POA::InvalidPolicy::_raise (void)
-{
-  TAO_RAISE(*this);
-}
-
-// narrow
-PortableServer::POA::InvalidPolicy_ptr
-PortableServer::POA::InvalidPolicy::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/InvalidPolicy:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (PortableServer::POA::InvalidPolicy_ptr, exc);
-  else
-    return 0;
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *PortableServer::POA::InvalidPolicy::_alloc (void)
-{
-  return new PortableServer::POA::InvalidPolicy;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::InvalidPolicy &_tao_elem) // copying
-{
-  PortableServer::POA::InvalidPolicy *_tao_any_val = new PortableServer::POA::InvalidPolicy (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_InvalidPolicy, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, PortableServer::POA::InvalidPolicy *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_InvalidPolicy, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::InvalidPolicy *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (PortableServer::POA::_tc_InvalidPolicy, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableServer::POA::InvalidPolicy *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, PortableServer::POA::InvalidPolicy, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (PortableServer::POA::_tc_InvalidPolicy, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_InvalidPolicy, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-static const CORBA::Long _oc_PortableServer_POA_InvalidPolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  49, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f49), ACE_NTOHL (0x6e76616c), ACE_NTOHL (0x6964506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableServer/POA/InvalidPolicy:1.0
-  14, ACE_NTOHL (0x496e7661), ACE_NTOHL (0x6c696450), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x79000000),  // name = InvalidPolicy
-  1, // member count
-    6, ACE_NTOHL (0x696e6465), ACE_NTOHL (0x78000000),  // name = index
-    CORBA::tk_ushort,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_InvalidPolicy
-(CORBA::tk_except, sizeof (_oc_PortableServer_POA_InvalidPolicy), (char *)
- &_oc_PortableServer_POA_InvalidPolicy, 0, sizeof
- (PortableServer::POA::InvalidPolicy));
-CORBA::TypeCode_ptr PortableServer::POA::_tc_InvalidPolicy = &_tc_TAO_tc_PortableServer_POA_InvalidPolicy;
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-// default constructor
-PortableServer::POA::NoServant::NoServant (void)
-  : CORBA_UserException (PortableServer::POA::_tc_NoServant)
-{
-}
-
-// destructor - all members are of self managing types
-PortableServer::POA::NoServant::~NoServant (void)
-{
-}
-
-// copy constructor
-PortableServer::POA::NoServant::NoServant (const PortableServer::POA::NoServant &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-}
-
-// assignment operator
-PortableServer::POA::NoServant&
-PortableServer::POA::NoServant::operator= (const PortableServer::POA::NoServant &_tao_excp)
-{
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-void PortableServer::POA::NoServant::_raise (void)
-{
-  TAO_RAISE(*this);
-}
-
-// narrow
-PortableServer::POA::NoServant_ptr
-PortableServer::POA::NoServant::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/NoServant:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (PortableServer::POA::NoServant_ptr, exc);
-  else
-    return 0;
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *PortableServer::POA::NoServant::_alloc (void)
-{
-  return new PortableServer::POA::NoServant;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::NoServant &_tao_elem) // copying
-{
-  PortableServer::POA::NoServant *_tao_any_val = new PortableServer::POA::NoServant (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_NoServant, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, PortableServer::POA::NoServant *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_NoServant, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::NoServant *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (PortableServer::POA::_tc_NoServant, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableServer::POA::NoServant *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, PortableServer::POA::NoServant, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (PortableServer::POA::_tc_NoServant, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_NoServant, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-static const CORBA::Long _oc_PortableServer_POA_NoServant[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  45, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f4e), ACE_NTOHL (0x6f536572), ACE_NTOHL (0x76616e74), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableServer/POA/NoServant:1.0
-  10, ACE_NTOHL (0x4e6f5365), ACE_NTOHL (0x7276616e), ACE_NTOHL (0x74000000),  // name = NoServant
-  0, // member count
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_NoServant (CORBA::tk_except,
-                                                             sizeof
-                                                             (_oc_PortableServer_POA_NoServant),
-                                                             (char *)
-                                                             &_oc_PortableServer_POA_NoServant, 0,
-                                                             sizeof (PortableServer::POA::NoServant));
-CORBA::TypeCode_ptr PortableServer::POA::_tc_NoServant = &_tc_TAO_tc_PortableServer_POA_NoServant;
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-// default constructor
-PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (void)
-  : CORBA_UserException (PortableServer::POA::_tc_ObjectAlreadyActive)
-{
-}
-
-// destructor - all members are of self managing types
-PortableServer::POA::ObjectAlreadyActive::~ObjectAlreadyActive (void)
-{
-}
-
-// copy constructor
-PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (const PortableServer::POA::ObjectAlreadyActive &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-}
-
-// assignment operator
-PortableServer::POA::ObjectAlreadyActive&
-PortableServer::POA::ObjectAlreadyActive::operator= (const PortableServer::POA::ObjectAlreadyActive &_tao_excp)
-{
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-void PortableServer::POA::ObjectAlreadyActive::_raise (void)
-{
-  TAO_RAISE(*this);
-}
-
-// narrow
-PortableServer::POA::ObjectAlreadyActive_ptr
-PortableServer::POA::ObjectAlreadyActive::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (PortableServer::POA::ObjectAlreadyActive_ptr, exc);
-  else
-    return 0;
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *PortableServer::POA::ObjectAlreadyActive::_alloc (void)
-{
-  return new PortableServer::POA::ObjectAlreadyActive;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::ObjectAlreadyActive &_tao_elem) // copying
-{
-  PortableServer::POA::ObjectAlreadyActive *_tao_any_val = new PortableServer::POA::ObjectAlreadyActive (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_ObjectAlreadyActive, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, PortableServer::POA::ObjectAlreadyActive *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_ObjectAlreadyActive, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::ObjectAlreadyActive *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (PortableServer::POA::_tc_ObjectAlreadyActive, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableServer::POA::ObjectAlreadyActive *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, PortableServer::POA::ObjectAlreadyActive, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (PortableServer::POA::_tc_ObjectAlreadyActive, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_ObjectAlreadyActive, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-static const CORBA::Long _oc_PortableServer_POA_ObjectAlreadyActive[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  55, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f4f), ACE_NTOHL (0x626a6563), ACE_NTOHL (0x74416c72), ACE_NTOHL (0x65616479), ACE_NTOHL (0x41637469), ACE_NTOHL (0x76653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:1.0
-  20, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x6374416c), ACE_NTOHL (0x72656164), ACE_NTOHL (0x79416374), ACE_NTOHL (0x69766500),  // name = ObjectAlreadyActive
-  0, // member count
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ObjectAlreadyActive
-(CORBA::tk_except, sizeof (_oc_PortableServer_POA_ObjectAlreadyActive),
- (char *) &_oc_PortableServer_POA_ObjectAlreadyActive, 0, sizeof
- (PortableServer::POA::ObjectAlreadyActive));
-CORBA::TypeCode_ptr PortableServer::POA::_tc_ObjectAlreadyActive = &_tc_TAO_tc_PortableServer_POA_ObjectAlreadyActive;
-
-// default constructor
-PortableServer::POA::ObjectNotActive::ObjectNotActive (void)
-  : CORBA_UserException (PortableServer::POA::_tc_ObjectNotActive)
-{
-}
-
-// destructor - all members are of self managing types
-PortableServer::POA::ObjectNotActive::~ObjectNotActive (void)
-{
-}
-
-// copy constructor
-PortableServer::POA::ObjectNotActive::ObjectNotActive (const PortableServer::POA::ObjectNotActive &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-}
-
-// assignment operator
-PortableServer::POA::ObjectNotActive&
-PortableServer::POA::ObjectNotActive::operator= (const PortableServer::POA::ObjectNotActive &_tao_excp)
-{
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-void PortableServer::POA::ObjectNotActive::_raise (void)
-{
-  TAO_RAISE(*this);
-}
-
-// narrow
-PortableServer::POA::ObjectNotActive_ptr
-PortableServer::POA::ObjectNotActive::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ObjectNotActive:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (PortableServer::POA::ObjectNotActive_ptr, exc);
-  else
-    return 0;
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *PortableServer::POA::ObjectNotActive::_alloc (void)
-{
-  return new PortableServer::POA::ObjectNotActive;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::ObjectNotActive &_tao_elem) // copying
-{
-  PortableServer::POA::ObjectNotActive *_tao_any_val = new PortableServer::POA::ObjectNotActive (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_ObjectNotActive, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, PortableServer::POA::ObjectNotActive *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_ObjectNotActive, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::ObjectNotActive *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (PortableServer::POA::_tc_ObjectNotActive, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableServer::POA::ObjectNotActive *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, PortableServer::POA::ObjectNotActive, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (PortableServer::POA::_tc_ObjectNotActive, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_ObjectNotActive, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-static const CORBA::Long _oc_PortableServer_POA_ObjectNotActive[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  51, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f4f), ACE_NTOHL (0x626a6563), ACE_NTOHL (0x744e6f74), ACE_NTOHL (0x41637469), ACE_NTOHL (0x76653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/POA/ObjectNotActive:1.0
-  16, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63744e6f), ACE_NTOHL (0x74416374), ACE_NTOHL (0x69766500),  // name = ObjectNotActive
-  0, // member count
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ObjectNotActive
-(CORBA::tk_except, sizeof (_oc_PortableServer_POA_ObjectNotActive), (char *)
- &_oc_PortableServer_POA_ObjectNotActive, 0, sizeof
- (PortableServer::POA::ObjectNotActive));
-CORBA::TypeCode_ptr PortableServer::POA::_tc_ObjectNotActive = &_tc_TAO_tc_PortableServer_POA_ObjectNotActive;
-
-// default constructor
-PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (void)
-  : CORBA_UserException (PortableServer::POA::_tc_ServantAlreadyActive)
-{
-}
-
-// destructor - all members are of self managing types
-PortableServer::POA::ServantAlreadyActive::~ServantAlreadyActive (void)
-{
-}
-
-// copy constructor
-PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (const PortableServer::POA::ServantAlreadyActive &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-}
-
-// assignment operator
-PortableServer::POA::ServantAlreadyActive&
-PortableServer::POA::ServantAlreadyActive::operator= (const PortableServer::POA::ServantAlreadyActive &_tao_excp)
-{
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-void PortableServer::POA::ServantAlreadyActive::_raise (void)
-{
-  TAO_RAISE(*this);
-}
-
-// narrow
-PortableServer::POA::ServantAlreadyActive_ptr
-PortableServer::POA::ServantAlreadyActive::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ServantAlreadyActive:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (PortableServer::POA::ServantAlreadyActive_ptr, exc);
-  else
-    return 0;
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *PortableServer::POA::ServantAlreadyActive::_alloc (void)
-{
-  return new PortableServer::POA::ServantAlreadyActive;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::ServantAlreadyActive &_tao_elem) // copying
-{
-  PortableServer::POA::ServantAlreadyActive *_tao_any_val = new PortableServer::POA::ServantAlreadyActive (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_ServantAlreadyActive, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, PortableServer::POA::ServantAlreadyActive *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_ServantAlreadyActive, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::ServantAlreadyActive *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (PortableServer::POA::_tc_ServantAlreadyActive, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableServer::POA::ServantAlreadyActive *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, PortableServer::POA::ServantAlreadyActive, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (PortableServer::POA::_tc_ServantAlreadyActive, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_ServantAlreadyActive, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-static const CORBA::Long _oc_PortableServer_POA_ServantAlreadyActive[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  56, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e74416c), ACE_NTOHL (0x72656164), ACE_NTOHL (0x79416374), ACE_NTOHL (0x6976653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableServer/POA/ServantAlreadyActive:1.0
-  21, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e7441), ACE_NTOHL (0x6c726561), ACE_NTOHL (0x64794163), ACE_NTOHL (0x74697665), ACE_NTOHL (0x0),  // name = ServantAlreadyActive
-  0, // member count
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ServantAlreadyActive
-(CORBA::tk_except, sizeof (_oc_PortableServer_POA_ServantAlreadyActive),
- (char *) &_oc_PortableServer_POA_ServantAlreadyActive, 0, sizeof
- (PortableServer::POA::ServantAlreadyActive));
-CORBA::TypeCode_ptr PortableServer::POA::_tc_ServantAlreadyActive = &_tc_TAO_tc_PortableServer_POA_ServantAlreadyActive;
-
-// default constructor
-PortableServer::POA::ServantNotActive::ServantNotActive (void)
-  : CORBA_UserException (PortableServer::POA::_tc_ServantNotActive)
-{
-}
-
-// destructor - all members are of self managing types
-PortableServer::POA::ServantNotActive::~ServantNotActive (void)
-{
-}
-
-// copy constructor
-PortableServer::POA::ServantNotActive::ServantNotActive (const PortableServer::POA::ServantNotActive &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-}
-
-// assignment operator
-PortableServer::POA::ServantNotActive&
-PortableServer::POA::ServantNotActive::operator= (const PortableServer::POA::ServantNotActive &_tao_excp)
-{
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-void PortableServer::POA::ServantNotActive::_raise (void)
-{
-  TAO_RAISE(*this);
-}
-
-// narrow
-PortableServer::POA::ServantNotActive_ptr
-PortableServer::POA::ServantNotActive::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ServantNotActive:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (PortableServer::POA::ServantNotActive_ptr, exc);
-  else
-    return 0;
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *PortableServer::POA::ServantNotActive::_alloc (void)
-{
-  return new PortableServer::POA::ServantNotActive;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::ServantNotActive &_tao_elem) // copying
-{
-  PortableServer::POA::ServantNotActive *_tao_any_val = new PortableServer::POA::ServantNotActive (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_ServantNotActive, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, PortableServer::POA::ServantNotActive *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_ServantNotActive, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::ServantNotActive *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (PortableServer::POA::_tc_ServantNotActive, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableServer::POA::ServantNotActive *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, PortableServer::POA::ServantNotActive, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (PortableServer::POA::_tc_ServantNotActive, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_ServantNotActive, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-static const CORBA::Long _oc_PortableServer_POA_ServantNotActive[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  52, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e744e6f), ACE_NTOHL (0x74416374), ACE_NTOHL (0x6976653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableServer/POA/ServantNotActive:1.0
-  17, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e744e), ACE_NTOHL (0x6f744163), ACE_NTOHL (0x74697665), ACE_NTOHL (0x0),  // name = ServantNotActive
-  0, // member count
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ServantNotActive
-(CORBA::tk_except, sizeof (_oc_PortableServer_POA_ServantNotActive), (char *)
- &_oc_PortableServer_POA_ServantNotActive, 0, sizeof
- (PortableServer::POA::ServantNotActive));
-CORBA::TypeCode_ptr PortableServer::POA::_tc_ServantNotActive = &_tc_TAO_tc_PortableServer_POA_ServantNotActive;
-
-// default constructor
-PortableServer::POA::WrongAdapter::WrongAdapter (void)
-  : CORBA_UserException (PortableServer::POA::_tc_WrongAdapter)
-{
-}
-
-// destructor - all members are of self managing types
-PortableServer::POA::WrongAdapter::~WrongAdapter (void)
-{
-}
-
-// copy constructor
-PortableServer::POA::WrongAdapter::WrongAdapter (const PortableServer::POA::WrongAdapter &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-}
-
-// assignment operator
-PortableServer::POA::WrongAdapter&
-PortableServer::POA::WrongAdapter::operator= (const PortableServer::POA::WrongAdapter &_tao_excp)
-{
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-void PortableServer::POA::WrongAdapter::_raise (void)
-{
-  TAO_RAISE(*this);
-}
-
-// narrow
-PortableServer::POA::WrongAdapter_ptr
-PortableServer::POA::WrongAdapter::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/WrongAdapter:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (PortableServer::POA::WrongAdapter_ptr, exc);
-  else
-    return 0;
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *PortableServer::POA::WrongAdapter::_alloc (void)
-{
-  return new PortableServer::POA::WrongAdapter;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::WrongAdapter &_tao_elem) // copying
-{
-  PortableServer::POA::WrongAdapter *_tao_any_val = new PortableServer::POA::WrongAdapter (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_WrongAdapter, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, PortableServer::POA::WrongAdapter *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_WrongAdapter, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::WrongAdapter *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (PortableServer::POA::_tc_WrongAdapter, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableServer::POA::WrongAdapter *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, PortableServer::POA::WrongAdapter, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (PortableServer::POA::_tc_WrongAdapter, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_WrongAdapter, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-static const CORBA::Long _oc_PortableServer_POA_WrongAdapter[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  48, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f57), ACE_NTOHL (0x726f6e67), ACE_NTOHL (0x41646170), ACE_NTOHL (0x7465723a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableServer/POA/WrongAdapter:1.0
-  13, ACE_NTOHL (0x57726f6e), ACE_NTOHL (0x67416461), ACE_NTOHL (0x70746572), ACE_NTOHL (0x0),  // name = WrongAdapter
-  0, // member count
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_WrongAdapter
-(CORBA::tk_except, sizeof (_oc_PortableServer_POA_WrongAdapter), (char *)
- &_oc_PortableServer_POA_WrongAdapter, 0, sizeof
- (PortableServer::POA::WrongAdapter));
-CORBA::TypeCode_ptr PortableServer::POA::_tc_WrongAdapter = &_tc_TAO_tc_PortableServer_POA_WrongAdapter;
-
-// default constructor
-PortableServer::POA::WrongPolicy::WrongPolicy (void)
-  : CORBA_UserException (PortableServer::POA::_tc_WrongPolicy)
-{
-}
-
-// destructor - all members are of self managing types
-PortableServer::POA::WrongPolicy::~WrongPolicy (void)
-{
-}
-
-// copy constructor
-PortableServer::POA::WrongPolicy::WrongPolicy (const PortableServer::POA::WrongPolicy &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-}
-
-// assignment operator
-PortableServer::POA::WrongPolicy&
-PortableServer::POA::WrongPolicy::operator= (const PortableServer::POA::WrongPolicy &_tao_excp)
-{
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-void PortableServer::POA::WrongPolicy::_raise (void)
-{
-  TAO_RAISE(*this);
-}
-
-// narrow
-PortableServer::POA::WrongPolicy_ptr
-PortableServer::POA::WrongPolicy::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/WrongPolicy:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (PortableServer::POA::WrongPolicy_ptr, exc);
-  else
-    return 0;
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *PortableServer::POA::WrongPolicy::_alloc (void)
-{
-  return new PortableServer::POA::WrongPolicy;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::WrongPolicy &_tao_elem) // copying
-{
-  PortableServer::POA::WrongPolicy *_tao_any_val = new PortableServer::POA::WrongPolicy (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_WrongPolicy, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, PortableServer::POA::WrongPolicy *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_WrongPolicy, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::WrongPolicy *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (PortableServer::POA::_tc_WrongPolicy, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableServer::POA::WrongPolicy *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, PortableServer::POA::WrongPolicy, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (PortableServer::POA::_tc_WrongPolicy, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_WrongPolicy, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-static const CORBA::Long _oc_PortableServer_POA_WrongPolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  47, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f57), ACE_NTOHL (0x726f6e67), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63793a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/POA/WrongPolicy:1.0
-  12, ACE_NTOHL (0x57726f6e), ACE_NTOHL (0x67506f6c), ACE_NTOHL (0x69637900),  // name = WrongPolicy
-  0, // member count
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_WrongPolicy
-(CORBA::tk_except, sizeof (_oc_PortableServer_POA_WrongPolicy), (char *)
- &_oc_PortableServer_POA_WrongPolicy, 0, sizeof
- (PortableServer::POA::WrongPolicy));
-CORBA::TypeCode_ptr PortableServer::POA::_tc_WrongPolicy = &_tc_TAO_tc_PortableServer_POA_WrongPolicy;
-
-CORBA::Boolean PortableServer::POA::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
-{
-  if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/POA:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-    return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
-}
-
-const char* PortableServer::POA::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/POA:1.0";
-}
-
-static const CORBA::Long _oc_PortableServer_POA[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f413a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/POA:1.0
-  4, ACE_NTOHL (0x504f4100),  // name = POA,
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA (CORBA::tk_objref,
-                                                      sizeof (_oc_PortableServer_POA),
-                                                      (char *) &_oc_PortableServer_POA,
-                                                      0,
-                                                      sizeof (PortableServer::POA));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_POA, &_tc_TAO_tc_PortableServer_POA)
-TAO_NAMESPACE_END
-
-PortableServer::Current_ptr PortableServer::Current::_duplicate (PortableServer::Current_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-
-  return obj;
-} // end of _duplicate
-
-PortableServer::Current_ptr PortableServer::Current::_narrow (
-                                                              CORBA::Object_ptr obj,
-                                                              CORBA::Environment &ACE_TRY_ENV
-                                                              )
-{
-  if (CORBA::is_nil (obj))
-    return PortableServer::Current::_nil ();
-  CORBA::Boolean check =
-    !obj->_is_a ("IDL:omg.org/PortableServer/Current:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::Current::_nil ());
-  if (check)
-    return PortableServer::Current::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/PortableServer/Current:1.0");
-  if (servant == 0)
-    return new PortableServer::Current(stub);
-  return new POA_PortableServer::_tao_collocated_Current(
-      ACE_reinterpret_cast(POA_PortableServer::Current_ptr, servant),
-      stub
-    );
-}
-
-// default constructor
-PortableServer::Current::NoContext::NoContext (void)
-  : CORBA_UserException (PortableServer::Current::_tc_NoContext)
-{
-}
-
-// destructor - all members are of self managing types
-PortableServer::Current::NoContext::~NoContext (void)
-{
-}
-
-// copy constructor
-PortableServer::Current::NoContext::NoContext (const PortableServer::Current::NoContext &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-}
-
-// assignment operator
-PortableServer::Current::NoContext&
-PortableServer::Current::NoContext::operator= (const PortableServer::Current::NoContext &_tao_excp)
-{
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-void PortableServer::Current::NoContext::_raise (void)
-{
-  TAO_RAISE(*this);
-}
-
-// narrow
-PortableServer::Current::NoContext_ptr
-PortableServer::Current::NoContext::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/Current/NoContext:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (PortableServer::Current::NoContext_ptr, exc);
-  else
-    return 0;
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *PortableServer::Current::NoContext::_alloc (void)
-{
-  return new PortableServer::Current::NoContext;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const PortableServer::Current::NoContext &_tao_elem) // copying
-{
-  PortableServer::Current::NoContext *_tao_any_val = new PortableServer::Current::NoContext (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::Current::_tc_NoContext, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, PortableServer::Current::NoContext *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::Current::_tc_NoContext, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::Current::NoContext *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (PortableServer::Current::_tc_NoContext, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableServer::Current::NoContext *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, PortableServer::Current::NoContext, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (PortableServer::Current::_tc_NoContext, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (PortableServer::Current::_tc_NoContext, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-static const CORBA::Long _oc_PortableServer_Current_NoContext[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  49, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f43), ACE_NTOHL (0x75727265), ACE_NTOHL (0x6e742f4e), ACE_NTOHL (0x6f436f6e), ACE_NTOHL (0x74657874), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableServer/Current/NoContext:1.0
-  10, ACE_NTOHL (0x4e6f436f), ACE_NTOHL (0x6e746578), ACE_NTOHL (0x74000000),  // name = NoContext
-  0, // member count
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_Current_NoContext
-(CORBA::tk_except, sizeof (_oc_PortableServer_Current_NoContext), (char *)
- &_oc_PortableServer_Current_NoContext, 0, sizeof
- (PortableServer::Current::NoContext));
-CORBA::TypeCode_ptr PortableServer::Current::_tc_NoContext = &_tc_TAO_tc_PortableServer_Current_NoContext;
-
-PortableServer::POA_ptr  PortableServer::Current::get_POA (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::POA::_nil ());
-}
-
-PortableServer::ObjectId * PortableServer::Current::get_object_id (CORBA::Environment &ACE_TRY_ENV)
-{
-    static TAO_Exception_Data _tao_PortableServer_Current_get_object_id_exceptiondata [] =
-  {
-    {PortableServer::Current::_tc_NoContext, PortableServer::Current::NoContext::_alloc}
-  };
-
-  PortableServer::ObjectId *_tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  ACE_NEW_RETURN (_tao_retval, PortableServer::ObjectId, _tao_retval);
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "get_object_id",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (_tao_PortableServer_Current_get_object_id_exceptiondata, 1, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> *_tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::Boolean PortableServer::Current::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
-{
-  if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Current:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Current:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-    return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
-}
-
-const char* PortableServer::Current::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/Current:1.0";
-}
-
-static const CORBA::Long _oc_PortableServer_Current[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f43), ACE_NTOHL (0x75727265), ACE_NTOHL (0x6e743a31), ACE_NTOHL (0x2e3000fd),  // repository ID = IDL:PortableServer/Current:1.0
-  8, ACE_NTOHL (0x43757272), ACE_NTOHL (0x656e7400),  // name = Current,
-};
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_Current (CORBA::tk_objref, sizeof
-                                                       (_oc_PortableServer_Current), (char *) &_oc_PortableServer_Current,
-                                                       0,
-                                                       sizeof (PortableServer::Current));
-CORBA::TypeCode_ptr PortableServer::_tc_Current = &_tc_TAO_tc_PortableServer_Current;
-
-char *
-PortableServer::ObjectId_to_string (const PortableServer::ObjectId &id)
-{
-  return TAO_POA::ObjectId_to_string (id);
-}
-
-CORBA::WChar *
-PortableServer::ObjectId_to_wstring (const PortableServer::ObjectId &id)
-{
-  return TAO_POA::ObjectId_to_wstring (id);
-}
-
-PortableServer::ObjectId *
-PortableServer::string_to_ObjectId (const char *id)
-{
-  return TAO_POA::string_to_ObjectId (id);
-}
-
-PortableServer::ObjectId *
-PortableServer::wstring_to_ObjectId (const CORBA::WChar *id)
-{
-  return TAO_POA::wstring_to_ObjectId (id);
-}
diff --git a/TAO/tao/POAC.h b/TAO/tao/POAC.h
deleted file mode 100644
index 10f1fce53d2..00000000000
--- a/TAO/tao/POAC.h
+++ /dev/null
@@ -1,2407 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    POAC.h
-//
-// = DESCRIPTION
-//
-//    POA stubs. This code generated by the The ACE ORB (TAO) IDL
-//    Compiler and is not meant to be read.
-//
-// ============================================================================
-
-#ifndef TAO_IDL_POAC_H
-#define TAO_IDL_POAC_H
-
-#include "tao/PolicyC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CurrentC.h"
-#include "tao/Exception.h"
-#include "tao/Environment.h"
-#include "tao/CDR.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class TAO_ServantBase;
-class TAO_ServantBase_var;
-class TAO_RefCountServantBase;
-class TAO_Local_ServantBase;
-class TAO_DynamicImplementation;
-
-TAO_NAMESPACE PortableServer{
-
-  typedef TAO_ServantBase ServantBase;
-  typedef TAO_ServantBase_var ServantBase_var;
-  typedef TAO_RefCountServantBase RefCountServantBase;
-  typedef ServantBase *Servant;
-
-  typedef TAO_Local_ServantBase LocalServantBase;
-  typedef TAO_DynamicImplementation DynamicImplementation;
-
-
-  class POA;
-
-#if !defined (_PORTABLESERVER_POA___PTR_CH_)
-#define _PORTABLESERVER_POA___PTR_CH_
-
-  typedef POA *POA_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_PORTABLESERVER_POA___VAR_CH_)
-#define _PORTABLESERVER_POA___VAR_CH_
-
-  class TAO_Export POA_var
-  {
-  public:
-    POA_var (void); // default constructor
-    POA_var (POA_ptr);
-    POA_var (const POA_var &); // copy constructor
-    ~POA_var (void); // destructor
-
-    POA_var &operator= (POA_ptr);
-    POA_var &operator= (const POA_var &);
-    POA_ptr operator-> (void) const;
-
-    operator const POA_ptr &() const;
-    operator POA_ptr &();
-    // in, inout, out, _retn
-    POA_ptr in (void) const;
-    POA_ptr &inout (void);
-    POA_ptr &out (void);
-    POA_ptr _retn (void);
-    POA_ptr ptr (void) const;
-
-  private:
-    POA_ptr ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_POA___OUT_CH_)
-#define _PORTABLESERVER_POA___OUT_CH_
-
-  class TAO_Export POA_out
-  {
-  public:
-    POA_out (POA_ptr &);
-    POA_out (POA_var &);
-    POA_out (const POA_out &);
-    POA_out &operator= (POA_out &);
-    POA_out &operator= (const POA_var &);
-    POA_out &operator= (POA_ptr);
-    operator POA_ptr &();
-    POA_ptr &ptr (void);
-    POA_ptr operator-> (void);
-
-  private:
-    POA_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER__TAO_SEQ_OCTET_CH_)
-#define _PORTABLESERVER__TAO_SEQ_OCTET_CH_
-
-  // *************************************************************
-  // _tao_seq_Octet
-  // *************************************************************
-
-  typedef TAO_Unbounded_Sequence<CORBA::Octet > _tao_seq_Octet;
-  typedef _tao_seq_Octet* _tao_seq_Octet_ptr;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc__tao_seq_Octet;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER__TAO_SEQ_OCTET___VAR_CH_)
-#define _PORTABLESERVER__TAO_SEQ_OCTET___VAR_CH_
-
-  // *************************************************************
-  // class PortableServer::_tao_seq_Octet_var
-  // *************************************************************
-
-  class TAO_Export _tao_seq_Octet_var
-  {
-  public:
-    _tao_seq_Octet_var (void); // default constructor
-    _tao_seq_Octet_var (_tao_seq_Octet *);
-    _tao_seq_Octet_var (const _tao_seq_Octet_var &); // copy constructor
-    ~_tao_seq_Octet_var (void); // destructor
-
-    _tao_seq_Octet_var &operator= (_tao_seq_Octet *);
-    _tao_seq_Octet_var &operator= (const _tao_seq_Octet_var &);
-    _tao_seq_Octet *operator-> (void);
-    const _tao_seq_Octet *operator-> (void) const;
-
-    operator const _tao_seq_Octet &() const;
-    operator _tao_seq_Octet &();
-    operator _tao_seq_Octet &() const;
-    CORBA::Octet &operator[] (CORBA::ULong slot);
-    // in, inout, out, _retn
-    const _tao_seq_Octet &in (void) const;
-    _tao_seq_Octet &inout (void);
-    _tao_seq_Octet *&out (void);
-    _tao_seq_Octet *_retn (void);
-    _tao_seq_Octet *ptr (void) const;
-
-  private:
-    _tao_seq_Octet *ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER__TAO_SEQ_OCTET___OUT_CH_)
-#define _PORTABLESERVER__TAO_SEQ_OCTET___OUT_CH_
-
-  class TAO_Export _tao_seq_Octet_out
-  {
-  public:
-    _tao_seq_Octet_out (_tao_seq_Octet *&);
-    _tao_seq_Octet_out (_tao_seq_Octet_var &);
-    _tao_seq_Octet_out (const _tao_seq_Octet_out &);
-    _tao_seq_Octet_out &operator= (_tao_seq_Octet_out &);
-    _tao_seq_Octet_out &operator= (_tao_seq_Octet *);
-    operator _tao_seq_Octet *&();
-    _tao_seq_Octet *&ptr (void);
-    _tao_seq_Octet *operator-> (void);
-    CORBA::Octet &operator[] (CORBA::ULong slot);
-
-  private:
-    _tao_seq_Octet *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const _tao_seq_Octet_var &);
-  };
-
-#endif /* end #if !defined */
-
-  typedef _tao_seq_Octet ObjectId;
-  typedef _tao_seq_Octet_var ObjectId_var;
-  typedef _tao_seq_Octet_out ObjectId_out;
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ObjectId;
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#if !defined (_PORTABLESERVER_FORWARDREQUEST___PTR_CH_)
-#define _PORTABLESERVER_FORWARDREQUEST___PTR_CH_
-
-  class ForwardRequest;
-  typedef ForwardRequest *ForwardRequest_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_PORTABLESERVER_FORWARDREQUEST_CH_)
-#define _PORTABLESERVER_FORWARDREQUEST_CH_
-
-  class TAO_Export ForwardRequest : public CORBA_UserException
-  {
-  public:
-    ForwardRequest (void); // default ctor
-    ForwardRequest (const ForwardRequest &); // copy ctor
-    ~ForwardRequest (void); // dtor
-    ForwardRequest &operator= (const ForwardRequest &);
-    virtual void _raise (void);
-
-    static ForwardRequest *_narrow (CORBA::Exception *);
-
-    ForwardRequest(
-        const CORBA::Object_ptr  _tao_forward_reference
-      );
-
-    CORBA::Object_var forward_reference;
-
-    // = TAO extension
-    static CORBA::Exception *_alloc (void);
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef ForwardRequest_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
-  }; // exception PortableServer::ForwardRequest
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ForwardRequest;
-
-
-#endif /* end #if !defined */
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong THREAD_POLICY_ID;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong LIFESPAN_POLICY_ID;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong ID_UNIQUENESS_POLICY_ID;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong ID_ASSIGNMENT_POLICY_ID;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong IMPLICIT_ACTIVATION_POLICY_ID;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong SERVANT_RETENTION_POLICY_ID;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REQUEST_PROCESSING_POLICY_ID;
-
-  enum ThreadPolicyValue
-  {
-    ORB_CTRL_MODEL,
-    SINGLE_THREAD_MODEL
-  };
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  typedef ThreadPolicyValue &ThreadPolicyValue_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ThreadPolicyValue;
-
-
-#if !defined (_PORTABLESERVER_THREADPOLICY___PTR_CH_)
-#define _PORTABLESERVER_THREADPOLICY___PTR_CH_
-
-  class ThreadPolicy;
-  typedef ThreadPolicy *ThreadPolicy_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_THREADPOLICY___VAR_CH_)
-#define _PORTABLESERVER_THREADPOLICY___VAR_CH_
-
-  class TAO_Export ThreadPolicy_var
-  {
-  public:
-    ThreadPolicy_var (void); // default constructor
-    ThreadPolicy_var (ThreadPolicy_ptr);
-    ThreadPolicy_var (const ThreadPolicy_var &); // copy constructor
-    ~ThreadPolicy_var (void); // destructor
-
-    ThreadPolicy_var &operator= (ThreadPolicy_ptr);
-    ThreadPolicy_var &operator= (const ThreadPolicy_var &);
-    ThreadPolicy_ptr operator-> (void) const;
-
-    operator const ThreadPolicy_ptr &() const;
-    operator ThreadPolicy_ptr &();
-    // in, inout, out, _retn
-    ThreadPolicy_ptr in (void) const;
-    ThreadPolicy_ptr &inout (void);
-    ThreadPolicy_ptr &out (void);
-    ThreadPolicy_ptr _retn (void);
-    ThreadPolicy_ptr ptr (void) const;
-
-  private:
-    ThreadPolicy_ptr ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_THREADPOLICY___OUT_CH_)
-#define _PORTABLESERVER_THREADPOLICY___OUT_CH_
-
-  class TAO_Export ThreadPolicy_out
-  {
-  public:
-    ThreadPolicy_out (ThreadPolicy_ptr &);
-    ThreadPolicy_out (ThreadPolicy_var &);
-    ThreadPolicy_out (const ThreadPolicy_out &);
-    ThreadPolicy_out &operator= (ThreadPolicy_out &);
-    ThreadPolicy_out &operator= (const ThreadPolicy_var &);
-    ThreadPolicy_out &operator= (ThreadPolicy_ptr);
-    operator ThreadPolicy_ptr &();
-    ThreadPolicy_ptr &ptr (void);
-    ThreadPolicy_ptr operator-> (void);
-
-  private:
-    ThreadPolicy_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_THREADPOLICY_CH_)
-#define _PORTABLESERVER_THREADPOLICY_CH_
-
-  class TAO_Export ThreadPolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef ThreadPolicy_ptr _ptr_type;
-    typedef ThreadPolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static ThreadPolicy_ptr _duplicate (ThreadPolicy_ptr obj);
-    static ThreadPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    static ThreadPolicy_ptr _nil (void);
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    virtual ThreadPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-#else
-    virtual ThreadPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    ThreadPolicy (TAO_Stub *objref = 0,
-                  TAO_ServantBase *servant = 0,
-                  CORBA::Boolean collocated = 0);
-  public:
-    virtual ~ThreadPolicy (void);
-  private:
-    ThreadPolicy (const ThreadPolicy&);
-    void operator= (const ThreadPolicy&);
-  };
-
-#endif /* end #if !defined */
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ThreadPolicy;
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  enum LifespanPolicyValue
-  {
-    TRANSIENT,
-    PERSISTENT
-  };
-  typedef LifespanPolicyValue &LifespanPolicyValue_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_LifespanPolicyValue;
-
-
-#if !defined (_PORTABLESERVER_LIFESPANPOLICY___PTR_CH_)
-#define _PORTABLESERVER_LIFESPANPOLICY___PTR_CH_
-
-  class LifespanPolicy;
-  typedef LifespanPolicy *LifespanPolicy_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_LIFESPANPOLICY___VAR_CH_)
-#define _PORTABLESERVER_LIFESPANPOLICY___VAR_CH_
-
-  class TAO_Export LifespanPolicy_var
-  {
-  public:
-    LifespanPolicy_var (void); // default constructor
-    LifespanPolicy_var (LifespanPolicy_ptr);
-    LifespanPolicy_var (const LifespanPolicy_var &); // copy constructor
-    ~LifespanPolicy_var (void); // destructor
-
-    LifespanPolicy_var &operator= (LifespanPolicy_ptr);
-    LifespanPolicy_var &operator= (const LifespanPolicy_var &);
-    LifespanPolicy_ptr operator-> (void) const;
-
-    operator const LifespanPolicy_ptr &() const;
-    operator LifespanPolicy_ptr &();
-    // in, inout, out, _retn
-    LifespanPolicy_ptr in (void) const;
-    LifespanPolicy_ptr &inout (void);
-    LifespanPolicy_ptr &out (void);
-    LifespanPolicy_ptr _retn (void);
-    LifespanPolicy_ptr ptr (void) const;
-
-  private:
-    LifespanPolicy_ptr ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_LIFESPANPOLICY___OUT_CH_)
-#define _PORTABLESERVER_LIFESPANPOLICY___OUT_CH_
-
-  class TAO_Export LifespanPolicy_out
-  {
-  public:
-    LifespanPolicy_out (LifespanPolicy_ptr &);
-    LifespanPolicy_out (LifespanPolicy_var &);
-    LifespanPolicy_out (const LifespanPolicy_out &);
-    LifespanPolicy_out &operator= (LifespanPolicy_out &);
-    LifespanPolicy_out &operator= (const LifespanPolicy_var &);
-    LifespanPolicy_out &operator= (LifespanPolicy_ptr);
-    operator LifespanPolicy_ptr &();
-    LifespanPolicy_ptr &ptr (void);
-    LifespanPolicy_ptr operator-> (void);
-
-  private:
-    LifespanPolicy_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_LIFESPANPOLICY_CH_)
-#define _PORTABLESERVER_LIFESPANPOLICY_CH_
-
-  class TAO_Export LifespanPolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef LifespanPolicy_ptr _ptr_type;
-    typedef LifespanPolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static LifespanPolicy_ptr _duplicate (LifespanPolicy_ptr obj);
-    static LifespanPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    static LifespanPolicy_ptr _nil (void);
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    virtual LifespanPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-#else
-    virtual LifespanPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    LifespanPolicy (
-                    TAO_Stub *objref = 0,
-                    TAO_ServantBase *servant = 0,
-                    CORBA::Boolean collocated = 0
-                    );
-  public:
-    virtual ~LifespanPolicy (void);
-  private:
-    LifespanPolicy (const LifespanPolicy&);
-    void operator= (const LifespanPolicy&);
-  };
-
-#endif /* end #if !defined */
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_LifespanPolicy;
-
-  enum IdUniquenessPolicyValue
-  {
-    UNIQUE_ID,
-    MULTIPLE_ID
-  };
-  typedef IdUniquenessPolicyValue &IdUniquenessPolicyValue_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IdUniquenessPolicyValue;
-
-
-#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___PTR_CH_)
-#define _PORTABLESERVER_IDUNIQUENESSPOLICY___PTR_CH_
-
-  class IdUniquenessPolicy;
-  typedef IdUniquenessPolicy *IdUniquenessPolicy_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___VAR_CH_)
-#define _PORTABLESERVER_IDUNIQUENESSPOLICY___VAR_CH_
-
-  class TAO_Export IdUniquenessPolicy_var
-  {
-  public:
-    IdUniquenessPolicy_var (void); // default constructor
-    IdUniquenessPolicy_var (IdUniquenessPolicy_ptr);
-    IdUniquenessPolicy_var (const IdUniquenessPolicy_var &); // copy constructor
-    ~IdUniquenessPolicy_var (void); // destructor
-
-    IdUniquenessPolicy_var &operator= (IdUniquenessPolicy_ptr);
-    IdUniquenessPolicy_var &operator= (const IdUniquenessPolicy_var &);
-    IdUniquenessPolicy_ptr operator-> (void) const;
-
-    operator const IdUniquenessPolicy_ptr &() const;
-    operator IdUniquenessPolicy_ptr &();
-    // in, inout, out, _retn
-    IdUniquenessPolicy_ptr in (void) const;
-    IdUniquenessPolicy_ptr &inout (void);
-    IdUniquenessPolicy_ptr &out (void);
-    IdUniquenessPolicy_ptr _retn (void);
-    IdUniquenessPolicy_ptr ptr (void) const;
-
-  private:
-    IdUniquenessPolicy_ptr ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___OUT_CH_)
-#define _PORTABLESERVER_IDUNIQUENESSPOLICY___OUT_CH_
-
-  class TAO_Export IdUniquenessPolicy_out
-  {
-  public:
-    IdUniquenessPolicy_out (IdUniquenessPolicy_ptr &);
-    IdUniquenessPolicy_out (IdUniquenessPolicy_var &);
-    IdUniquenessPolicy_out (const IdUniquenessPolicy_out &);
-    IdUniquenessPolicy_out &operator= (IdUniquenessPolicy_out &);
-    IdUniquenessPolicy_out &operator= (const IdUniquenessPolicy_var &);
-    IdUniquenessPolicy_out &operator= (IdUniquenessPolicy_ptr);
-    operator IdUniquenessPolicy_ptr &();
-    IdUniquenessPolicy_ptr &ptr (void);
-    IdUniquenessPolicy_ptr operator-> (void);
-
-  private:
-    IdUniquenessPolicy_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY_CH_)
-#define _PORTABLESERVER_IDUNIQUENESSPOLICY_CH_
-
-  class TAO_Export IdUniquenessPolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef IdUniquenessPolicy_ptr _ptr_type;
-    typedef IdUniquenessPolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static IdUniquenessPolicy_ptr _duplicate (IdUniquenessPolicy_ptr obj);
-    static IdUniquenessPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    static IdUniquenessPolicy_ptr _nil (void);
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    virtual IdUniquenessPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-#else
-    virtual IdUniquenessPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    IdUniquenessPolicy (
-                        TAO_Stub *objref = 0,
-                        TAO_ServantBase *servant = 0,
-                        CORBA::Boolean collocated = 0
-                        );
-  public:
-    virtual ~IdUniquenessPolicy (void);
-  private:
-    IdUniquenessPolicy (const IdUniquenessPolicy&);
-    void operator= (const IdUniquenessPolicy&);
-  };
-
-#endif /* end #if !defined */
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IdUniquenessPolicy;
-
-  enum IdAssignmentPolicyValue
-  {
-    USER_ID,
-    SYSTEM_ID
-  };
-  typedef IdAssignmentPolicyValue &IdAssignmentPolicyValue_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IdAssignmentPolicyValue;
-
-
-#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___PTR_CH_)
-#define _PORTABLESERVER_IDASSIGNMENTPOLICY___PTR_CH_
-
-  class IdAssignmentPolicy;
-  typedef IdAssignmentPolicy *IdAssignmentPolicy_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___VAR_CH_)
-#define _PORTABLESERVER_IDASSIGNMENTPOLICY___VAR_CH_
-
-  class TAO_Export IdAssignmentPolicy_var
-  {
-  public:
-    IdAssignmentPolicy_var (void); // default constructor
-    IdAssignmentPolicy_var (IdAssignmentPolicy_ptr);
-    IdAssignmentPolicy_var (const IdAssignmentPolicy_var &); // copy constructor
-    ~IdAssignmentPolicy_var (void); // destructor
-
-    IdAssignmentPolicy_var &operator= (IdAssignmentPolicy_ptr);
-    IdAssignmentPolicy_var &operator= (const IdAssignmentPolicy_var &);
-    IdAssignmentPolicy_ptr operator-> (void) const;
-
-    operator const IdAssignmentPolicy_ptr &() const;
-    operator IdAssignmentPolicy_ptr &();
-    // in, inout, out, _retn
-    IdAssignmentPolicy_ptr in (void) const;
-    IdAssignmentPolicy_ptr &inout (void);
-    IdAssignmentPolicy_ptr &out (void);
-    IdAssignmentPolicy_ptr _retn (void);
-    IdAssignmentPolicy_ptr ptr (void) const;
-
-  private:
-    IdAssignmentPolicy_ptr ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___OUT_CH_)
-#define _PORTABLESERVER_IDASSIGNMENTPOLICY___OUT_CH_
-
-  class TAO_Export IdAssignmentPolicy_out
-  {
-  public:
-    IdAssignmentPolicy_out (IdAssignmentPolicy_ptr &);
-    IdAssignmentPolicy_out (IdAssignmentPolicy_var &);
-    IdAssignmentPolicy_out (const IdAssignmentPolicy_out &);
-    IdAssignmentPolicy_out &operator= (IdAssignmentPolicy_out &);
-    IdAssignmentPolicy_out &operator= (const IdAssignmentPolicy_var &);
-    IdAssignmentPolicy_out &operator= (IdAssignmentPolicy_ptr);
-    operator IdAssignmentPolicy_ptr &();
-    IdAssignmentPolicy_ptr &ptr (void);
-    IdAssignmentPolicy_ptr operator-> (void);
-
-  private:
-    IdAssignmentPolicy_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY_CH_)
-#define _PORTABLESERVER_IDASSIGNMENTPOLICY_CH_
-
-  class TAO_Export IdAssignmentPolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef IdAssignmentPolicy_ptr _ptr_type;
-    typedef IdAssignmentPolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static IdAssignmentPolicy_ptr _duplicate (IdAssignmentPolicy_ptr obj);
-    static IdAssignmentPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    static IdAssignmentPolicy_ptr _nil (void);
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    virtual IdAssignmentPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-#else
-    virtual IdAssignmentPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    IdAssignmentPolicy (
-                        TAO_Stub *objref = 0,
-                        TAO_ServantBase *servant = 0,
-                        CORBA::Boolean collocated = 0
-                        );
-  public:
-    virtual ~IdAssignmentPolicy (void);
-  private:
-    IdAssignmentPolicy (const IdAssignmentPolicy&);
-    void operator= (const IdAssignmentPolicy&);
-  };
-
-#endif /* end #if !defined */
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IdAssignmentPolicy;
-
-  enum ImplicitActivationPolicyValue
-  {
-    IMPLICIT_ACTIVATION,
-    NO_IMPLICIT_ACTIVATION
-  };
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  typedef ImplicitActivationPolicyValue &ImplicitActivationPolicyValue_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ImplicitActivationPolicyValue;
-
-
-#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___PTR_CH_)
-#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___PTR_CH_
-
-  class ImplicitActivationPolicy;
-  typedef ImplicitActivationPolicy *ImplicitActivationPolicy_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___VAR_CH_)
-#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___VAR_CH_
-
-  class TAO_Export ImplicitActivationPolicy_var
-  {
-  public:
-    ImplicitActivationPolicy_var (void); // default constructor
-    ImplicitActivationPolicy_var (ImplicitActivationPolicy_ptr);
-    ImplicitActivationPolicy_var (const ImplicitActivationPolicy_var &); // copy constructor
-    ~ImplicitActivationPolicy_var (void); // destructor
-
-    ImplicitActivationPolicy_var &operator= (ImplicitActivationPolicy_ptr);
-    ImplicitActivationPolicy_var &operator= (const ImplicitActivationPolicy_var &);
-    ImplicitActivationPolicy_ptr operator-> (void) const;
-
-    operator const ImplicitActivationPolicy_ptr &() const;
-    operator ImplicitActivationPolicy_ptr &();
-    // in, inout, out, _retn
-    ImplicitActivationPolicy_ptr in (void) const;
-    ImplicitActivationPolicy_ptr &inout (void);
-    ImplicitActivationPolicy_ptr &out (void);
-    ImplicitActivationPolicy_ptr _retn (void);
-    ImplicitActivationPolicy_ptr ptr (void) const;
-
-  private:
-    ImplicitActivationPolicy_ptr ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___OUT_CH_)
-#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___OUT_CH_
-
-  class TAO_Export ImplicitActivationPolicy_out
-  {
-  public:
-    ImplicitActivationPolicy_out (ImplicitActivationPolicy_ptr &);
-    ImplicitActivationPolicy_out (ImplicitActivationPolicy_var &);
-    ImplicitActivationPolicy_out (const ImplicitActivationPolicy_out &);
-    ImplicitActivationPolicy_out &operator= (ImplicitActivationPolicy_out &);
-    ImplicitActivationPolicy_out &operator= (const ImplicitActivationPolicy_var &);
-    ImplicitActivationPolicy_out &operator= (ImplicitActivationPolicy_ptr);
-    operator ImplicitActivationPolicy_ptr &();
-    ImplicitActivationPolicy_ptr &ptr (void);
-    ImplicitActivationPolicy_ptr operator-> (void);
-
-  private:
-    ImplicitActivationPolicy_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY_CH_)
-#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY_CH_
-
-  class TAO_Export ImplicitActivationPolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef ImplicitActivationPolicy_ptr _ptr_type;
-    typedef ImplicitActivationPolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static ImplicitActivationPolicy_ptr _duplicate (ImplicitActivationPolicy_ptr obj);
-    static ImplicitActivationPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    static ImplicitActivationPolicy_ptr _nil (void);
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    virtual ImplicitActivationPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-#else
-    virtual ImplicitActivationPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    ImplicitActivationPolicy (
-                              TAO_Stub *objref = 0,
-                              TAO_ServantBase *servant = 0,
-                              CORBA::Boolean collocated = 0
-                              );
-  public:
-    virtual ~ImplicitActivationPolicy (void);
-  private:
-    ImplicitActivationPolicy (const ImplicitActivationPolicy&);
-    void operator= (const ImplicitActivationPolicy&);
-  };
-
-#endif /* end #if !defined */
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ImplicitActivationPolicy;
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  enum ServantRetentionPolicyValue
-  {
-    RETAIN,
-    NON_RETAIN
-  };
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  typedef ServantRetentionPolicyValue &ServantRetentionPolicyValue_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServantRetentionPolicyValue;
-
-
-#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___PTR_CH_)
-#define _PORTABLESERVER_SERVANTRETENTIONPOLICY___PTR_CH_
-
-  class ServantRetentionPolicy;
-  typedef ServantRetentionPolicy *ServantRetentionPolicy_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___VAR_CH_)
-#define _PORTABLESERVER_SERVANTRETENTIONPOLICY___VAR_CH_
-
-  class TAO_Export ServantRetentionPolicy_var
-  {
-  public:
-    ServantRetentionPolicy_var (void); // default constructor
-    ServantRetentionPolicy_var (ServantRetentionPolicy_ptr);
-    ServantRetentionPolicy_var (const ServantRetentionPolicy_var &); // copy constructor
-    ~ServantRetentionPolicy_var (void); // destructor
-
-    ServantRetentionPolicy_var &operator= (ServantRetentionPolicy_ptr);
-    ServantRetentionPolicy_var &operator= (const ServantRetentionPolicy_var &);
-    ServantRetentionPolicy_ptr operator-> (void) const;
-
-    operator const ServantRetentionPolicy_ptr &() const;
-    operator ServantRetentionPolicy_ptr &();
-    // in, inout, out, _retn
-    ServantRetentionPolicy_ptr in (void) const;
-    ServantRetentionPolicy_ptr &inout (void);
-    ServantRetentionPolicy_ptr &out (void);
-    ServantRetentionPolicy_ptr _retn (void);
-    ServantRetentionPolicy_ptr ptr (void) const;
-
-  private:
-    ServantRetentionPolicy_ptr ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___OUT_CH_)
-#define _PORTABLESERVER_SERVANTRETENTIONPOLICY___OUT_CH_
-
-  class TAO_Export ServantRetentionPolicy_out
-  {
-  public:
-    ServantRetentionPolicy_out (ServantRetentionPolicy_ptr &);
-    ServantRetentionPolicy_out (ServantRetentionPolicy_var &);
-    ServantRetentionPolicy_out (const ServantRetentionPolicy_out &);
-    ServantRetentionPolicy_out &operator= (ServantRetentionPolicy_out &);
-    ServantRetentionPolicy_out &operator= (const ServantRetentionPolicy_var &);
-    ServantRetentionPolicy_out &operator= (ServantRetentionPolicy_ptr);
-    operator ServantRetentionPolicy_ptr &();
-    ServantRetentionPolicy_ptr &ptr (void);
-    ServantRetentionPolicy_ptr operator-> (void);
-
-  private:
-    ServantRetentionPolicy_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_)
-#define _PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_
-
-  class TAO_Export ServantRetentionPolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef ServantRetentionPolicy_ptr _ptr_type;
-    typedef ServantRetentionPolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static ServantRetentionPolicy_ptr _duplicate (ServantRetentionPolicy_ptr obj);
-    static ServantRetentionPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    static ServantRetentionPolicy_ptr _nil (void);
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    virtual ServantRetentionPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-#else
-    virtual ServantRetentionPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    ServantRetentionPolicy (
-                            TAO_Stub *objref = 0,
-                            TAO_ServantBase *servant = 0,
-                            CORBA::Boolean collocated = 0
-                            );
-  public:
-    virtual ~ServantRetentionPolicy (void);
-  private:
-    ServantRetentionPolicy (const ServantRetentionPolicy&);
-    void operator= (const ServantRetentionPolicy&);
-  };
-
-#endif /* end #if !defined */
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServantRetentionPolicy;
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  enum RequestProcessingPolicyValue
-  {
-    USE_ACTIVE_OBJECT_MAP_ONLY,
-    USE_DEFAULT_SERVANT,
-    USE_SERVANT_MANAGER
-  };
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  typedef RequestProcessingPolicyValue &RequestProcessingPolicyValue_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RequestProcessingPolicyValue;
-
-
-#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___PTR_CH_)
-#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___PTR_CH_
-
-  class RequestProcessingPolicy;
-  typedef RequestProcessingPolicy *RequestProcessingPolicy_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___VAR_CH_)
-#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___VAR_CH_
-
-  class TAO_Export RequestProcessingPolicy_var
-  {
-  public:
-    RequestProcessingPolicy_var (void); // default constructor
-    RequestProcessingPolicy_var (RequestProcessingPolicy_ptr);
-    RequestProcessingPolicy_var (const RequestProcessingPolicy_var &); // copy constructor
-    ~RequestProcessingPolicy_var (void); // destructor
-
-    RequestProcessingPolicy_var &operator= (RequestProcessingPolicy_ptr);
-    RequestProcessingPolicy_var &operator= (const RequestProcessingPolicy_var &);
-    RequestProcessingPolicy_ptr operator-> (void) const;
-
-    operator const RequestProcessingPolicy_ptr &() const;
-    operator RequestProcessingPolicy_ptr &();
-    // in, inout, out, _retn
-    RequestProcessingPolicy_ptr in (void) const;
-    RequestProcessingPolicy_ptr &inout (void);
-    RequestProcessingPolicy_ptr &out (void);
-    RequestProcessingPolicy_ptr _retn (void);
-    RequestProcessingPolicy_ptr ptr (void) const;
-
-  private:
-    RequestProcessingPolicy_ptr ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___OUT_CH_)
-#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___OUT_CH_
-
-  class TAO_Export RequestProcessingPolicy_out
-  {
-  public:
-    RequestProcessingPolicy_out (RequestProcessingPolicy_ptr &);
-    RequestProcessingPolicy_out (RequestProcessingPolicy_var &);
-    RequestProcessingPolicy_out (const RequestProcessingPolicy_out &);
-    RequestProcessingPolicy_out &operator= (RequestProcessingPolicy_out &);
-    RequestProcessingPolicy_out &operator= (const RequestProcessingPolicy_var &);
-    RequestProcessingPolicy_out &operator= (RequestProcessingPolicy_ptr);
-    operator RequestProcessingPolicy_ptr &();
-    RequestProcessingPolicy_ptr &ptr (void);
-    RequestProcessingPolicy_ptr operator-> (void);
-
-  private:
-    RequestProcessingPolicy_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_)
-#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_
-
-  class TAO_Export RequestProcessingPolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef RequestProcessingPolicy_ptr _ptr_type;
-    typedef RequestProcessingPolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static RequestProcessingPolicy_ptr _duplicate (RequestProcessingPolicy_ptr obj);
-    static RequestProcessingPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    static RequestProcessingPolicy_ptr _nil (void);
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    virtual RequestProcessingPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-#else
-    virtual RequestProcessingPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    RequestProcessingPolicy (
-                             TAO_Stub *objref = 0,
-                             TAO_ServantBase *servant = 0,
-                             CORBA::Boolean collocated = 0
-                             );
-  public:
-    virtual ~RequestProcessingPolicy (void);
-  private:
-    RequestProcessingPolicy (const RequestProcessingPolicy&);
-    void operator= (const RequestProcessingPolicy&);
-  };
-
-#endif /* end #if !defined */
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RequestProcessingPolicy;
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#if !defined (_PORTABLESERVER_POAMANAGER___PTR_CH_)
-#define _PORTABLESERVER_POAMANAGER___PTR_CH_
-
-  class POAManager;
-  typedef POAManager *POAManager_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_POAMANAGER___VAR_CH_)
-#define _PORTABLESERVER_POAMANAGER___VAR_CH_
-
-  class TAO_Export POAManager_var
-  {
-  public:
-    POAManager_var (void); // default constructor
-    POAManager_var (POAManager_ptr);
-    POAManager_var (const POAManager_var &); // copy constructor
-    ~POAManager_var (void); // destructor
-
-    POAManager_var &operator= (POAManager_ptr);
-    POAManager_var &operator= (const POAManager_var &);
-    POAManager_ptr operator-> (void) const;
-
-    operator const POAManager_ptr &() const;
-    operator POAManager_ptr &();
-    // in, inout, out, _retn
-    POAManager_ptr in (void) const;
-    POAManager_ptr &inout (void);
-    POAManager_ptr &out (void);
-    POAManager_ptr _retn (void);
-    POAManager_ptr ptr (void) const;
-
-  private:
-    POAManager_ptr ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_POAMANAGER___OUT_CH_)
-#define _PORTABLESERVER_POAMANAGER___OUT_CH_
-
-  class TAO_Export POAManager_out
-  {
-  public:
-    POAManager_out (POAManager_ptr &);
-    POAManager_out (POAManager_var &);
-    POAManager_out (const POAManager_out &);
-    POAManager_out &operator= (POAManager_out &);
-    POAManager_out &operator= (const POAManager_var &);
-    POAManager_out &operator= (POAManager_ptr);
-    operator POAManager_ptr &();
-    POAManager_ptr &ptr (void);
-    POAManager_ptr operator-> (void);
-
-  private:
-    POAManager_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_POAMANAGER_CH_)
-#define _PORTABLESERVER_POAMANAGER_CH_
-
-  class TAO_Export POAManager: public virtual ACE_CORBA_1 (Object)
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef POAManager_ptr _ptr_type;
-    typedef POAManager_var _var_type;
-  #endif /* __GNUC__ */
-
-    enum State {
-      HOLDING,
-      ACTIVE,
-      DISCARDING,
-      INACTIVE
-    };
-
-    // the static operations
-    static POAManager_ptr _duplicate (POAManager_ptr obj);
-    static POAManager_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    static POAManager_ptr _nil (void);
-
-
-#if !defined (_PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE___PTR_CH_)
-#define _PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE___PTR_CH_
-
-    class AdapterInactive;
-    typedef AdapterInactive *AdapterInactive_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE_CH_)
-#define _PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE_CH_
-
-    class TAO_Export AdapterInactive : public CORBA_UserException
-    {
-    public:
-      AdapterInactive (void); // default ctor
-      AdapterInactive (const AdapterInactive &); // copy ctor
-      ~AdapterInactive (void); // dtor
-      AdapterInactive &operator= (const AdapterInactive &);
-      virtual void _raise (void);
-      static AdapterInactive *_narrow (CORBA::Exception *);
-
-      // = TAO extension
-      static CORBA::Exception *_alloc (void);
-    }; // exception PortableServer::POAManager::AdapterInactive
-
-    friend void operator<<= (CORBA::Any &, const AdapterInactive &); // copying version
-    friend void operator<<= (CORBA::Any &, AdapterInactive*); // noncopying version
-    friend CORBA::Boolean operator>>= (const CORBA::Any &, AdapterInactive *&);
-    static CORBA::TypeCode_ptr _tc_AdapterInactive;
-
-#endif /* end #if !defined */
-
-    virtual void  activate (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-    virtual void  hold_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-    virtual void  discard_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-    virtual void  deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-    virtual State get_state (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    POAManager (
-                TAO_Stub *objref = 0,
-                TAO_ServantBase *servant = 0,
-                CORBA::Boolean collocated = 0
-                );
-  public:
-    virtual ~POAManager (void);
-  private:
-    POAManager (const POAManager&);
-    void operator= (const POAManager&);
-  };
-
-#endif /* end #if !defined */
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_POAManager;
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___PTR_CH_)
-#define _PORTABLESERVER_ADAPTERACTIVATOR___PTR_CH_
-
-  class AdapterActivator;
-  typedef AdapterActivator *AdapterActivator_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___VAR_CH_)
-#define _PORTABLESERVER_ADAPTERACTIVATOR___VAR_CH_
-
-  class TAO_Export AdapterActivator_var
-  {
-  public:
-    AdapterActivator_var (void); // default constructor
-    AdapterActivator_var (AdapterActivator_ptr);
-    AdapterActivator_var (const AdapterActivator_var &); // copy constructor
-    ~AdapterActivator_var (void); // destructor
-
-    AdapterActivator_var &operator= (AdapterActivator_ptr);
-    AdapterActivator_var &operator= (const AdapterActivator_var &);
-    AdapterActivator_ptr operator-> (void) const;
-
-    operator const AdapterActivator_ptr &() const;
-    operator AdapterActivator_ptr &();
-    // in, inout, out, _retn
-    AdapterActivator_ptr in (void) const;
-    AdapterActivator_ptr &inout (void);
-    AdapterActivator_ptr &out (void);
-    AdapterActivator_ptr _retn (void);
-    AdapterActivator_ptr ptr (void) const;
-
-  private:
-    AdapterActivator_ptr ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___OUT_CH_)
-#define _PORTABLESERVER_ADAPTERACTIVATOR___OUT_CH_
-
-  class TAO_Export AdapterActivator_out
-  {
-  public:
-    AdapterActivator_out (AdapterActivator_ptr &);
-    AdapterActivator_out (AdapterActivator_var &);
-    AdapterActivator_out (const AdapterActivator_out &);
-    AdapterActivator_out &operator= (AdapterActivator_out &);
-    AdapterActivator_out &operator= (const AdapterActivator_var &);
-    AdapterActivator_out &operator= (AdapterActivator_ptr);
-    operator AdapterActivator_ptr &();
-    AdapterActivator_ptr &ptr (void);
-    AdapterActivator_ptr operator-> (void);
-
-  private:
-    AdapterActivator_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR_CH_)
-#define _PORTABLESERVER_ADAPTERACTIVATOR_CH_
-
-  class TAO_Export AdapterActivator: public virtual ACE_CORBA_1 (Object)
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef AdapterActivator_ptr _ptr_type;
-    typedef AdapterActivator_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static AdapterActivator_ptr _duplicate (AdapterActivator_ptr obj);
-    static AdapterActivator_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    static AdapterActivator_ptr _nil (void);
-
-    virtual CORBA::Boolean  unknown_adapter (POA_ptr parent, const char *name, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    AdapterActivator (
-                      TAO_Stub *objref = 0,
-                      TAO_ServantBase *servant = 0,
-                      CORBA::Boolean collocated = 0
-                      );
-  public:
-    virtual ~AdapterActivator (void);
-  private:
-    AdapterActivator (const AdapterActivator&);
-    void operator= (const AdapterActivator&);
-  };
-
-#endif /* end #if !defined */
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AdapterActivator;
-
-
-#if !defined (_PORTABLESERVER_SERVANTMANAGER___PTR_CH_)
-#define _PORTABLESERVER_SERVANTMANAGER___PTR_CH_
-
-  class ServantManager;
-  typedef ServantManager *ServantManager_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_SERVANTMANAGER___VAR_CH_)
-#define _PORTABLESERVER_SERVANTMANAGER___VAR_CH_
-
-  class TAO_Export ServantManager_var
-  {
-  public:
-    ServantManager_var (void); // default constructor
-    ServantManager_var (ServantManager_ptr);
-    ServantManager_var (const ServantManager_var &); // copy constructor
-    ~ServantManager_var (void); // destructor
-
-    ServantManager_var &operator= (ServantManager_ptr);
-    ServantManager_var &operator= (const ServantManager_var &);
-    ServantManager_ptr operator-> (void) const;
-
-    operator const ServantManager_ptr &() const;
-    operator ServantManager_ptr &();
-    // in, inout, out, _retn
-    ServantManager_ptr in (void) const;
-    ServantManager_ptr &inout (void);
-    ServantManager_ptr &out (void);
-    ServantManager_ptr _retn (void);
-    ServantManager_ptr ptr (void) const;
-
-  private:
-    ServantManager_ptr ptr_;
-  };
-
-#endif /* end #if !defined */
-
-
-#if !defined (_PORTABLESERVER_SERVANTMANAGER___OUT_CH_)
-#define _PORTABLESERVER_SERVANTMANAGER___OUT_CH_
-
-  class TAO_Export ServantManager_out
-  {
-  public:
-    ServantManager_out (ServantManager_ptr &);
-    ServantManager_out (ServantManager_var &);
-    ServantManager_out (const ServantManager_out &);
-    ServantManager_out &operator= (ServantManager_out &);
-    ServantManager_out &operator= (const ServantManager_var &);
-    ServantManager_out &operator= (ServantManager_ptr);
-    operator ServantManager_ptr &();
-    ServantManager_ptr &ptr (void);
-    ServantManager_ptr operator-> (void);
-
-  private:
-    ServantManager_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_SERVANTMANAGER_CH_)
-#define _PORTABLESERVER_SERVANTMANAGER_CH_
-
-  class TAO_Export ServantManager: public virtual ACE_CORBA_1 (Object)
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef ServantManager_ptr _ptr_type;
-    typedef ServantManager_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static ServantManager_ptr _duplicate (ServantManager_ptr obj);
-    static ServantManager_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    static ServantManager_ptr _nil (void);
-
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    ServantManager (
-                    TAO_Stub *objref = 0,
-                    TAO_ServantBase *servant = 0,
-                    CORBA::Boolean collocated = 0
-                    );
-  public:
-    virtual ~ServantManager (void);
-  private:
-    ServantManager (const ServantManager&);
-    void operator= (const ServantManager&);
-  };
-
-#endif /* end #if !defined */
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServantManager;
-
-
-#if !defined (_PORTABLESERVER_SERVANTACTIVATOR___PTR_CH_)
-#define _PORTABLESERVER_SERVANTACTIVATOR___PTR_CH_
-
-  class ServantActivator;
-  typedef ServantActivator *ServantActivator_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_SERVANTACTIVATOR___VAR_CH_)
-#define _PORTABLESERVER_SERVANTACTIVATOR___VAR_CH_
-
-  class TAO_Export ServantActivator_var
-  {
-  public:
-    ServantActivator_var (void); // default constructor
-    ServantActivator_var (ServantActivator_ptr);
-    ServantActivator_var (const ServantActivator_var &); // copy constructor
-    ~ServantActivator_var (void); // destructor
-
-    ServantActivator_var &operator= (ServantActivator_ptr);
-    ServantActivator_var &operator= (const ServantActivator_var &);
-    ServantActivator_ptr operator-> (void) const;
-
-    operator const ServantActivator_ptr &() const;
-    operator ServantActivator_ptr &();
-    // in, inout, out, _retn
-    ServantActivator_ptr in (void) const;
-    ServantActivator_ptr &inout (void);
-    ServantActivator_ptr &out (void);
-    ServantActivator_ptr _retn (void);
-    ServantActivator_ptr ptr (void) const;
-
-  private:
-    ServantActivator_ptr ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_SERVANTACTIVATOR___OUT_CH_)
-#define _PORTABLESERVER_SERVANTACTIVATOR___OUT_CH_
-
-  class TAO_Export ServantActivator_out
-  {
-  public:
-    ServantActivator_out (ServantActivator_ptr &);
-    ServantActivator_out (ServantActivator_var &);
-    ServantActivator_out (const ServantActivator_out &);
-    ServantActivator_out &operator= (ServantActivator_out &);
-    ServantActivator_out &operator= (const ServantActivator_var &);
-    ServantActivator_out &operator= (ServantActivator_ptr);
-    operator ServantActivator_ptr &();
-    ServantActivator_ptr &ptr (void);
-    ServantActivator_ptr operator-> (void);
-
-  private:
-    ServantActivator_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_SERVANTACTIVATOR_CH_)
-#define _PORTABLESERVER_SERVANTACTIVATOR_CH_
-
-  class TAO_Export ServantActivator: public virtual ServantManager
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef ServantActivator_ptr _ptr_type;
-    typedef ServantActivator_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static ServantActivator_ptr _duplicate (ServantActivator_ptr obj);
-    static ServantActivator_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    static ServantActivator_ptr _nil (void);
-
-    virtual Servant  incarnate (const ObjectId &oid, POA_ptr adapter, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-    virtual void  etherealize (const ObjectId &oid, POA_ptr adapter, Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    ServantActivator (
-                      TAO_Stub *objref = 0,
-                      TAO_ServantBase *servant = 0,
-                      CORBA::Boolean collocated = 0
-                      );
-  public:
-    virtual ~ServantActivator (void);
-  private:
-    ServantActivator (const ServantActivator&);
-    void operator= (const ServantActivator&);
-  };
-
-#endif /* end #if !defined */
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServantActivator;
-
-
-#if !defined (_PORTABLESERVER_SERVANTLOCATOR___PTR_CH_)
-#define _PORTABLESERVER_SERVANTLOCATOR___PTR_CH_
-
-  class ServantLocator;
-  typedef ServantLocator *ServantLocator_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_SERVANTLOCATOR___VAR_CH_)
-#define _PORTABLESERVER_SERVANTLOCATOR___VAR_CH_
-
-  class TAO_Export ServantLocator_var
-  {
-  public:
-    ServantLocator_var (void); // default constructor
-    ServantLocator_var (ServantLocator_ptr);
-    ServantLocator_var (const ServantLocator_var &); // copy constructor
-    ~ServantLocator_var (void); // destructor
-
-    ServantLocator_var &operator= (ServantLocator_ptr);
-    ServantLocator_var &operator= (const ServantLocator_var &);
-    ServantLocator_ptr operator-> (void) const;
-
-    operator const ServantLocator_ptr &() const;
-    operator ServantLocator_ptr &();
-    // in, inout, out, _retn
-    ServantLocator_ptr in (void) const;
-    ServantLocator_ptr &inout (void);
-    ServantLocator_ptr &out (void);
-    ServantLocator_ptr _retn (void);
-    ServantLocator_ptr ptr (void) const;
-
-  private:
-    ServantLocator_ptr ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_SERVANTLOCATOR___OUT_CH_)
-#define _PORTABLESERVER_SERVANTLOCATOR___OUT_CH_
-
-  class TAO_Export ServantLocator_out
-  {
-  public:
-    ServantLocator_out (ServantLocator_ptr &);
-    ServantLocator_out (ServantLocator_var &);
-    ServantLocator_out (const ServantLocator_out &);
-    ServantLocator_out &operator= (ServantLocator_out &);
-    ServantLocator_out &operator= (const ServantLocator_var &);
-    ServantLocator_out &operator= (ServantLocator_ptr);
-    operator ServantLocator_ptr &();
-    ServantLocator_ptr &ptr (void);
-    ServantLocator_ptr operator-> (void);
-
-  private:
-    ServantLocator_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_SERVANTLOCATOR_CH_)
-#define _PORTABLESERVER_SERVANTLOCATOR_CH_
-
-  class TAO_Export ServantLocator: public virtual ServantManager
-  {
-  public:
-
-    typedef void *Cookie;
-
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef ServantLocator_ptr _ptr_type;
-    typedef ServantLocator_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static ServantLocator_ptr _duplicate (ServantLocator_ptr obj);
-    static ServantLocator_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    static ServantLocator_ptr _nil (void);
-
-    virtual Servant  preinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie & the_cookie, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-    virtual void  postinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie the_cookie, Servant the_servant, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    ServantLocator (
-                    TAO_Stub *objref = 0,
-                    TAO_ServantBase *servant = 0,
-                    CORBA::Boolean collocated = 0
-                    );
-  public:
-    virtual ~ServantLocator (void);
-  private:
-    ServantLocator (const ServantLocator&);
-    void operator= (const ServantLocator&);
-  };
-
-#endif /* end #if !defined */
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServantLocator;
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#if !defined (_PORTABLESERVER_POA___PTR_CH_)
-#define _PORTABLESERVER_POA___PTR_CH_
-
-  class POA;
-  typedef POA *POA_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_POA___VAR_CH_)
-#define _PORTABLESERVER_POA___VAR_CH_
-
-  class TAO_Export POA_var
-  {
-  public:
-    POA_var (void); // default constructor
-    POA_var (POA_ptr);
-    POA_var (const POA_var &); // copy constructor
-    ~POA_var (void); // destructor
-
-    POA_var &operator= (POA_ptr);
-    POA_var &operator= (const POA_var &);
-    POA_ptr operator-> (void) const;
-
-    operator const POA_ptr &() const;
-    operator POA_ptr &();
-    // in, inout, out, _retn
-    POA_ptr in (void) const;
-    POA_ptr &inout (void);
-    POA_ptr &out (void);
-    POA_ptr _retn (void);
-    POA_ptr ptr (void) const;
-
-  private:
-    POA_ptr ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_POA___OUT_CH_)
-#define _PORTABLESERVER_POA___OUT_CH_
-
-  class TAO_Export POA_out
-  {
-  public:
-    POA_out (POA_ptr &);
-    POA_out (POA_var &);
-    POA_out (const POA_out &);
-    POA_out &operator= (POA_out &);
-    POA_out &operator= (const POA_var &);
-    POA_out &operator= (POA_ptr);
-    operator POA_ptr &();
-    POA_ptr &ptr (void);
-    POA_ptr operator-> (void);
-
-  private:
-    POA_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_POA_CH_)
-#define _PORTABLESERVER_POA_CH_
-
-  class TAO_Export POA: public virtual ACE_CORBA_1 (Object)
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef POA_ptr _ptr_type;
-    typedef POA_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static POA_ptr _duplicate (POA_ptr obj);
-    static POA_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    static POA_ptr _nil (void);
-
-
-#if !defined (_PORTABLESERVER_POA_ADAPTERALREADYEXISTS___PTR_CH_)
-#define _PORTABLESERVER_POA_ADAPTERALREADYEXISTS___PTR_CH_
-
-    class AdapterAlreadyExists;
-    typedef AdapterAlreadyExists *AdapterAlreadyExists_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_)
-#define _PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_
-
-    class TAO_Export AdapterAlreadyExists : public CORBA_UserException
-    {
-    public:
-      AdapterAlreadyExists (void); // default ctor
-      AdapterAlreadyExists (const AdapterAlreadyExists &); // copy ctor
-      ~AdapterAlreadyExists (void); // dtor
-      AdapterAlreadyExists &operator= (const AdapterAlreadyExists &);
-      virtual void _raise (void);
-      static AdapterAlreadyExists *_narrow (CORBA::Exception *);
-
-      // = TAO extension
-      static CORBA::Exception *_alloc (void);
-    }; // exception PortableServer::POA::AdapterAlreadyExists
-
-    friend void operator<<= (CORBA::Any &, const AdapterAlreadyExists &); // copying version
-    friend void operator<<= (CORBA::Any &, AdapterAlreadyExists*); // noncopying version
-    friend CORBA::Boolean operator>>= (const CORBA::Any &, AdapterAlreadyExists *&);
-    static CORBA::TypeCode_ptr _tc_AdapterAlreadyExists;
-
-#endif /* end #if !defined */
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#if !defined (_PORTABLESERVER_POA_ADAPTERINACTIVE___PTR_CH_)
-#define _PORTABLESERVER_POA_ADAPTERINACTIVE___PTR_CH_
-
-    class AdapterInactive;
-    typedef AdapterInactive *AdapterInactive_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_POA_ADAPTERINACTIVE_CH_)
-#define _PORTABLESERVER_POA_ADAPTERINACTIVE_CH_
-
-    class TAO_Export AdapterInactive : public CORBA_UserException
-    {
-    public:
-      AdapterInactive (void); // default ctor
-      AdapterInactive (const AdapterInactive &); // copy ctor
-      ~AdapterInactive (void); // dtor
-      AdapterInactive &operator= (const AdapterInactive &);
-      virtual void _raise (void);
-      static AdapterInactive *_narrow (CORBA::Exception *);
-
-      // = TAO extension
-      static CORBA::Exception *_alloc (void);
-
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef AdapterInactive_ptr _ptr_type;
-  #endif /* __GNUC__ */
-
-    }; // exception PortableServer::POA::AdapterInactive
-
-    friend void operator<<= (CORBA::Any &, const AdapterInactive &); // copying version
-    friend void operator<<= (CORBA::Any &, AdapterInactive*); // noncopying version
-    friend CORBA::Boolean operator>>= (const CORBA::Any &, AdapterInactive *&);
-    static CORBA::TypeCode_ptr _tc_AdapterInactive;
-
-#endif /* end #if !defined */
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#if !defined (_PORTABLESERVER_POA_ADAPTERNONEXISTENT___PTR_CH_)
-#define _PORTABLESERVER_POA_ADAPTERNONEXISTENT___PTR_CH_
-
-    class AdapterNonExistent;
-    typedef AdapterNonExistent *AdapterNonExistent_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_POA_ADAPTERNONEXISTENT_CH_)
-#define _PORTABLESERVER_POA_ADAPTERNONEXISTENT_CH_
-
-    class TAO_Export AdapterNonExistent : public CORBA_UserException
-    {
-    public:
-      AdapterNonExistent (void); // default ctor
-      AdapterNonExistent (const AdapterNonExistent &); // copy ctor
-      ~AdapterNonExistent (void); // dtor
-      AdapterNonExistent &operator= (const AdapterNonExistent &);
-      virtual void _raise (void);
-      static AdapterNonExistent *_narrow (CORBA::Exception *);
-
-      // = TAO extension
-      static CORBA::Exception *_alloc (void);
-
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef AdapterNonExistent_ptr _ptr_type;
-  #endif /* __GNUC__ */
-
-    }; // exception PortableServer::POA::AdapterNonExistent
-
-    friend void operator<<= (CORBA::Any &, const AdapterNonExistent &); // copying version
-    friend void operator<<= (CORBA::Any &, AdapterNonExistent*); // noncopying version
-    friend CORBA::Boolean operator>>= (const CORBA::Any &, AdapterNonExistent *&);
-    static CORBA::TypeCode_ptr _tc_AdapterNonExistent;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_POA_INVALIDPOLICY___PTR_CH_)
-#define _PORTABLESERVER_POA_INVALIDPOLICY___PTR_CH_
-
-    class InvalidPolicy;
-    typedef InvalidPolicy *InvalidPolicy_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_POA_INVALIDPOLICY_CH_)
-#define _PORTABLESERVER_POA_INVALIDPOLICY_CH_
-
-    class TAO_Export InvalidPolicy : public CORBA_UserException
-    {
-    public:
-      InvalidPolicy (void); // default ctor
-      InvalidPolicy (const InvalidPolicy &); // copy ctor
-      ~InvalidPolicy (void); // dtor
-      InvalidPolicy &operator= (const InvalidPolicy &);
-      virtual void _raise (void);
-      static InvalidPolicy *_narrow (CORBA::Exception *);
-
-      InvalidPolicy(
-          CORBA::UShort _tao_index
-        );
-
-      CORBA::UShort index;
-
-      // = TAO extension
-      static CORBA::Exception *_alloc (void);
-
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef InvalidPolicy_ptr _ptr_type;
-  #endif /* __GNUC__ */
-
-    }; // exception PortableServer::POA::InvalidPolicy
-
-    friend void operator<<= (CORBA::Any &, const InvalidPolicy &); // copying version
-    friend void operator<<= (CORBA::Any &, InvalidPolicy*); // noncopying version
-    friend CORBA::Boolean operator>>= (const CORBA::Any &, InvalidPolicy *&);
-    static CORBA::TypeCode_ptr _tc_InvalidPolicy;
-
-#endif /* end #if !defined */
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#if !defined (_PORTABLESERVER_POA_NOSERVANT___PTR_CH_)
-#define _PORTABLESERVER_POA_NOSERVANT___PTR_CH_
-
-    class NoServant;
-    typedef NoServant *NoServant_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_POA_NOSERVANT_CH_)
-#define _PORTABLESERVER_POA_NOSERVANT_CH_
-
-    class TAO_Export NoServant : public CORBA_UserException
-    {
-    public:
-      NoServant (void); // default ctor
-      NoServant (const NoServant &); // copy ctor
-      ~NoServant (void); // dtor
-      NoServant &operator= (const NoServant &);
-      virtual void _raise (void);
-      static NoServant *_narrow (CORBA::Exception *);
-
-      // = TAO extension
-      static CORBA::Exception *_alloc (void);
-
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef NoServant_ptr _ptr_type;
-  #endif /* __GNUC__ */
-
-    }; // exception PortableServer::POA::NoServant
-
-    friend void operator<<= (CORBA::Any &, const NoServant &); // copying version
-    friend void operator<<= (CORBA::Any &, NoServant*); // noncopying version
-    friend CORBA::Boolean operator>>= (const CORBA::Any &, NoServant *&);
-    static CORBA::TypeCode_ptr _tc_NoServant;
-
-#endif /* end #if !defined */
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#if !defined (_PORTABLESERVER_POA_OBJECTALREADYACTIVE___PTR_CH_)
-#define _PORTABLESERVER_POA_OBJECTALREADYACTIVE___PTR_CH_
-
-    class ObjectAlreadyActive;
-    typedef ObjectAlreadyActive *ObjectAlreadyActive_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_)
-#define _PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_
-
-    class TAO_Export ObjectAlreadyActive : public CORBA_UserException
-    {
-    public:
-      ObjectAlreadyActive (void); // default ctor
-      ObjectAlreadyActive (const ObjectAlreadyActive &); // copy ctor
-      ~ObjectAlreadyActive (void); // dtor
-      ObjectAlreadyActive &operator= (const ObjectAlreadyActive &);
-      virtual void _raise (void);
-      static ObjectAlreadyActive *_narrow (CORBA::Exception *);
-
-      // = TAO extension
-      static CORBA::Exception *_alloc (void);
-
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef ObjectAlreadyActive_ptr _ptr_type;
-  #endif /* __GNUC__ */
-
-    }; // exception PortableServer::POA::ObjectAlreadyActive
-
-    friend void operator<<= (CORBA::Any &, const ObjectAlreadyActive &); // copying version
-    friend void operator<<= (CORBA::Any &, ObjectAlreadyActive*); // noncopying version
-    friend CORBA::Boolean operator>>= (const CORBA::Any &, ObjectAlreadyActive *&);
-    static CORBA::TypeCode_ptr _tc_ObjectAlreadyActive;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_POA_OBJECTNOTACTIVE___PTR_CH_)
-#define _PORTABLESERVER_POA_OBJECTNOTACTIVE___PTR_CH_
-
-    class ObjectNotActive;
-    typedef ObjectNotActive *ObjectNotActive_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_POA_OBJECTNOTACTIVE_CH_)
-#define _PORTABLESERVER_POA_OBJECTNOTACTIVE_CH_
-
-    class TAO_Export ObjectNotActive : public CORBA_UserException
-    {
-    public:
-      ObjectNotActive (void); // default ctor
-      ObjectNotActive (const ObjectNotActive &); // copy ctor
-      ~ObjectNotActive (void); // dtor
-      ObjectNotActive &operator= (const ObjectNotActive &);
-      virtual void _raise (void);
-      static ObjectNotActive *_narrow (CORBA::Exception *);
-
-      // = TAO extension
-      static CORBA::Exception *_alloc (void);
-
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef ObjectNotActive_ptr _ptr_type;
-  #endif /* __GNUC__ */
-
-    }; // exception PortableServer::POA::ObjectNotActive
-
-    friend void operator<<= (CORBA::Any &, const ObjectNotActive &); // copying version
-    friend void operator<<= (CORBA::Any &, ObjectNotActive*); // noncopying version
-    friend CORBA::Boolean operator>>= (const CORBA::Any &, ObjectNotActive *&);
-    static CORBA::TypeCode_ptr _tc_ObjectNotActive;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_POA_SERVANTALREADYACTIVE___PTR_CH_)
-#define _PORTABLESERVER_POA_SERVANTALREADYACTIVE___PTR_CH_
-
-    class ServantAlreadyActive;
-    typedef ServantAlreadyActive *ServantAlreadyActive_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_)
-#define _PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_
-
-    class TAO_Export ServantAlreadyActive : public CORBA_UserException
-    {
-    public:
-      ServantAlreadyActive (void); // default ctor
-      ServantAlreadyActive (const ServantAlreadyActive &); // copy ctor
-      ~ServantAlreadyActive (void); // dtor
-      ServantAlreadyActive &operator= (const ServantAlreadyActive &);
-      virtual void _raise (void);
-      static ServantAlreadyActive *_narrow (CORBA::Exception *);
-
-      // = TAO extension
-      static CORBA::Exception *_alloc (void);
-
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef ServantAlreadyActive_ptr _ptr_type;
-  #endif /* __GNUC__ */
-
-    }; // exception PortableServer::POA::ServantAlreadyActive
-
-    friend void operator<<= (CORBA::Any &, const ServantAlreadyActive &); // copying version
-    friend void operator<<= (CORBA::Any &, ServantAlreadyActive*); // noncopying version
-    friend CORBA::Boolean operator>>= (const CORBA::Any &, ServantAlreadyActive *&);
-    static CORBA::TypeCode_ptr _tc_ServantAlreadyActive;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_POA_SERVANTNOTACTIVE___PTR_CH_)
-#define _PORTABLESERVER_POA_SERVANTNOTACTIVE___PTR_CH_
-
-    class ServantNotActive;
-    typedef ServantNotActive *ServantNotActive_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_POA_SERVANTNOTACTIVE_CH_)
-#define _PORTABLESERVER_POA_SERVANTNOTACTIVE_CH_
-
-    class TAO_Export ServantNotActive : public CORBA_UserException
-    {
-    public:
-      ServantNotActive (void); // default ctor
-      ServantNotActive (const ServantNotActive &); // copy ctor
-      ~ServantNotActive (void); // dtor
-      ServantNotActive &operator= (const ServantNotActive &);
-      virtual void _raise (void);
-      static ServantNotActive *_narrow (CORBA::Exception *);
-
-      // = TAO extension
-      static CORBA::Exception *_alloc (void);
-
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef ServantNotActive_ptr _ptr_type;
-  #endif /* __GNUC__ */
-
-    }; // exception PortableServer::POA::ServantNotActive
-
-    friend void operator<<= (CORBA::Any &, const ServantNotActive &); // copying version
-    friend void operator<<= (CORBA::Any &, ServantNotActive*); // noncopying version
-    friend CORBA::Boolean operator>>= (const CORBA::Any &, ServantNotActive *&);
-    static CORBA::TypeCode_ptr _tc_ServantNotActive;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_POA_WRONGADAPTER___PTR_CH_)
-#define _PORTABLESERVER_POA_WRONGADAPTER___PTR_CH_
-
-    class WrongAdapter;
-    typedef WrongAdapter *WrongAdapter_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_POA_WRONGADAPTER_CH_)
-#define _PORTABLESERVER_POA_WRONGADAPTER_CH_
-
-    class TAO_Export WrongAdapter : public CORBA_UserException
-    {
-    public:
-      WrongAdapter (void); // default ctor
-      WrongAdapter (const WrongAdapter &); // copy ctor
-      ~WrongAdapter (void); // dtor
-      WrongAdapter &operator= (const WrongAdapter &);
-      virtual void _raise (void);
-      static WrongAdapter *_narrow (CORBA::Exception *);
-
-      // = TAO extension
-      static CORBA::Exception *_alloc (void);
-
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef WrongAdapter_ptr _ptr_type;
-  #endif /* __GNUC__ */
-
-    }; // exception PortableServer::POA::WrongAdapter
-
-    friend void operator<<= (CORBA::Any &, const WrongAdapter &); // copying version
-    friend void operator<<= (CORBA::Any &, WrongAdapter*); // noncopying version
-    friend CORBA::Boolean operator>>= (const CORBA::Any &, WrongAdapter *&);
-    static CORBA::TypeCode_ptr _tc_WrongAdapter;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_POA_WRONGPOLICY___PTR_CH_)
-#define _PORTABLESERVER_POA_WRONGPOLICY___PTR_CH_
-
-    class WrongPolicy;
-    typedef WrongPolicy *WrongPolicy_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_POA_WRONGPOLICY_CH_)
-#define _PORTABLESERVER_POA_WRONGPOLICY_CH_
-
-    class TAO_Export WrongPolicy : public CORBA_UserException
-    {
-    public:
-      WrongPolicy (void); // default ctor
-      WrongPolicy (const WrongPolicy &); // copy ctor
-      ~WrongPolicy (void); // dtor
-      WrongPolicy &operator= (const WrongPolicy &);
-      virtual void _raise (void);
-      static WrongPolicy *_narrow (CORBA::Exception *);
-
-      // = TAO extension
-      static CORBA::Exception *_alloc (void);
-
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef WrongPolicy_ptr _ptr_type;
-  #endif /* __GNUC__ */
-
-    }; // exception PortableServer::POA::WrongPolicy
-
-    friend void operator<<= (CORBA::Any &, const WrongPolicy &); // copying version
-    friend void operator<<= (CORBA::Any &, WrongPolicy*); // noncopying version
-    friend CORBA::Boolean operator>>= (const CORBA::Any &, WrongPolicy *&);
-    static CORBA::TypeCode_ptr _tc_WrongPolicy;
-
-#endif /* end #if !defined */
-
-    virtual POA_ptr  create_POA (const char *adapter_name, POAManager_ptr a_POAManager, const CORBA::PolicyList &policies, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-    virtual POA_ptr  find_POA (const char *adapter_name, CORBA::Boolean activate_it, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-    virtual void  destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-    virtual ThreadPolicy_ptr  create_thread_policy (ThreadPolicyValue value, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-    virtual LifespanPolicy_ptr  create_lifespan_policy (LifespanPolicyValue value, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-    virtual IdUniquenessPolicy_ptr  create_id_uniqueness_policy (IdUniquenessPolicyValue value, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-    virtual IdAssignmentPolicy_ptr  create_id_assignment_policy (IdAssignmentPolicyValue value, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-    virtual ImplicitActivationPolicy_ptr  create_implicit_activation_policy (ImplicitActivationPolicyValue value, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-    virtual ServantRetentionPolicy_ptr  create_servant_retention_policy (ServantRetentionPolicyValue value, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-    virtual RequestProcessingPolicy_ptr  create_request_processing_policy (RequestProcessingPolicyValue value, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-    virtual char * the_name (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-    virtual POA_ptr  the_parent (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-    virtual POAManager_ptr  the_POAManager (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-    virtual AdapterActivator_ptr  the_activator (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-    virtual void the_activator(AdapterActivator_ptr the_activator, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-    virtual ServantManager_ptr  get_servant_manager (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-    virtual void  set_servant_manager (ServantManager_ptr imgr, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-    virtual Servant  get_servant (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-    virtual void  set_servant (Servant p_servant, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-    virtual ObjectId * activate_object (Servant p_servant, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-    virtual void  activate_object_with_id (const ObjectId &id, Servant p_servant, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-    virtual void  deactivate_object (const ObjectId &oid, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-    virtual CORBA::Object_ptr  create_reference (const char *intf, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-    virtual CORBA::Object_ptr  create_reference_with_id (const ObjectId &oid, const char *intf, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-    virtual ObjectId * servant_to_id (Servant p_servant, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-    virtual CORBA::Object_ptr  servant_to_reference (Servant p_servant, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-    virtual Servant  reference_to_servant (CORBA::Object_ptr reference, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-    virtual ObjectId * reference_to_id (CORBA::Object_ptr reference, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-    virtual Servant  id_to_servant (const ObjectId &oid, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-    virtual CORBA::Object_ptr  id_to_reference (const ObjectId &oid, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    POA (
-         TAO_Stub *objref = 0,
-         TAO_ServantBase *servant = 0,
-         CORBA::Boolean collocated = 0
-         );
-  public:
-    virtual ~POA (void);
-  private:
-    POA (const POA&);
-    void operator= (const POA&);
-  };
-
-#endif /* end #if !defined */
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_POA;
-
-
-#if !defined (_PORTABLESERVER_CURRENT___PTR_CH_)
-#define _PORTABLESERVER_CURRENT___PTR_CH_
-
-  class Current;
-  typedef Current *Current_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_CURRENT___VAR_CH_)
-#define _PORTABLESERVER_CURRENT___VAR_CH_
-
-  class TAO_Export Current_var
-  {
-  public:
-    Current_var (void); // default constructor
-    Current_var (Current_ptr);
-    Current_var (const Current_var &); // copy constructor
-    ~Current_var (void); // destructor
-
-    Current_var &operator= (Current_ptr);
-    Current_var &operator= (const Current_var &);
-    Current_ptr operator-> (void) const;
-
-    operator const Current_ptr &() const;
-    operator Current_ptr &();
-    // in, inout, out, _retn
-    Current_ptr in (void) const;
-    Current_ptr &inout (void);
-    Current_ptr &out (void);
-    Current_ptr _retn (void);
-    Current_ptr ptr (void) const;
-
-  private:
-    Current_ptr ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_CURRENT___OUT_CH_)
-#define _PORTABLESERVER_CURRENT___OUT_CH_
-
-  class TAO_Export Current_out
-  {
-  public:
-    Current_out (Current_ptr &);
-    Current_out (Current_var &);
-    Current_out (const Current_out &);
-    Current_out &operator= (Current_out &);
-    Current_out &operator= (const Current_var &);
-    Current_out &operator= (Current_ptr);
-    operator Current_ptr &();
-    Current_ptr &ptr (void);
-    Current_ptr operator-> (void);
-
-  private:
-    Current_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_CURRENT_CH_)
-#define _PORTABLESERVER_CURRENT_CH_
-
-  class TAO_Export Current: public virtual CORBA::Current
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef Current_ptr _ptr_type;
-    typedef Current_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static Current_ptr _duplicate (Current_ptr obj);
-    static Current_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    static Current_ptr _nil (void);
-
-
-#if !defined (_PORTABLESERVER_CURRENT_NOCONTEXT___PTR_CH_)
-#define _PORTABLESERVER_CURRENT_NOCONTEXT___PTR_CH_
-
-    class NoContext;
-    typedef NoContext *NoContext_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_CURRENT_NOCONTEXT_CH_)
-#define _PORTABLESERVER_CURRENT_NOCONTEXT_CH_
-
-    class TAO_Export NoContext : public CORBA_UserException
-    {
-    public:
-      NoContext (void); // default ctor
-      NoContext (const NoContext &); // copy ctor
-      ~NoContext (void); // dtor
-      NoContext &operator= (const NoContext &);
-      virtual void _raise (void);
-      static NoContext *_narrow (CORBA::Exception *);
-
-      // = TAO extension
-      static CORBA::Exception *_alloc (void);
-
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef NoContext_ptr _ptr_type;
-  #endif /* __GNUC__ */
-
-    }; // exception PortableServer::Current::NoContext
-
-    friend void operator<<= (CORBA::Any &, const NoContext &); // copying version
-    friend void operator<<= (CORBA::Any &, NoContext*); // noncopying version
-    friend CORBA::Boolean operator>>= (const CORBA::Any &, NoContext *&);
-    static CORBA::TypeCode_ptr _tc_NoContext;
-
-#endif /* end #if !defined */
-
-    virtual POA_ptr  get_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual ObjectId * get_object_id (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    Current (
-             TAO_Stub *objref = 0,
-             TAO_ServantBase *servant = 0,
-             CORBA::Boolean collocated = 0
-             );
-  public:
-    virtual ~Current (void);
-  private:
-    Current (const Current&);
-    void operator= (const Current&);
-  };
-
-#endif /* end #if !defined */
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Current;
-
-  TAO_NAMESPACE_STORAGE_CLASS char *ObjectId_to_string (const PortableServer::ObjectId &id);
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::WChar *ObjectId_to_wstring (const PortableServer::ObjectId &id);
-  TAO_NAMESPACE_STORAGE_CLASS PortableServer::ObjectId *string_to_ObjectId (const char *id);
-  TAO_NAMESPACE_STORAGE_CLASS PortableServer::ObjectId *wstring_to_ObjectId (const CORBA::WChar *id);
-
-};
-
-#if defined (__ACE_INLINE__)
-#include "POAC.i"
-#else
-
-// POA's policies.
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicyValue &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, PortableServer::ThreadPolicyValue &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicy_ptr );
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, PortableServer::ThreadPolicy_ptr &);
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const PortableServer::LifespanPolicyValue &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, PortableServer::LifespanPolicyValue &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const PortableServer::LifespanPolicy_ptr );
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, PortableServer::LifespanPolicy_ptr &);
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const PortableServer::IdUniquenessPolicyValue &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, PortableServer::IdUniquenessPolicyValue &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const PortableServer::IdUniquenessPolicy_ptr );
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, PortableServer::IdUniquenessPolicy_ptr &);
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const PortableServer::IdAssignmentPolicyValue &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, PortableServer::IdAssignmentPolicyValue &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const PortableServer::IdAssignmentPolicy_ptr );
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, PortableServer::IdAssignmentPolicy_ptr &);
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const PortableServer::ImplicitActivationPolicyValue &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, PortableServer::ImplicitActivationPolicyValue &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const PortableServer::ImplicitActivationPolicy_ptr );
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, PortableServer::ImplicitActivationPolicy_ptr &);
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const PortableServer::ServantRetentionPolicyValue &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, PortableServer::ServantRetentionPolicyValue &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const PortableServer::ServantRetentionPolicy_ptr );
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, PortableServer::ServantRetentionPolicy_ptr &);
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicyValue &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, PortableServer::RequestProcessingPolicyValue &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicy_ptr );
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, PortableServer::RequestProcessingPolicy_ptr &);
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-// POA's exceptions.
-void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::AdapterAlreadyExists &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::AdapterAlreadyExists*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::AdapterAlreadyExists *&);
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::AdapterInactive &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::AdapterInactive*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::AdapterInactive *&);
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::AdapterNonExistent &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::AdapterNonExistent*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::AdapterNonExistent *&);
-void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::InvalidPolicy &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::InvalidPolicy*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::InvalidPolicy *&);
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::NoServant &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::NoServant*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::NoServant *&);
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::ObjectAlreadyActive &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::ObjectAlreadyActive*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::ObjectAlreadyActive *&);
-void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::ObjectNotActive &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::ObjectNotActive*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::ObjectNotActive *&);
-void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::ServantAlreadyActive &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::ServantAlreadyActive*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::ServantAlreadyActive *&);
-void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::ServantNotActive &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::ServantNotActive*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::ServantNotActive *&);
-void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::WrongAdapter &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::WrongAdapter*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::WrongAdapter *&);
-void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::WrongPolicy &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::WrongPolicy*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::WrongPolicy *&);
-
-// POA::Current && its exception.
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const PortableServer::Current_ptr );
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, PortableServer::Current_ptr &);
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const PortableServer::Current::NoContext &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, PortableServer::Current::NoContext &);
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-#endif /* TAO_IDL_POAC_H */
diff --git a/TAO/tao/POAC.i b/TAO/tao/POAC.i
deleted file mode 100644
index fc5d5f2b64b..00000000000
--- a/TAO/tao/POAC.i
+++ /dev/null
@@ -1,3894 +0,0 @@
-// $Id$
-//
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-#if !defined (_PORTABLESERVER_POA___VAR_CI_)
-#define _PORTABLESERVER_POA___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::POA_var
-// *************************************************************
-
-ACE_INLINE PortableServer::POA_ptr
-PortableServer::POA::_nil (void)
-{
-  return (PortableServer::POA_ptr)0;
-}
-
-ACE_INLINE
-PortableServer::POA_var::POA_var (void) // default constructor
-  : ptr_ (PortableServer::POA::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::POA_var::POA_var (PortableServer::POA_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::POA_ptr
-PortableServer::POA_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::POA_var::POA_var (const PortableServer::POA_var &p) // copy constructor
-  : ptr_ (PortableServer::POA::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::POA_var::~POA_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::POA_var &
-PortableServer::POA_var::operator= (PortableServer::POA_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::POA_var &
-PortableServer::POA_var::operator= (const PortableServer::POA_var &p)
-{
-  if (this != &p)
-    {
-      CORBA::release (this->ptr_);
-      this->ptr_ = PortableServer::POA::_duplicate (p.ptr ());
-    }
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::POA_var::operator const PortableServer::POA_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::POA_var::operator PortableServer::POA_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr
-PortableServer::POA_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr
-PortableServer::POA_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr &
-PortableServer::POA_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr &
-PortableServer::POA_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::POA::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr
-PortableServer::POA_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::POA_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::POA::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POA___OUT_CI_)
-#define _PORTABLESERVER_POA___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::POA_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::POA_out::POA_out (PortableServer::POA_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = PortableServer::POA::_nil ();
-}
-
-ACE_INLINE
-PortableServer::POA_out::POA_out (PortableServer::POA_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::POA::_nil ();
-}
-
-ACE_INLINE
-PortableServer::POA_out::POA_out (const PortableServer::POA_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (POA_out&,p).ptr_)
-{}
-
-ACE_INLINE PortableServer::POA_out &
-PortableServer::POA_out::operator= (PortableServer::POA_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::POA_out &
-PortableServer::POA_out::operator= (const PortableServer::POA_var &p)
-{
-  this->ptr_ = PortableServer::POA::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::POA_out &
-PortableServer::POA_out::operator= (PortableServer::POA_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::POA_out::operator PortableServer::POA_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr &
-PortableServer::POA_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr
-PortableServer::POA_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER__TAO_SEQ_OCTET___VAR_CI_)
-#define _PORTABLESERVER__TAO_SEQ_OCTET___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::_tao_seq_Octet_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::_tao_seq_Octet_var::_tao_seq_Octet_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-PortableServer::_tao_seq_Octet_var::_tao_seq_Octet_var (PortableServer::_tao_seq_Octet *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-PortableServer::_tao_seq_Octet_var::_tao_seq_Octet_var (const PortableServer::_tao_seq_Octet_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new PortableServer::_tao_seq_Octet(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-PortableServer::_tao_seq_Octet_var::~_tao_seq_Octet_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Octet_var &
-PortableServer::_tao_seq_Octet_var::operator= (PortableServer::_tao_seq_Octet *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Octet_var &
-PortableServer::_tao_seq_Octet_var::operator= (const PortableServer::_tao_seq_Octet_var &p) // deep copy
-{
-  if (this != &p)
-    {
-      delete this->ptr_;
-      this->ptr_ = new PortableServer::_tao_seq_Octet (*p.ptr_);
-    }
-  return *this;
-}
-
-ACE_INLINE const PortableServer::_tao_seq_Octet *
-PortableServer::_tao_seq_Octet_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Octet *
-PortableServer::_tao_seq_Octet_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::_tao_seq_Octet_var::operator const PortableServer::_tao_seq_Octet &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::_tao_seq_Octet_var::operator PortableServer::_tao_seq_Octet &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::_tao_seq_Octet_var::operator PortableServer::_tao_seq_Octet &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::Octet &
-PortableServer::_tao_seq_Octet_var::operator[] (CORBA::ULong slot)
-{
-  return this->ptr_->operator[] (slot);
-}
-
-ACE_INLINE const PortableServer::_tao_seq_Octet &
-PortableServer::_tao_seq_Octet_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Octet &
-PortableServer::_tao_seq_Octet_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE PortableServer::_tao_seq_Octet *&
-PortableServer::_tao_seq_Octet_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Octet *
-PortableServer::_tao_seq_Octet_var::_retn (void)
-{
-  PortableServer::_tao_seq_Octet *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Octet *
-PortableServer::_tao_seq_Octet_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER__TAO_SEQ_OCTET___OUT_CI_)
-#define _PORTABLESERVER__TAO_SEQ_OCTET___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::_tao_seq_Octet_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::_tao_seq_Octet_out::_tao_seq_Octet_out (PortableServer::_tao_seq_Octet *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-PortableServer::_tao_seq_Octet_out::_tao_seq_Octet_out (PortableServer::_tao_seq_Octet_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-PortableServer::_tao_seq_Octet_out::_tao_seq_Octet_out (const PortableServer::_tao_seq_Octet_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (_tao_seq_Octet_out&,p).ptr_)
-{}
-
-ACE_INLINE PortableServer::_tao_seq_Octet_out &
-PortableServer::_tao_seq_Octet_out::operator= (PortableServer::_tao_seq_Octet_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Octet_out &
-PortableServer::_tao_seq_Octet_out::operator= (PortableServer::_tao_seq_Octet *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::_tao_seq_Octet_out::operator PortableServer::_tao_seq_Octet *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Octet *&
-PortableServer::_tao_seq_Octet_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Octet *
-PortableServer::_tao_seq_Octet_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Octet &
-PortableServer::_tao_seq_Octet_out::operator[] (CORBA::ULong slot)
-{
-  return this->ptr_->operator[] (slot);
-}
-
-
-#endif // end #if !defined
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-ACE_INLINE
-PortableServer::ThreadPolicy::ThreadPolicy(
-                                           TAO_Stub *objref,
-                                           TAO_ServantBase *servant,
-                                           CORBA::Boolean collocated
-                                           )
-  : ACE_CORBA_1 (Object) (objref, servant, collocated)
-{}
-
-ACE_INLINE
-PortableServer::ThreadPolicy::~ThreadPolicy (void) // destructor
-{}
-
-ACE_INLINE PortableServer::ThreadPolicy_ptr
-PortableServer::ThreadPolicy::_nil (void)
-{
-  return (PortableServer::ThreadPolicy_ptr)0;
-}
-
-
-#if !defined (_PORTABLESERVER_THREADPOLICY___VAR_CI_)
-#define _PORTABLESERVER_THREADPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ThreadPolicy_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ThreadPolicy_var::ThreadPolicy_var (void) // default constructor
-  : ptr_ (PortableServer::ThreadPolicy::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::ThreadPolicy_var::ThreadPolicy_var (PortableServer::ThreadPolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::ThreadPolicy_ptr
-PortableServer::ThreadPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ThreadPolicy_var::ThreadPolicy_var (const PortableServer::ThreadPolicy_var &p) // copy constructor
-  : ptr_ (PortableServer::ThreadPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::ThreadPolicy_var::~ThreadPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::ThreadPolicy_var &
-PortableServer::ThreadPolicy_var::operator= (PortableServer::ThreadPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ThreadPolicy_var &
-PortableServer::ThreadPolicy_var::operator= (const PortableServer::ThreadPolicy_var &p)
-{
-  if (this != &p)
-    {
-      CORBA::release (this->ptr_);
-      this->ptr_ = PortableServer::ThreadPolicy::_duplicate (p.ptr ());
-    }
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::ThreadPolicy_var::operator const PortableServer::ThreadPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ThreadPolicy_var::operator PortableServer::ThreadPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ThreadPolicy_ptr
-PortableServer::ThreadPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ThreadPolicy_ptr
-PortableServer::ThreadPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ThreadPolicy_ptr &
-PortableServer::ThreadPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ThreadPolicy_ptr &
-PortableServer::ThreadPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::ThreadPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ThreadPolicy_ptr
-PortableServer::ThreadPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::ThreadPolicy_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::ThreadPolicy::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-#if !defined (_PORTABLESERVER_THREADPOLICY___OUT_CI_)
-#define _PORTABLESERVER_THREADPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ThreadPolicy_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ThreadPolicy_out::ThreadPolicy_out (PortableServer::ThreadPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = PortableServer::ThreadPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ThreadPolicy_out::ThreadPolicy_out (PortableServer::ThreadPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::ThreadPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ThreadPolicy_out::ThreadPolicy_out (const PortableServer::ThreadPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ThreadPolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE PortableServer::ThreadPolicy_out &
-PortableServer::ThreadPolicy_out::operator= (PortableServer::ThreadPolicy_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ThreadPolicy_out &
-PortableServer::ThreadPolicy_out::operator= (const PortableServer::ThreadPolicy_var &p)
-{
-  this->ptr_ = PortableServer::ThreadPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::ThreadPolicy_out &
-PortableServer::ThreadPolicy_out::operator= (PortableServer::ThreadPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::ThreadPolicy_out::operator PortableServer::ThreadPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ThreadPolicy_ptr &
-PortableServer::ThreadPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ThreadPolicy_ptr
-PortableServer::ThreadPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-ACE_INLINE
-PortableServer::LifespanPolicy::LifespanPolicy(
-                                               TAO_Stub *objref,
-                                               TAO_ServantBase *servant,
-                                               CORBA::Boolean collocated
-                                               )
-  : ACE_CORBA_1 (Object) (objref, servant, collocated)
-{}
-
-ACE_INLINE
-PortableServer::LifespanPolicy::~LifespanPolicy (void) // destructor
-{}
-
-ACE_INLINE PortableServer::LifespanPolicy_ptr
-PortableServer::LifespanPolicy::_nil (void)
-{
-  return (PortableServer::LifespanPolicy_ptr)0;
-}
-
-
-#if !defined (_PORTABLESERVER_LIFESPANPOLICY___VAR_CI_)
-#define _PORTABLESERVER_LIFESPANPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::LifespanPolicy_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::LifespanPolicy_var::LifespanPolicy_var (void) // default constructor
-  : ptr_ (PortableServer::LifespanPolicy::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::LifespanPolicy_var::LifespanPolicy_var (PortableServer::LifespanPolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::LifespanPolicy_ptr
-PortableServer::LifespanPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::LifespanPolicy_var::LifespanPolicy_var (const PortableServer::LifespanPolicy_var &p) // copy constructor
-  : ptr_ (PortableServer::LifespanPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::LifespanPolicy_var::~LifespanPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::LifespanPolicy_var &
-PortableServer::LifespanPolicy_var::operator= (PortableServer::LifespanPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::LifespanPolicy_var &
-PortableServer::LifespanPolicy_var::operator= (const PortableServer::LifespanPolicy_var &p)
-{
-  if (this != &p)
-    {
-      CORBA::release (this->ptr_);
-      this->ptr_ = PortableServer::LifespanPolicy::_duplicate (p.ptr ());
-    }
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::LifespanPolicy_var::operator const PortableServer::LifespanPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::LifespanPolicy_var::operator PortableServer::LifespanPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::LifespanPolicy_ptr
-PortableServer::LifespanPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::LifespanPolicy_ptr
-PortableServer::LifespanPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::LifespanPolicy_ptr &
-PortableServer::LifespanPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::LifespanPolicy_ptr &
-PortableServer::LifespanPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::LifespanPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::LifespanPolicy_ptr
-PortableServer::LifespanPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::LifespanPolicy_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::LifespanPolicy::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_LIFESPANPOLICY___OUT_CI_)
-#define _PORTABLESERVER_LIFESPANPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::LifespanPolicy_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::LifespanPolicy_out::LifespanPolicy_out (PortableServer::LifespanPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = PortableServer::LifespanPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::LifespanPolicy_out::LifespanPolicy_out (PortableServer::LifespanPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::LifespanPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::LifespanPolicy_out::LifespanPolicy_out (const PortableServer::LifespanPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (LifespanPolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE PortableServer::LifespanPolicy_out &
-PortableServer::LifespanPolicy_out::operator= (PortableServer::LifespanPolicy_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::LifespanPolicy_out &
-PortableServer::LifespanPolicy_out::operator= (const PortableServer::LifespanPolicy_var &p)
-{
-  this->ptr_ = PortableServer::LifespanPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::LifespanPolicy_out &
-PortableServer::LifespanPolicy_out::operator= (PortableServer::LifespanPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::LifespanPolicy_out::operator PortableServer::LifespanPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::LifespanPolicy_ptr &
-PortableServer::LifespanPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::LifespanPolicy_ptr
-PortableServer::LifespanPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-ACE_INLINE
-PortableServer::IdUniquenessPolicy::IdUniquenessPolicy(
-                                                       TAO_Stub *objref,
-                                                       TAO_ServantBase *servant,
-                                                       CORBA::Boolean collocated
-                                                       )
-  : ACE_CORBA_1 (Object) (objref, servant, collocated)
-{}
-
-ACE_INLINE
-PortableServer::IdUniquenessPolicy::~IdUniquenessPolicy (void) // destructor
-{}
-
-ACE_INLINE PortableServer::IdUniquenessPolicy_ptr
-PortableServer::IdUniquenessPolicy::_nil (void)
-{
-  return (PortableServer::IdUniquenessPolicy_ptr)0;
-}
-
-
-#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___VAR_CI_)
-#define _PORTABLESERVER_IDUNIQUENESSPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::IdUniquenessPolicy_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::IdUniquenessPolicy_var::IdUniquenessPolicy_var (void) // default constructor
-  : ptr_ (PortableServer::IdUniquenessPolicy::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::IdUniquenessPolicy_var::IdUniquenessPolicy_var (PortableServer::IdUniquenessPolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::IdUniquenessPolicy_ptr
-PortableServer::IdUniquenessPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::IdUniquenessPolicy_var::IdUniquenessPolicy_var (const PortableServer::IdUniquenessPolicy_var &p) // copy constructor
-  : ptr_ (PortableServer::IdUniquenessPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::IdUniquenessPolicy_var::~IdUniquenessPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::IdUniquenessPolicy_var &
-PortableServer::IdUniquenessPolicy_var::operator= (PortableServer::IdUniquenessPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::IdUniquenessPolicy_var &
-PortableServer::IdUniquenessPolicy_var::operator= (const PortableServer::IdUniquenessPolicy_var &p)
-{
-  if (this != &p)
-    {
-      CORBA::release (this->ptr_);
-      this->ptr_ = PortableServer::IdUniquenessPolicy::_duplicate (p.ptr ());
-    }
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::IdUniquenessPolicy_var::operator const PortableServer::IdUniquenessPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::IdUniquenessPolicy_var::operator PortableServer::IdUniquenessPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::IdUniquenessPolicy_ptr
-PortableServer::IdUniquenessPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::IdUniquenessPolicy_ptr
-PortableServer::IdUniquenessPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::IdUniquenessPolicy_ptr &
-PortableServer::IdUniquenessPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::IdUniquenessPolicy_ptr &
-PortableServer::IdUniquenessPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::IdUniquenessPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::IdUniquenessPolicy_ptr
-PortableServer::IdUniquenessPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::IdUniquenessPolicy_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::IdUniquenessPolicy::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___OUT_CI_)
-#define _PORTABLESERVER_IDUNIQUENESSPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::IdUniquenessPolicy_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::IdUniquenessPolicy_out::IdUniquenessPolicy_out (PortableServer::IdUniquenessPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = PortableServer::IdUniquenessPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::IdUniquenessPolicy_out::IdUniquenessPolicy_out (PortableServer::IdUniquenessPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::IdUniquenessPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::IdUniquenessPolicy_out::IdUniquenessPolicy_out (const PortableServer::IdUniquenessPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (IdUniquenessPolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE PortableServer::IdUniquenessPolicy_out &
-PortableServer::IdUniquenessPolicy_out::operator= (PortableServer::IdUniquenessPolicy_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::IdUniquenessPolicy_out &
-PortableServer::IdUniquenessPolicy_out::operator= (const PortableServer::IdUniquenessPolicy_var &p)
-{
-  this->ptr_ = PortableServer::IdUniquenessPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::IdUniquenessPolicy_out &
-PortableServer::IdUniquenessPolicy_out::operator= (PortableServer::IdUniquenessPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::IdUniquenessPolicy_out::operator PortableServer::IdUniquenessPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::IdUniquenessPolicy_ptr &
-PortableServer::IdUniquenessPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::IdUniquenessPolicy_ptr
-PortableServer::IdUniquenessPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-ACE_INLINE
-PortableServer::IdAssignmentPolicy::IdAssignmentPolicy(
-                                                       TAO_Stub *objref,
-                                                       TAO_ServantBase *servant,
-                                                       CORBA::Boolean collocated
-                                                       )
-  : ACE_CORBA_1 (Object) (objref, servant, collocated)
-{}
-
-ACE_INLINE
-PortableServer::IdAssignmentPolicy::~IdAssignmentPolicy (void) // destructor
-{}
-
-ACE_INLINE PortableServer::IdAssignmentPolicy_ptr
-PortableServer::IdAssignmentPolicy::_nil (void)
-{
-  return (PortableServer::IdAssignmentPolicy_ptr)0;
-}
-
-
-#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___VAR_CI_)
-#define _PORTABLESERVER_IDASSIGNMENTPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::IdAssignmentPolicy_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::IdAssignmentPolicy_var::IdAssignmentPolicy_var (void) // default constructor
-  : ptr_ (PortableServer::IdAssignmentPolicy::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::IdAssignmentPolicy_var::IdAssignmentPolicy_var (PortableServer::IdAssignmentPolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::IdAssignmentPolicy_ptr
-PortableServer::IdAssignmentPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::IdAssignmentPolicy_var::IdAssignmentPolicy_var (const PortableServer::IdAssignmentPolicy_var &p) // copy constructor
-  : ptr_ (PortableServer::IdAssignmentPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::IdAssignmentPolicy_var::~IdAssignmentPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::IdAssignmentPolicy_var &
-PortableServer::IdAssignmentPolicy_var::operator= (PortableServer::IdAssignmentPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::IdAssignmentPolicy_var &
-PortableServer::IdAssignmentPolicy_var::operator= (const PortableServer::IdAssignmentPolicy_var &p)
-{
-  if (this != &p)
-    {
-      CORBA::release (this->ptr_);
-      this->ptr_ = PortableServer::IdAssignmentPolicy::_duplicate (p.ptr ());
-    }
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::IdAssignmentPolicy_var::operator const PortableServer::IdAssignmentPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::IdAssignmentPolicy_var::operator PortableServer::IdAssignmentPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::IdAssignmentPolicy_ptr
-PortableServer::IdAssignmentPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::IdAssignmentPolicy_ptr
-PortableServer::IdAssignmentPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::IdAssignmentPolicy_ptr &
-PortableServer::IdAssignmentPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::IdAssignmentPolicy_ptr &
-PortableServer::IdAssignmentPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::IdAssignmentPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::IdAssignmentPolicy_ptr
-PortableServer::IdAssignmentPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::IdAssignmentPolicy_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::IdAssignmentPolicy::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___OUT_CI_)
-#define _PORTABLESERVER_IDASSIGNMENTPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::IdAssignmentPolicy_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::IdAssignmentPolicy_out::IdAssignmentPolicy_out (PortableServer::IdAssignmentPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = PortableServer::IdAssignmentPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::IdAssignmentPolicy_out::IdAssignmentPolicy_out (PortableServer::IdAssignmentPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::IdAssignmentPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::IdAssignmentPolicy_out::IdAssignmentPolicy_out (const PortableServer::IdAssignmentPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (IdAssignmentPolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE PortableServer::IdAssignmentPolicy_out &
-PortableServer::IdAssignmentPolicy_out::operator= (PortableServer::IdAssignmentPolicy_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::IdAssignmentPolicy_out &
-PortableServer::IdAssignmentPolicy_out::operator= (const PortableServer::IdAssignmentPolicy_var &p)
-{
-  this->ptr_ = PortableServer::IdAssignmentPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::IdAssignmentPolicy_out &
-PortableServer::IdAssignmentPolicy_out::operator= (PortableServer::IdAssignmentPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::IdAssignmentPolicy_out::operator PortableServer::IdAssignmentPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::IdAssignmentPolicy_ptr &
-PortableServer::IdAssignmentPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::IdAssignmentPolicy_ptr
-PortableServer::IdAssignmentPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-ACE_INLINE
-PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy(
-                                                                   TAO_Stub *objref,
-                                                                   TAO_ServantBase *servant,
-                                                                   CORBA::Boolean collocated
-                                                                   )
-  : ACE_CORBA_1 (Object) (objref, servant, collocated)
-{}
-
-ACE_INLINE
-PortableServer::ImplicitActivationPolicy::~ImplicitActivationPolicy (void) // destructor
-{}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicy_ptr
-PortableServer::ImplicitActivationPolicy::_nil (void)
-{
-  return (PortableServer::ImplicitActivationPolicy_ptr)0;
-}
-
-
-#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___VAR_CI_)
-#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ImplicitActivationPolicy_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ImplicitActivationPolicy_var::ImplicitActivationPolicy_var (void) // default constructor
-  : ptr_ (PortableServer::ImplicitActivationPolicy::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::ImplicitActivationPolicy_var::ImplicitActivationPolicy_var (PortableServer::ImplicitActivationPolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicy_ptr
-PortableServer::ImplicitActivationPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ImplicitActivationPolicy_var::ImplicitActivationPolicy_var (const PortableServer::ImplicitActivationPolicy_var &p) // copy constructor
-  : ptr_ (PortableServer::ImplicitActivationPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::ImplicitActivationPolicy_var::~ImplicitActivationPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicy_var &
-PortableServer::ImplicitActivationPolicy_var::operator= (PortableServer::ImplicitActivationPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicy_var &
-PortableServer::ImplicitActivationPolicy_var::operator= (const PortableServer::ImplicitActivationPolicy_var &p)
-{
-  if (this != &p)
-    {
-      CORBA::release (this->ptr_);
-      this->ptr_ = PortableServer::ImplicitActivationPolicy::_duplicate (p.ptr ());
-    }
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::ImplicitActivationPolicy_var::operator const PortableServer::ImplicitActivationPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ImplicitActivationPolicy_var::operator PortableServer::ImplicitActivationPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicy_ptr
-PortableServer::ImplicitActivationPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicy_ptr
-PortableServer::ImplicitActivationPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicy_ptr &
-PortableServer::ImplicitActivationPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicy_ptr &
-PortableServer::ImplicitActivationPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::ImplicitActivationPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicy_ptr
-PortableServer::ImplicitActivationPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::ImplicitActivationPolicy_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::ImplicitActivationPolicy::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___OUT_CI_)
-#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ImplicitActivationPolicy_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ImplicitActivationPolicy_out::ImplicitActivationPolicy_out (PortableServer::ImplicitActivationPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = PortableServer::ImplicitActivationPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ImplicitActivationPolicy_out::ImplicitActivationPolicy_out (PortableServer::ImplicitActivationPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::ImplicitActivationPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ImplicitActivationPolicy_out::ImplicitActivationPolicy_out (const PortableServer::ImplicitActivationPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ImplicitActivationPolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicy_out &
-PortableServer::ImplicitActivationPolicy_out::operator= (PortableServer::ImplicitActivationPolicy_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicy_out &
-PortableServer::ImplicitActivationPolicy_out::operator= (const PortableServer::ImplicitActivationPolicy_var &p)
-{
-  this->ptr_ = PortableServer::ImplicitActivationPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicy_out &
-PortableServer::ImplicitActivationPolicy_out::operator= (PortableServer::ImplicitActivationPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::ImplicitActivationPolicy_out::operator PortableServer::ImplicitActivationPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicy_ptr &
-PortableServer::ImplicitActivationPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicy_ptr
-PortableServer::ImplicitActivationPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-ACE_INLINE
-PortableServer::ServantRetentionPolicy::ServantRetentionPolicy(
-                                                               TAO_Stub *objref,
-                                                               TAO_ServantBase *servant,
-                                                               CORBA::Boolean collocated
-                                                               )
-  : ACE_CORBA_1 (Object) (objref, servant, collocated)
-{}
-
-ACE_INLINE
-PortableServer::ServantRetentionPolicy::~ServantRetentionPolicy (void) // destructor
-{}
-
-ACE_INLINE PortableServer::ServantRetentionPolicy_ptr
-PortableServer::ServantRetentionPolicy::_nil (void)
-{
-  return (PortableServer::ServantRetentionPolicy_ptr)0;
-}
-
-
-#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___VAR_CI_)
-#define _PORTABLESERVER_SERVANTRETENTIONPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ServantRetentionPolicy_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ServantRetentionPolicy_var::ServantRetentionPolicy_var (void) // default constructor
-  : ptr_ (PortableServer::ServantRetentionPolicy::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::ServantRetentionPolicy_var::ServantRetentionPolicy_var (PortableServer::ServantRetentionPolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::ServantRetentionPolicy_ptr
-PortableServer::ServantRetentionPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ServantRetentionPolicy_var::ServantRetentionPolicy_var (const PortableServer::ServantRetentionPolicy_var &p) // copy constructor
-  : ptr_ (PortableServer::ServantRetentionPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::ServantRetentionPolicy_var::~ServantRetentionPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::ServantRetentionPolicy_var &
-PortableServer::ServantRetentionPolicy_var::operator= (PortableServer::ServantRetentionPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ServantRetentionPolicy_var &
-PortableServer::ServantRetentionPolicy_var::operator= (const PortableServer::ServantRetentionPolicy_var &p)
-{
-  if (this != &p)
-    {
-      CORBA::release (this->ptr_);
-      this->ptr_ = PortableServer::ServantRetentionPolicy::_duplicate (p.ptr ());
-    }
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::ServantRetentionPolicy_var::operator const PortableServer::ServantRetentionPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ServantRetentionPolicy_var::operator PortableServer::ServantRetentionPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantRetentionPolicy_ptr
-PortableServer::ServantRetentionPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantRetentionPolicy_ptr
-PortableServer::ServantRetentionPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantRetentionPolicy_ptr &
-PortableServer::ServantRetentionPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantRetentionPolicy_ptr &
-PortableServer::ServantRetentionPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::ServantRetentionPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantRetentionPolicy_ptr
-PortableServer::ServantRetentionPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::ServantRetentionPolicy_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::ServantRetentionPolicy::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___OUT_CI_)
-#define _PORTABLESERVER_SERVANTRETENTIONPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ServantRetentionPolicy_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ServantRetentionPolicy_out::ServantRetentionPolicy_out (PortableServer::ServantRetentionPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = PortableServer::ServantRetentionPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ServantRetentionPolicy_out::ServantRetentionPolicy_out (PortableServer::ServantRetentionPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::ServantRetentionPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ServantRetentionPolicy_out::ServantRetentionPolicy_out (const PortableServer::ServantRetentionPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ServantRetentionPolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE PortableServer::ServantRetentionPolicy_out &
-PortableServer::ServantRetentionPolicy_out::operator= (PortableServer::ServantRetentionPolicy_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ServantRetentionPolicy_out &
-PortableServer::ServantRetentionPolicy_out::operator= (const PortableServer::ServantRetentionPolicy_var &p)
-{
-  this->ptr_ = PortableServer::ServantRetentionPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::ServantRetentionPolicy_out &
-PortableServer::ServantRetentionPolicy_out::operator= (PortableServer::ServantRetentionPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::ServantRetentionPolicy_out::operator PortableServer::ServantRetentionPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantRetentionPolicy_ptr &
-PortableServer::ServantRetentionPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantRetentionPolicy_ptr
-PortableServer::ServantRetentionPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-ACE_INLINE
-PortableServer::RequestProcessingPolicy::RequestProcessingPolicy(
-                                                                 TAO_Stub *objref,
-                                                                 TAO_ServantBase *servant,
-                                                                 CORBA::Boolean collocated
-                                                                 )
-  : ACE_CORBA_1 (Object) (objref, servant, collocated)
-{}
-
-ACE_INLINE
-PortableServer::RequestProcessingPolicy::~RequestProcessingPolicy (void) // destructor
-{}
-
-ACE_INLINE PortableServer::RequestProcessingPolicy_ptr
-PortableServer::RequestProcessingPolicy::_nil (void)
-{
-  return (PortableServer::RequestProcessingPolicy_ptr)0;
-}
-
-
-#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___VAR_CI_)
-#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::RequestProcessingPolicy_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::RequestProcessingPolicy_var::RequestProcessingPolicy_var (void) // default constructor
-  : ptr_ (PortableServer::RequestProcessingPolicy::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::RequestProcessingPolicy_var::RequestProcessingPolicy_var (PortableServer::RequestProcessingPolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::RequestProcessingPolicy_ptr
-PortableServer::RequestProcessingPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::RequestProcessingPolicy_var::RequestProcessingPolicy_var (const PortableServer::RequestProcessingPolicy_var &p) // copy constructor
-  : ptr_ (PortableServer::RequestProcessingPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::RequestProcessingPolicy_var::~RequestProcessingPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::RequestProcessingPolicy_var &
-PortableServer::RequestProcessingPolicy_var::operator= (PortableServer::RequestProcessingPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::RequestProcessingPolicy_var &
-PortableServer::RequestProcessingPolicy_var::operator= (const PortableServer::RequestProcessingPolicy_var &p)
-{
-  if (this != &p)
-    {
-      CORBA::release (this->ptr_);
-      this->ptr_ = PortableServer::RequestProcessingPolicy::_duplicate (p.ptr ());
-    }
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::RequestProcessingPolicy_var::operator const PortableServer::RequestProcessingPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::RequestProcessingPolicy_var::operator PortableServer::RequestProcessingPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::RequestProcessingPolicy_ptr
-PortableServer::RequestProcessingPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::RequestProcessingPolicy_ptr
-PortableServer::RequestProcessingPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::RequestProcessingPolicy_ptr &
-PortableServer::RequestProcessingPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::RequestProcessingPolicy_ptr &
-PortableServer::RequestProcessingPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::RequestProcessingPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::RequestProcessingPolicy_ptr
-PortableServer::RequestProcessingPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::RequestProcessingPolicy_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::RequestProcessingPolicy::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___OUT_CI_)
-#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::RequestProcessingPolicy_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::RequestProcessingPolicy_out::RequestProcessingPolicy_out (PortableServer::RequestProcessingPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = PortableServer::RequestProcessingPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::RequestProcessingPolicy_out::RequestProcessingPolicy_out (PortableServer::RequestProcessingPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::RequestProcessingPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::RequestProcessingPolicy_out::RequestProcessingPolicy_out (const PortableServer::RequestProcessingPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (RequestProcessingPolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE PortableServer::RequestProcessingPolicy_out &
-PortableServer::RequestProcessingPolicy_out::operator= (PortableServer::RequestProcessingPolicy_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::RequestProcessingPolicy_out &
-PortableServer::RequestProcessingPolicy_out::operator= (const PortableServer::RequestProcessingPolicy_var &p)
-{
-  this->ptr_ = PortableServer::RequestProcessingPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::RequestProcessingPolicy_out &
-PortableServer::RequestProcessingPolicy_out::operator= (PortableServer::RequestProcessingPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::RequestProcessingPolicy_out::operator PortableServer::RequestProcessingPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::RequestProcessingPolicy_ptr &
-PortableServer::RequestProcessingPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::RequestProcessingPolicy_ptr
-PortableServer::RequestProcessingPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-ACE_INLINE
-PortableServer::POAManager::POAManager(
-                                       TAO_Stub *objref,
-                                       TAO_ServantBase *servant,
-                                       CORBA::Boolean collocated
-                                       )
-  : ACE_CORBA_1 (Object) (objref, servant, collocated)
-{}
-
-ACE_INLINE
-PortableServer::POAManager::~POAManager (void) // destructor
-{}
-
-ACE_INLINE PortableServer::POAManager_ptr
-PortableServer::POAManager::_nil (void)
-{
-  return (PortableServer::POAManager_ptr)0;
-}
-
-
-#if !defined (_PORTABLESERVER_POAMANAGER___VAR_CI_)
-#define _PORTABLESERVER_POAMANAGER___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::POAManager_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::POAManager_var::POAManager_var (void) // default constructor
-  : ptr_ (PortableServer::POAManager::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::POAManager_var::POAManager_var (PortableServer::POAManager_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::POAManager_ptr
-PortableServer::POAManager_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::POAManager_var::POAManager_var (const PortableServer::POAManager_var &p) // copy constructor
-  : ptr_ (PortableServer::POAManager::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::POAManager_var::~POAManager_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::POAManager_var &
-PortableServer::POAManager_var::operator= (PortableServer::POAManager_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::POAManager_var &
-PortableServer::POAManager_var::operator= (const PortableServer::POAManager_var &p)
-{
-  if (this != &p)
-    {
-      CORBA::release (this->ptr_);
-      this->ptr_ = PortableServer::POAManager::_duplicate (p.ptr ());
-    }
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::POAManager_var::operator const PortableServer::POAManager_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::POAManager_var::operator PortableServer::POAManager_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POAManager_ptr
-PortableServer::POAManager_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POAManager_ptr
-PortableServer::POAManager_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POAManager_ptr &
-PortableServer::POAManager_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POAManager_ptr &
-PortableServer::POAManager_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::POAManager::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POAManager_ptr
-PortableServer::POAManager_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::POAManager_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::POAManager::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POAMANAGER___OUT_CI_)
-#define _PORTABLESERVER_POAMANAGER___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::POAManager_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::POAManager_out::POAManager_out (PortableServer::POAManager_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = PortableServer::POAManager::_nil ();
-}
-
-ACE_INLINE
-PortableServer::POAManager_out::POAManager_out (PortableServer::POAManager_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::POAManager::_nil ();
-}
-
-ACE_INLINE
-PortableServer::POAManager_out::POAManager_out (const PortableServer::POAManager_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (POAManager_out&,p).ptr_)
-{}
-
-ACE_INLINE PortableServer::POAManager_out &
-PortableServer::POAManager_out::operator= (PortableServer::POAManager_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::POAManager_out &
-PortableServer::POAManager_out::operator= (const PortableServer::POAManager_var &p)
-{
-  this->ptr_ = PortableServer::POAManager::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::POAManager_out &
-PortableServer::POAManager_out::operator= (PortableServer::POAManager_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::POAManager_out::operator PortableServer::POAManager_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POAManager_ptr &
-PortableServer::POAManager_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POAManager_ptr
-PortableServer::POAManager_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-ACE_INLINE
-PortableServer::AdapterActivator::AdapterActivator(
-                                                   TAO_Stub *objref,
-                                                   TAO_ServantBase *servant,
-                                                   CORBA::Boolean collocated
-                                                   )
-  : ACE_CORBA_1 (Object) (objref, servant, collocated)
-{}
-
-ACE_INLINE
-PortableServer::AdapterActivator::~AdapterActivator (void) // destructor
-{}
-
-ACE_INLINE PortableServer::AdapterActivator_ptr
-PortableServer::AdapterActivator::_nil (void)
-{
-  return (PortableServer::AdapterActivator_ptr)0;
-}
-
-
-#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___VAR_CI_)
-#define _PORTABLESERVER_ADAPTERACTIVATOR___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::AdapterActivator_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::AdapterActivator_var::AdapterActivator_var (void) // default constructor
-  : ptr_ (PortableServer::AdapterActivator::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::AdapterActivator_var::AdapterActivator_var (PortableServer::AdapterActivator_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::AdapterActivator_ptr
-PortableServer::AdapterActivator_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::AdapterActivator_var::AdapterActivator_var (const PortableServer::AdapterActivator_var &p) // copy constructor
-  : ptr_ (PortableServer::AdapterActivator::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::AdapterActivator_var::~AdapterActivator_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::AdapterActivator_var &
-PortableServer::AdapterActivator_var::operator= (PortableServer::AdapterActivator_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::AdapterActivator_var &
-PortableServer::AdapterActivator_var::operator= (const PortableServer::AdapterActivator_var &p)
-{
-  if (this != &p)
-    {
-      CORBA::release (this->ptr_);
-      this->ptr_ = PortableServer::AdapterActivator::_duplicate (p.ptr ());
-    }
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::AdapterActivator_var::operator const PortableServer::AdapterActivator_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::AdapterActivator_var::operator PortableServer::AdapterActivator_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::AdapterActivator_ptr
-PortableServer::AdapterActivator_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::AdapterActivator_ptr
-PortableServer::AdapterActivator_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::AdapterActivator_ptr &
-PortableServer::AdapterActivator_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::AdapterActivator_ptr &
-PortableServer::AdapterActivator_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::AdapterActivator::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::AdapterActivator_ptr
-PortableServer::AdapterActivator_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::AdapterActivator_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::AdapterActivator::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___OUT_CI_)
-#define _PORTABLESERVER_ADAPTERACTIVATOR___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::AdapterActivator_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::AdapterActivator_out::AdapterActivator_out (PortableServer::AdapterActivator_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = PortableServer::AdapterActivator::_nil ();
-}
-
-ACE_INLINE
-PortableServer::AdapterActivator_out::AdapterActivator_out (PortableServer::AdapterActivator_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::AdapterActivator::_nil ();
-}
-
-ACE_INLINE
-PortableServer::AdapterActivator_out::AdapterActivator_out (const PortableServer::AdapterActivator_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (AdapterActivator_out&,p).ptr_)
-{}
-
-ACE_INLINE PortableServer::AdapterActivator_out &
-PortableServer::AdapterActivator_out::operator= (PortableServer::AdapterActivator_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::AdapterActivator_out &
-PortableServer::AdapterActivator_out::operator= (const PortableServer::AdapterActivator_var &p)
-{
-  this->ptr_ = PortableServer::AdapterActivator::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::AdapterActivator_out &
-PortableServer::AdapterActivator_out::operator= (PortableServer::AdapterActivator_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::AdapterActivator_out::operator PortableServer::AdapterActivator_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::AdapterActivator_ptr &
-PortableServer::AdapterActivator_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::AdapterActivator_ptr
-PortableServer::AdapterActivator_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-ACE_INLINE
-PortableServer::ServantManager::ServantManager(
-                                               TAO_Stub *objref,
-                                               TAO_ServantBase *servant,
-                                               CORBA::Boolean collocated
-                                               )
-  : ACE_CORBA_1 (Object) (objref, servant, collocated)
-{}
-
-ACE_INLINE
-PortableServer::ServantManager::~ServantManager (void) // destructor
-{}
-
-ACE_INLINE PortableServer::ServantManager_ptr
-PortableServer::ServantManager::_nil (void)
-{
-  return (PortableServer::ServantManager_ptr)0;
-}
-
-
-#if !defined (_PORTABLESERVER_SERVANTMANAGER___VAR_CI_)
-#define _PORTABLESERVER_SERVANTMANAGER___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ServantManager_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ServantManager_var::ServantManager_var (void) // default constructor
-  : ptr_ (PortableServer::ServantManager::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::ServantManager_var::ServantManager_var (PortableServer::ServantManager_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::ServantManager_ptr
-PortableServer::ServantManager_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ServantManager_var::ServantManager_var (const PortableServer::ServantManager_var &p) // copy constructor
-  : ptr_ (PortableServer::ServantManager::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::ServantManager_var::~ServantManager_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::ServantManager_var &
-PortableServer::ServantManager_var::operator= (PortableServer::ServantManager_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ServantManager_var &
-PortableServer::ServantManager_var::operator= (const PortableServer::ServantManager_var &p)
-{
-  if (this != &p)
-    {
-      CORBA::release (this->ptr_);
-      this->ptr_ = PortableServer::ServantManager::_duplicate (p.ptr ());
-    }
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::ServantManager_var::operator const PortableServer::ServantManager_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ServantManager_var::operator PortableServer::ServantManager_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantManager_ptr
-PortableServer::ServantManager_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantManager_ptr
-PortableServer::ServantManager_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantManager_ptr &
-PortableServer::ServantManager_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantManager_ptr &
-PortableServer::ServantManager_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::ServantManager::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantManager_ptr
-PortableServer::ServantManager_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::ServantManager_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::ServantManager::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_SERVANTMANAGER___OUT_CI_)
-#define _PORTABLESERVER_SERVANTMANAGER___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ServantManager_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ServantManager_out::ServantManager_out (PortableServer::ServantManager_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = PortableServer::ServantManager::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ServantManager_out::ServantManager_out (PortableServer::ServantManager_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::ServantManager::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ServantManager_out::ServantManager_out (const PortableServer::ServantManager_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ServantManager_out&,p).ptr_)
-{}
-
-ACE_INLINE PortableServer::ServantManager_out &
-PortableServer::ServantManager_out::operator= (PortableServer::ServantManager_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ServantManager_out &
-PortableServer::ServantManager_out::operator= (const PortableServer::ServantManager_var &p)
-{
-  this->ptr_ = PortableServer::ServantManager::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::ServantManager_out &
-PortableServer::ServantManager_out::operator= (PortableServer::ServantManager_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::ServantManager_out::operator PortableServer::ServantManager_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantManager_ptr &
-PortableServer::ServantManager_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantManager_ptr
-PortableServer::ServantManager_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-ACE_INLINE
-PortableServer::ServantActivator::ServantActivator(
-                                                   TAO_Stub *objref,
-                                                   TAO_ServantBase *servant,
-                                                   CORBA::Boolean collocated
-                                                   )
-  : ACE_CORBA_1 (Object) (objref, servant, collocated)
-{}
-
-ACE_INLINE
-PortableServer::ServantActivator::~ServantActivator (void) // destructor
-{}
-
-ACE_INLINE PortableServer::ServantActivator_ptr
-PortableServer::ServantActivator::_nil (void)
-{
-  return (PortableServer::ServantActivator_ptr)0;
-}
-
-
-#if !defined (_PORTABLESERVER_SERVANTACTIVATOR___VAR_CI_)
-#define _PORTABLESERVER_SERVANTACTIVATOR___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ServantActivator_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ServantActivator_var::ServantActivator_var (void) // default constructor
-  : ptr_ (PortableServer::ServantActivator::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::ServantActivator_var::ServantActivator_var (PortableServer::ServantActivator_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::ServantActivator_ptr
-PortableServer::ServantActivator_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ServantActivator_var::ServantActivator_var (const PortableServer::ServantActivator_var &p) // copy constructor
-  : ptr_ (PortableServer::ServantActivator::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::ServantActivator_var::~ServantActivator_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::ServantActivator_var &
-PortableServer::ServantActivator_var::operator= (PortableServer::ServantActivator_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ServantActivator_var &
-PortableServer::ServantActivator_var::operator= (const PortableServer::ServantActivator_var &p)
-{
-  if (this != &p)
-    {
-      CORBA::release (this->ptr_);
-      this->ptr_ = PortableServer::ServantActivator::_duplicate (p.ptr ());
-    }
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::ServantActivator_var::operator const PortableServer::ServantActivator_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ServantActivator_var::operator PortableServer::ServantActivator_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantActivator_ptr
-PortableServer::ServantActivator_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantActivator_ptr
-PortableServer::ServantActivator_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantActivator_ptr &
-PortableServer::ServantActivator_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantActivator_ptr &
-PortableServer::ServantActivator_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::ServantActivator::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantActivator_ptr
-PortableServer::ServantActivator_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::ServantActivator_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::ServantActivator::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_SERVANTACTIVATOR___OUT_CI_)
-#define _PORTABLESERVER_SERVANTACTIVATOR___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ServantActivator_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ServantActivator_out::ServantActivator_out (PortableServer::ServantActivator_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = PortableServer::ServantActivator::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ServantActivator_out::ServantActivator_out (PortableServer::ServantActivator_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::ServantActivator::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ServantActivator_out::ServantActivator_out (const PortableServer::ServantActivator_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ServantActivator_out&,p).ptr_)
-{}
-
-ACE_INLINE PortableServer::ServantActivator_out &
-PortableServer::ServantActivator_out::operator= (PortableServer::ServantActivator_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ServantActivator_out &
-PortableServer::ServantActivator_out::operator= (const PortableServer::ServantActivator_var &p)
-{
-  this->ptr_ = PortableServer::ServantActivator::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::ServantActivator_out &
-PortableServer::ServantActivator_out::operator= (PortableServer::ServantActivator_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::ServantActivator_out::operator PortableServer::ServantActivator_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantActivator_ptr &
-PortableServer::ServantActivator_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantActivator_ptr
-PortableServer::ServantActivator_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-ACE_INLINE
-PortableServer::ServantLocator::ServantLocator(
-                                               TAO_Stub *objref,
-                                               TAO_ServantBase *servant,
-                                               CORBA::Boolean collocated
-                                               )
-  : ACE_CORBA_1 (Object) (objref, servant, collocated)
-{}
-
-ACE_INLINE
-PortableServer::ServantLocator::~ServantLocator (void) // destructor
-{}
-
-ACE_INLINE PortableServer::ServantLocator_ptr
-PortableServer::ServantLocator::_nil (void)
-{
-  return (PortableServer::ServantLocator_ptr)0;
-}
-
-
-#if !defined (_PORTABLESERVER_SERVANTLOCATOR___VAR_CI_)
-#define _PORTABLESERVER_SERVANTLOCATOR___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ServantLocator_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ServantLocator_var::ServantLocator_var (void) // default constructor
-  : ptr_ (PortableServer::ServantLocator::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::ServantLocator_var::ServantLocator_var (PortableServer::ServantLocator_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::ServantLocator_ptr
-PortableServer::ServantLocator_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ServantLocator_var::ServantLocator_var (const PortableServer::ServantLocator_var &p) // copy constructor
-  : ptr_ (PortableServer::ServantLocator::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::ServantLocator_var::~ServantLocator_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::ServantLocator_var &
-PortableServer::ServantLocator_var::operator= (PortableServer::ServantLocator_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ServantLocator_var &
-PortableServer::ServantLocator_var::operator= (const PortableServer::ServantLocator_var &p)
-{
-  if (this != &p)
-    {
-      CORBA::release (this->ptr_);
-      this->ptr_ = PortableServer::ServantLocator::_duplicate (p.ptr ());
-    }
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::ServantLocator_var::operator const PortableServer::ServantLocator_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ServantLocator_var::operator PortableServer::ServantLocator_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantLocator_ptr
-PortableServer::ServantLocator_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantLocator_ptr
-PortableServer::ServantLocator_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantLocator_ptr &
-PortableServer::ServantLocator_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantLocator_ptr &
-PortableServer::ServantLocator_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::ServantLocator::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantLocator_ptr
-PortableServer::ServantLocator_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::ServantLocator_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::ServantLocator::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_SERVANTLOCATOR___OUT_CI_)
-#define _PORTABLESERVER_SERVANTLOCATOR___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ServantLocator_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ServantLocator_out::ServantLocator_out (PortableServer::ServantLocator_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = PortableServer::ServantLocator::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ServantLocator_out::ServantLocator_out (PortableServer::ServantLocator_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::ServantLocator::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ServantLocator_out::ServantLocator_out (const PortableServer::ServantLocator_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ServantLocator_out&,p).ptr_)
-{}
-
-ACE_INLINE PortableServer::ServantLocator_out &
-PortableServer::ServantLocator_out::operator= (PortableServer::ServantLocator_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ServantLocator_out &
-PortableServer::ServantLocator_out::operator= (const PortableServer::ServantLocator_var &p)
-{
-  this->ptr_ = PortableServer::ServantLocator::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::ServantLocator_out &
-PortableServer::ServantLocator_out::operator= (PortableServer::ServantLocator_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::ServantLocator_out::operator PortableServer::ServantLocator_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantLocator_ptr &
-PortableServer::ServantLocator_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantLocator_ptr
-PortableServer::ServantLocator_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-ACE_INLINE
-PortableServer::POA::POA(
-                         TAO_Stub *objref,
-                         TAO_ServantBase *servant,
-                         CORBA::Boolean collocated
-                         )
-  : ACE_CORBA_1 (Object) (objref, servant, collocated)
-{}
-
-ACE_INLINE
-PortableServer::POA::~POA (void) // destructor
-{}
-
-
-#if !defined (_PORTABLESERVER_POA___VAR_CI_)
-#define _PORTABLESERVER_POA___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::POA_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::POA_var::POA_var (void) // default constructor
-  : ptr_ (PortableServer::POA::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::POA_var::POA_var (PortableServer::POA_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::POA_ptr
-PortableServer::POA_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::POA_var::POA_var (const PortableServer::POA_var &p) // copy constructor
-  : ptr_ (PortableServer::POA::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::POA_var::~POA_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::POA_var &
-PortableServer::POA_var::operator= (PortableServer::POA_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::POA_var &
-PortableServer::POA_var::operator= (const PortableServer::POA_var &p)
-{
-  if (this != &p)
-    {
-      CORBA::release (this->ptr_);
-      this->ptr_ = PortableServer::POA::_duplicate (p.ptr ());
-    }
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::POA_var::operator const PortableServer::POA_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::POA_var::operator PortableServer::POA_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr
-PortableServer::POA_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr
-PortableServer::POA_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr &
-PortableServer::POA_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr &
-PortableServer::POA_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::POA::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr
-PortableServer::POA_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::POA_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::POA::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POA___OUT_CI_)
-#define _PORTABLESERVER_POA___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::POA_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::POA_out::POA_out (PortableServer::POA_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = PortableServer::POA::_nil ();
-}
-
-ACE_INLINE
-PortableServer::POA_out::POA_out (PortableServer::POA_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::POA::_nil ();
-}
-
-ACE_INLINE
-PortableServer::POA_out::POA_out (const PortableServer::POA_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (POA_out&,p).ptr_)
-{}
-
-ACE_INLINE PortableServer::POA_out &
-PortableServer::POA_out::operator= (PortableServer::POA_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::POA_out &
-PortableServer::POA_out::operator= (const PortableServer::POA_var &p)
-{
-  this->ptr_ = PortableServer::POA::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::POA_out &
-PortableServer::POA_out::operator= (PortableServer::POA_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::POA_out::operator PortableServer::POA_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr &
-PortableServer::POA_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr
-PortableServer::POA_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-ACE_INLINE
-PortableServer::Current::Current(
-                                 TAO_Stub *objref,
-                                 TAO_ServantBase *servant,
-                                 CORBA::Boolean collocated
-                                 )
-  : ACE_CORBA_1 (Object) (objref, servant, collocated)
-{}
-
-ACE_INLINE
-PortableServer::Current::~Current (void) // destructor
-{}
-
-ACE_INLINE PortableServer::Current_ptr
-PortableServer::Current::_nil (void)
-{
-  return (PortableServer::Current_ptr)0;
-}
-
-
-#if !defined (_PORTABLESERVER_CURRENT___VAR_CI_)
-#define _PORTABLESERVER_CURRENT___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::Current_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::Current_var::Current_var (void) // default constructor
-  : ptr_ (PortableServer::Current::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::Current_var::Current_var (PortableServer::Current_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::Current_ptr
-PortableServer::Current_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::Current_var::Current_var (const PortableServer::Current_var &p) // copy constructor
-  : ptr_ (PortableServer::Current::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::Current_var::~Current_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::Current_var &
-PortableServer::Current_var::operator= (PortableServer::Current_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::Current_var &
-PortableServer::Current_var::operator= (const PortableServer::Current_var &p)
-{
-  if (this != &p)
-    {
-      CORBA::release (this->ptr_);
-      this->ptr_ = PortableServer::Current::_duplicate (p.ptr ());
-    }
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::Current_var::operator const PortableServer::Current_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::Current_var::operator PortableServer::Current_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::Current_ptr
-PortableServer::Current_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::Current_ptr
-PortableServer::Current_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::Current_ptr &
-PortableServer::Current_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::Current_ptr &
-PortableServer::Current_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::Current::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::Current_ptr
-PortableServer::Current_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::Current_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::Current::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_CURRENT___OUT_CI_)
-#define _PORTABLESERVER_CURRENT___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::Current_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::Current_out::Current_out (PortableServer::Current_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = PortableServer::Current::_nil ();
-}
-
-ACE_INLINE
-PortableServer::Current_out::Current_out (PortableServer::Current_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::Current::_nil ();
-}
-
-ACE_INLINE
-PortableServer::Current_out::Current_out (const PortableServer::Current_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Current_out&,p).ptr_)
-{}
-
-ACE_INLINE PortableServer::Current_out &
-PortableServer::Current_out::operator= (PortableServer::Current_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::Current_out &
-PortableServer::Current_out::operator= (const PortableServer::Current_var &p)
-{
-  this->ptr_ = PortableServer::Current::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::Current_out &
-PortableServer::Current_out::operator= (PortableServer::Current_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::Current_out::operator PortableServer::Current_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::Current_ptr &
-PortableServer::Current_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::Current_ptr
-PortableServer::Current_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ThreadPolicyValue &_tao_enumval)
-{
-  return strm.write_ulong ((CORBA::ULong) _tao_enumval);
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ThreadPolicyValue &_tao_enumval)
-{
-  CORBA::ULong _tao_temp;
-  if (strm.read_ulong (_tao_temp))
-  {
-    ACE_OS::memcpy (&_tao_enumval, &_tao_temp, sizeof (CORBA::ULong));
-    return 1;
-  }
-  else
-    return 0;
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const PortableServer::ThreadPolicy_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    PortableServer::ThreadPolicy_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const PortableServer::ThreadPolicy_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    PortableServer::ThreadPolicy_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      PortableServer::ThreadPolicy::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-#endif /* end #if !defined */
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::LifespanPolicyValue &_tao_enumval)
-{
-  return strm.write_ulong ((CORBA::ULong) _tao_enumval);
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::LifespanPolicyValue &_tao_enumval)
-{
-  CORBA::ULong _tao_temp;
-  if (strm.read_ulong (_tao_temp))
-  {
-    ACE_OS::memcpy (&_tao_enumval, &_tao_temp, sizeof (CORBA::ULong));
-    return 1;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const PortableServer::LifespanPolicy_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    PortableServer::LifespanPolicy_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const PortableServer::LifespanPolicy_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    PortableServer::LifespanPolicy_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      PortableServer::LifespanPolicy::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::IdUniquenessPolicyValue &_tao_enumval)
-{
-  return strm.write_ulong ((CORBA::ULong) _tao_enumval);
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdUniquenessPolicyValue &_tao_enumval)
-{
-  CORBA::ULong _tao_temp;
-  if (strm.read_ulong (_tao_temp))
-  {
-    ACE_OS::memcpy (&_tao_enumval, &_tao_temp, sizeof (CORBA::ULong));
-    return 1;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const PortableServer::IdUniquenessPolicy_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    PortableServer::IdUniquenessPolicy_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const PortableServer::IdUniquenessPolicy_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    PortableServer::IdUniquenessPolicy_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      PortableServer::IdUniquenessPolicy::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::IdAssignmentPolicyValue &_tao_enumval)
-{
-  return strm.write_ulong ((CORBA::ULong) _tao_enumval);
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdAssignmentPolicyValue &_tao_enumval)
-{
-  CORBA::ULong _tao_temp;
-  if (strm.read_ulong (_tao_temp))
-  {
-    ACE_OS::memcpy (&_tao_enumval, &_tao_temp, sizeof (CORBA::ULong));
-    return 1;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const PortableServer::IdAssignmentPolicy_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    PortableServer::IdAssignmentPolicy_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const PortableServer::IdAssignmentPolicy_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    PortableServer::IdAssignmentPolicy_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      PortableServer::IdAssignmentPolicy::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ImplicitActivationPolicyValue &_tao_enumval)
-{
-  return strm.write_ulong ((CORBA::ULong) _tao_enumval);
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ImplicitActivationPolicyValue &_tao_enumval)
-{
-  CORBA::ULong _tao_temp;
-  if (strm.read_ulong (_tao_temp))
-  {
-    ACE_OS::memcpy (&_tao_enumval, &_tao_temp, sizeof (CORBA::ULong));
-    return 1;
-  }
-  else
-    return 0;
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const PortableServer::ImplicitActivationPolicy_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    PortableServer::ImplicitActivationPolicy_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const PortableServer::ImplicitActivationPolicy_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    PortableServer::ImplicitActivationPolicy_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      PortableServer::ImplicitActivationPolicy::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-#endif /* !defined (TAO_HAS_MINIMUM_CORBA) */
-
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ServantRetentionPolicyValue &_tao_enumval)
-{
-  return strm.write_ulong ((CORBA::ULong) _tao_enumval);
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ServantRetentionPolicyValue &_tao_enumval)
-{
-  CORBA::ULong _tao_temp;
-  if (strm.read_ulong (_tao_temp))
-  {
-    ACE_OS::memcpy (&_tao_enumval, &_tao_temp, sizeof (CORBA::ULong));
-    return 1;
-  }
-  else
-    return 0;
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const PortableServer::ServantRetentionPolicy_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    PortableServer::ServantRetentionPolicy_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const PortableServer::ServantRetentionPolicy_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    PortableServer::ServantRetentionPolicy_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      PortableServer::ServantRetentionPolicy::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::RequestProcessingPolicyValue &_tao_enumval)
-{
-  return strm.write_ulong ((CORBA::ULong) _tao_enumval);
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::RequestProcessingPolicyValue &_tao_enumval)
-{
-  CORBA::ULong _tao_temp;
-  if (strm.read_ulong (_tao_temp))
-  {
-    ACE_OS::memcpy (&_tao_enumval, &_tao_temp, sizeof (CORBA::ULong));
-    return 1;
-  }
-  else
-    return 0;
-}
-
-#if !defined(TAO_HAS_MINIMUM_CORBA)
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const PortableServer::RequestProcessingPolicy_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    PortableServer::RequestProcessingPolicy_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const PortableServer::RequestProcessingPolicy_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    PortableServer::RequestProcessingPolicy_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      PortableServer::RequestProcessingPolicy::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::AdapterAlreadyExists &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::AdapterAlreadyExists &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::AdapterInactive &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::AdapterInactive &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::AdapterNonExistent &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::AdapterNonExistent &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::InvalidPolicy &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-  {
-    // now marshal the members (if any)
-    if ((strm << _tao_aggregate.index))
-      return 1;
-    else
-      return 0;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::InvalidPolicy &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    // now marshal the members
-    if ((strm >> _tao_aggregate.index))
-      return 1;
-    else
-      return 0;
-  }
-  else
-    return 0;
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::NoServant &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::NoServant &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-#endif /* !defined (TAO_HAS_MINIMUM_CORBA) */
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::ObjectAlreadyActive &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::ObjectAlreadyActive &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::ObjectNotActive &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::ObjectNotActive &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::ServantAlreadyActive &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::ServantAlreadyActive &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::ServantNotActive &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::ServantNotActive &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::WrongAdapter &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::WrongAdapter &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::WrongPolicy &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::WrongPolicy &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const PortableServer::Current_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    PortableServer::Current_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::Current::NoContext &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::Current::NoContext &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const PortableServer::Current_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    PortableServer::Current_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      PortableServer::Current::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-#endif // end #if !defined
diff --git a/TAO/tao/POAManager.cpp b/TAO/tao/POAManager.cpp
deleted file mode 100644
index fa7d5ca89bb..00000000000
--- a/TAO/tao/POAManager.cpp
+++ /dev/null
@@ -1,261 +0,0 @@
-// $Id$
-
-#include "tao/POAManager.h"
-#include "tao/POA.h"
-#include "tao/Server_Strategy_Factory.h"
-#include "tao/poa_macros.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/POAManager.i"
-#endif /* ! __ACE_INLINE__ */
-
-TAO_POA_Manager::TAO_POA_Manager (TAO_Object_Adapter &object_adapter)
-  : state_ (PortableServer::POAManager::HOLDING),
-    lock_ (object_adapter.lock ()),
-    poa_collection_ (),
-    object_adapter_ (object_adapter)
-{
-  this->object_adapter_.poa_manager_set_.insert (this);
-}
-
-TAO_POA_Manager::~TAO_POA_Manager (void)
-{
-  this->object_adapter_.poa_manager_set_.remove (this);
-}
-
-void
-TAO_POA_Manager::activate_i (CORBA::Environment &ACE_TRY_ENV)
-{
-  // This operation changes the state of the POA manager to active. If
-  // issued while the POA manager is in the inactive state, the
-  // AdapterInactive exception is raised.  Entering the active state
-  // enables the associated POAs to process requests.
-
-  if (this->state_ == PortableServer::POAManager::INACTIVE)
-    {
-      ACE_THROW (PortableServer::POAManager::AdapterInactive ());
-    }
-  else
-    {
-      this->state_ = PortableServer::POAManager::ACTIVE;
-    }
-}
-
-void
-TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects,
-                               CORBA::Boolean wait_for_completion,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  // Is the <wait_for_completion> semantics for this thread correct?
-  TAO_POA::check_for_valid_wait_for_completions (wait_for_completion,
-                                                 ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // This operation changes the state of the POA manager to
-  // inactive. If issued while the POA manager is in the inactive
-  // state, the AdapterInactive exception is raised.  Entering the
-  // inactive state causes the associated POAs to reject requests that
-  // have not begun to be executed as well as any new requests.
-
-  if (this->state_ == PortableServer::POAManager::INACTIVE)
-    {
-      ACE_THROW (PortableServer::POAManager::AdapterInactive ());
-    }
-  else
-    {
-      this->state_ = PortableServer::POAManager::INACTIVE;
-    }
-
-  // After changing the state, if the etherealize_objects parameter is:
-  //
-  // a) TRUE - the POA manager will cause all associated POAs that
-  // have the RETAIN and USE_SERVANT_MANAGER policies to perform the
-  // etherealize operation on the associated servant manager for all
-  // active objects.
-  //
-  // b) FALSE - the etherealize operation is not called. The purpose
-  // is to provide developers with a means to shut down POAs in a
-  // crisis (for example, unrecoverable error) situation.
-
-  // If the wait_for_completion parameter is FALSE, this operation
-  // will return immediately after changing the state. If the
-  // parameter is TRUE and the current thread is not in an invocation
-  // context dispatched by some POA belonging to the same ORB as this
-  // POA, this operation does not return until there are no actively
-  // executing requests in any of the POAs associated with this POA
-  // manager (that is, all requests that were started prior to the
-  // state change have completed) and, in the case of a TRUE
-  // etherealize_objects, all invocations of etherealize have
-  // completed for POAs having the RETAIN and USE_SERVANT_MANAGER
-  // policies. If the parameter is TRUE and the current thread is in
-  // an invocation context dispatched by some POA belonging to the
-  // same ORB as this POA the BAD_INV_ORDER exception is raised and
-  // the state is not changed.
-
-  for (POA_COLLECTION::iterator iterator = this->poa_collection_.begin ();
-       iterator != this->poa_collection_.end ();
-       ++iterator)
-    {
-      TAO_POA *poa = *iterator;
-      poa->deactivate_all_objects_i (etherealize_objects,
-                                     wait_for_completion,
-                                     ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-
-  // If the ORB::shutdown operation is called, it makes a call on
-  // deactivate with a TRUE etherealize_objects parameter for each POA
-  // manager known in the process; the wait_for_completion parameter
-  // to deactivate will be the same as the similarly named parameter
-  // of ORB::shutdown.
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-void
-TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion,
-                                  CORBA::Environment &ACE_TRY_ENV)
-{
-  // Is the <wait_for_completion> semantics for this thread correct?
-  TAO_POA::check_for_valid_wait_for_completions (wait_for_completion,
-                                                 ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // This operation changes the state of the POA manager to
-  // holding. If issued while the POA manager is in the inactive
-  // state, the AdapterInactive exception is raised.  Entering the
-  // holding state causes the associated POAs to queue incoming
-  // requests.  Any requests that have been queued but have not
-  // started executing will continue to be queued while in the holding
-  // state.
-
-  if (this->state_ == PortableServer::POAManager::INACTIVE)
-    {
-      ACE_THROW (PortableServer::POAManager::AdapterInactive ());
-    }
-  else
-    {
-      this->state_ = PortableServer::POAManager::HOLDING;
-    }
-
-  // If the wait_for_completion parameter is FALSE, this operation
-  // returns immediately after changing the state. If the parameter is
-  // TRUE and the current thread is not in an invocation context
-  // dispatched by some POA belonging to the same ORB as this POA,
-  // this operation does not return until either there are no actively
-  // executing requests in any of the POAs associated with this POA
-  // manager (that is, all requests that were started prior to the
-  // state change have completed) or the state of the POA manager is
-  // changed to a state other than holding. If the parameter is TRUE
-  // and the current thread is in an invocation context dispatched by
-  // some POA belonging to the same ORB as this POA the BAD_INV_ORDER
-  // exception is raised and the state is not changed.
-
-  if (wait_for_completion)
-    {
-      for (POA_COLLECTION::iterator iterator = this->poa_collection_.begin ();
-           iterator != this->poa_collection_.end ();
-           ++iterator)
-        {
-          TAO_POA *poa = *iterator;
-          poa->wait_for_completions (wait_for_completion,
-                                     ACE_TRY_ENV);
-          ACE_CHECK;
-        }
-    }
-}
-
-void
-TAO_POA_Manager::discard_requests_i (CORBA::Boolean wait_for_completion,
-                                     CORBA::Environment &ACE_TRY_ENV)
-{
-  // Is the <wait_for_completion> semantics for this thread correct?
-  TAO_POA::check_for_valid_wait_for_completions (wait_for_completion,
-                                                 ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // This operation changes the state of the POA manager to
-  // discarding. If issued while the POA manager is in the inactive
-  // state, the AdapterInactive exception is raised.  Entering the
-  // discarding state causes the associated POAs to discard incoming
-  // requests.  In addition, any requests that have been queued but
-  // have not started executing are discarded. When a request is
-  // discarded, a TRANSIENT system exception is returned to the
-  // client.
-
-  if (this->state_ == PortableServer::POAManager::INACTIVE)
-    {
-      ACE_THROW (PortableServer::POAManager::AdapterInactive ());
-    }
-  else
-    {
-      this->state_ = PortableServer::POAManager::DISCARDING;
-    }
-
-  // If the wait_for_completion parameter is FALSE, this operation
-  // returns immediately after changing the state. If the
-  // parameter is TRUE and the current thread is not in an
-  // invocation context dispatched by some POA belonging to the
-  // same ORB as this POA, this operation does not return until
-  // either there are no actively executing requests in any of the
-  // POAs associated with this POA manager (that is, all requests
-  // that were started prior to the state change have completed)
-  // or the state of the POA manager is changed to a state other
-  // than discarding. If the parameter is TRUE and the current
-  // thread is in an invocation context dispatched by some POA
-  // belonging to the same ORB as this POA the BAD_INV_ORDER
-  // exception is raised and the state is not changed.
-
-  if (wait_for_completion)
-    {
-      for (POA_COLLECTION::iterator iterator = this->poa_collection_.begin ();
-           iterator != this->poa_collection_.end ();
-           ++iterator)
-        {
-          TAO_POA *poa = *iterator;
-          poa->wait_for_completions (wait_for_completion,
-                                     ACE_TRY_ENV);
-          ACE_CHECK;
-        }
-    }
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-int
-TAO_POA_Manager::remove_poa (TAO_POA *poa)
-{
-  int result = this->poa_collection_.remove (poa);
-
-  if (result == 0)
-    {
-      if (this->poa_collection_.is_empty ())
-        {
-          // @@ This may cause segfault if another thread gets a hold
-          // at this POAManager but gets blocked on register POA
-          // waiting for remove_poa to complete.  I think we need to
-          // use the client side mapping to refcount this.
-          delete this;
-        }
-    }
-
-  return result;
-}
-
-int
-TAO_POA_Manager::register_poa (TAO_POA *poa)
-{
-  return this->poa_collection_.insert (poa);
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Unbounded_Set<TAO_POA *>;
-template class ACE_Unbounded_Set_Iterator<TAO_POA *>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Unbounded_Set<TAO_POA *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_POA *>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/POAManager.h b/TAO/tao/POAManager.h
deleted file mode 100644
index 4370f37be37..00000000000
--- a/TAO/tao/POAManager.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    POAManager.h
-//
-// = DESCRIPTION
-//     POAManager
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-// ============================================================================
-
-#ifndef TAO_POAMANAGER_H
-#define TAO_POAMANAGER_H
-
-#include "tao/POAS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// for POA skeleton.
-
-#include "tao/poa_macros.h"
-
-class TAO_POA;
-// Forward decl.
-
-class TAO_Export TAO_POA_Manager : public POA_PortableServer::POAManager
-{
-  friend class TAO_POA;
-  friend class TAO_Object_Adapter;
-
-public:
-
-  void activate (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  void hold_requests (CORBA::Boolean wait_for_completion,
-                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  void discard_requests (CORBA::Boolean wait_for_completion,
-                         CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  void deactivate (CORBA::Boolean etherealize_objects,
-                   CORBA::Boolean wait_for_completion,
-                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  PortableServer::POAManager::State get_state (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  TAO_POA_Manager (TAO_Object_Adapter &object_adapter);
-
-  ~TAO_POA_Manager (void);
-
-protected:
-
-  void activate_i (CORBA_Environment &ACE_TRY_ENV);
-
-  void deactivate_i (CORBA::Boolean etherealize_objects,
-                     CORBA::Boolean wait_for_completion,
-                     CORBA_Environment &ACE_TRY_ENV);
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  void hold_requests_i (CORBA::Boolean wait_for_completion,
-                        CORBA_Environment &ACE_TRY_ENV);
-
-  void discard_requests_i (CORBA::Boolean wait_for_completion,
-                           CORBA_Environment &ACE_TRY_ENV);
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  PortableServer::POAManager::State get_state_i ();
-
-  ACE_Lock &lock (void);
-
-  int remove_poa (TAO_POA *poa);
-
-  int register_poa (TAO_POA *poa);
-
-  PortableServer::POAManager::State state_;
-
-  ACE_Lock &lock_;
-
-  typedef ACE_Unbounded_Set<TAO_POA *> POA_COLLECTION;
-
-  POA_COLLECTION poa_collection_;
-
-  TAO_Object_Adapter &object_adapter_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/POAManager.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_POAMANAGER_H */
diff --git a/TAO/tao/POAManager.i b/TAO/tao/POAManager.i
deleted file mode 100644
index 28e8acbd991..00000000000
--- a/TAO/tao/POAManager.i
+++ /dev/null
@@ -1,70 +0,0 @@
-// $Id$
-
-#include "tao/Environment.h"
-
-ACE_INLINE ACE_Lock &
-TAO_POA_Manager::lock (void)
-{
-  return this->lock_;
-}
-
-ACE_INLINE void
-TAO_POA_Manager::activate (CORBA_Environment &ACE_TRY_ENV)
-{
-  // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
-
-  this->activate_i (ACE_TRY_ENV);
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-ACE_INLINE void
-TAO_POA_Manager::hold_requests (CORBA::Boolean wait_for_completion,
-                                CORBA_Environment &ACE_TRY_ENV)
-{
-  // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
-
-  this->hold_requests_i (wait_for_completion, ACE_TRY_ENV);
-}
-
-ACE_INLINE void
-TAO_POA_Manager::discard_requests (CORBA::Boolean wait_for_completion,
-                                   CORBA_Environment &ACE_TRY_ENV)
-{
-  // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
-
-  this->discard_requests_i (wait_for_completion, ACE_TRY_ENV);
-}
-
-ACE_INLINE void
-TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects,
-                             CORBA::Boolean wait_for_completion,
-                             CORBA_Environment &ACE_TRY_ENV)
-{
-  // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock ());
-
-  this->deactivate_i (etherealize_objects,
-                      wait_for_completion,
-                      ACE_TRY_ENV);
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-ACE_INLINE PortableServer::POAManager::State
-TAO_POA_Manager::get_state_i (void)
-{
-  return this->state_;
-}
-
-ACE_INLINE PortableServer::POAManager::State
-TAO_POA_Manager::get_state (CORBA::Environment &ACE_TRY_ENV)
-{
-  // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), this->state_);
-
-  return this->get_state_i ();
-}
diff --git a/TAO/tao/POAS.cpp b/TAO/tao/POAS.cpp
deleted file mode 100644
index a4de6c68583..00000000000
--- a/TAO/tao/POAS.cpp
+++ /dev/null
@@ -1,3004 +0,0 @@
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "tao/POAS.h"
-#include "tao/Server_Request.h"
-#include "tao/Operation_Table.h"
-#include "tao/ORB_Core.h"
-#include "tao/ORB.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/POAS.i"
-#endif // !defined INLINE
-
-ACE_RCSID(tao, POAS, "$Id$")
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-class TAO_PortableServer_ThreadPolicy_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-{
-private:
-  unsigned int hash (const char *str, unsigned int len);
-public:
- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-};
-/* starting time is 0:12:47 */
-/* C++ code produced by gperf version 2.7 (GNU C++ version) */
-/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_PortableServer_ThreadPolicy_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_PortableServer_ThreadPolicy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17,  0, 17,  0, 17,  0,
-      0,  0, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17,  0, 17, 17, 17,
-     17,  0, 17, 17, 17, 17, 17, 17,
-    };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
-}
-
-const class TAO_operation_db_entry *
-TAO_PortableServer_ThreadPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 6,
-      MIN_WORD_LENGTH = 4,
-      MAX_WORD_LENGTH = 16,
-      MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 16,
-      HASH_VALUE_RANGE = 13,
-      DUPLICATES = 0
-    };
-
-  static const class TAO_operation_db_entry  wordlist[] =
-    {
-      {"",0}, {"",0}, {"",0}, {"",0},
-      {"copy", 	&POA_PortableServer::ThreadPolicy::copy_skel},
-      {"_is_a",  &POA_PortableServer::ThreadPolicy::_is_a_skel},
-      {"",0},
-      {"destroy", 	&POA_PortableServer::ThreadPolicy::destroy_skel},
-      {"",0}, {"",0},
-      {"_get_value", 	&POA_PortableServer::ThreadPolicy::_get_value_skel},
-      {"",0}, {"",0},
-      {"_non_existent",  &POA_PortableServer::ThreadPolicy::_non_existent_skel},
-      {"",0}, {"",0},
-      {"_get_policy_type", 	&POA_PortableServer::ThreadPolicy::_get_policy_type_skel},
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      unsigned int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-        {
-          const char *s = wordlist[key].opname_;
-
-          if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
-/* ending time is 0:12:47 */
-TAO_PortableServer_ThreadPolicy_Perfect_Hash_OpTable tao_PortableServer_ThreadPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-// skeleton constructor
-POA_PortableServer::ThreadPolicy::ThreadPolicy (void)
-{
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-  this->optable_ = &tao_PortableServer_ThreadPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-void POA_PortableServer::ThreadPolicy::_get_value_skel (
-                                                        CORBA::ServerRequest &_tao_server_request,
-                                                        void *_tao_object_reference,
-                                                        void * /* context */,
-                                                        CORBA::Environment &ACE_TRY_ENV
-                                                        )
-{
-  POA_PortableServer::ThreadPolicy *_tao_impl = (POA_PortableServer::ThreadPolicy *)_tao_object_reference;
-  PortableServer::ThreadPolicyValue _tao_retval;
-  _tao_retval = _tao_impl->value (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval)
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-}
-
-void POA_PortableServer::ThreadPolicy::_is_a_skel (
-                                                   CORBA::ServerRequest &_tao_server_request,
-                                                   void * _tao_object_reference,
-                                                   void * /*context*/,
-                                                   CORBA::Environment &ACE_TRY_ENV
-                                                   )
-{
-  static const TAO_Param_Data_Skel PortableServer_ThreadPolicy_is_a_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0},
-    {CORBA::_tc_string, CORBA::ARG_IN, 0}
-  };
-  static const TAO_Call_Data_Skel PortableServer_ThreadPolicy_is_a_calldata =
-  {"_is_a", 1, 2, PortableServer_ThreadPolicy_is_a_paramdata};
-  POA_PortableServer::ThreadPolicy_ptr  _tao_impl = (POA_PortableServer::ThreadPolicy_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  CORBA::String_var _tao_value;
-  _tao_server_request.demarshal (
-    ACE_TRY_ENV,
-    &PortableServer_ThreadPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-  ACE_CHECK;
-  _tao_retval = _tao_impl->_is_a (_tao_value.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &PortableServer_ThreadPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-}
-
-void POA_PortableServer::ThreadPolicy::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * /* _tao_object_reference */ ,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel PortableServer_ThreadPolicy_non_existent_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0}
-  };
-  static const TAO_Call_Data_Skel PortableServer_ThreadPolicy_non_existent_calldata =
-  {"_non_existent", 1, 1, PortableServer_ThreadPolicy_non_existent_paramdata};
-  CORBA::Boolean _tao_retval = 0;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &PortableServer_ThreadPolicy_non_existent_calldata,
-    &_tao_retval
-  );
-}
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-CORBA::Boolean POA_PortableServer::ThreadPolicy::_is_a (
-                                                        const char* value,
-                                                        CORBA::Environment &ACE_TRY_ENV
-                                                        )
-{
-  if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ThreadPolicy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-    return 1;
-  else
-    return 0;
-}
-
-void* POA_PortableServer::ThreadPolicy::_downcast (
-                                                   const char* logical_type_id
-                                                   )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/ThreadPolicy:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::ThreadPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-void POA_PortableServer::ThreadPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
-}
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-const char* POA_PortableServer::ThreadPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/ThreadPolicy:1.0";
-}
-
-POA_PortableServer::_tao_collocated_ThreadPolicy::_tao_collocated_ThreadPolicy (
-                                                                                POA_PortableServer::ThreadPolicy_ptr  servant,
-                                                                                TAO_Stub *stub
-                                                                                )
-  : ACE_NESTED_CLASS (PortableServer, ThreadPolicy) (stub, servant, 1),
-    ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_PortableServer::ThreadPolicy_ptr POA_PortableServer::_tao_collocated_ThreadPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_ThreadPolicy::_is_a (
-                                                                        const char* logical_type_id,
-                                                                        CORBA::Environment &ACE_TRY_ENV
-                                                                        )
-{
-  return this->servant_->_is_a (
-                                logical_type_id,
-                                ACE_TRY_ENV
-                                );
-}
-
-
-CORBA::Policy_ptr POA_PortableServer::_tao_collocated_ThreadPolicy::copy (
-                                                                          CORBA::Environment &ACE_TRY_ENV
-                                                                          )
-{
-  return this->servant_->copy (
-                               ACE_TRY_ENV
-                               );
-}
-
-void POA_PortableServer::_tao_collocated_ThreadPolicy::destroy (
-                                                                CORBA::Environment &ACE_TRY_ENV
-                                                                )
-{
-  this->servant_->destroy (
-                           ACE_TRY_ENV
-                           );
-}
-
-CORBA::PolicyType POA_PortableServer::_tao_collocated_ThreadPolicy::policy_type (
-                                                                                 CORBA::Environment &ACE_TRY_ENV
-                                                                                 )
-{
-  return this->servant_->policy_type (ACE_TRY_ENV);
-}
-
-PortableServer::ThreadPolicyValue
-POA_PortableServer::_tao_collocated_ThreadPolicy::value (
-                                                         CORBA::Environment &ACE_TRY_ENV
-                                                         )
-{
-  return this->servant_->value(ACE_TRY_ENV);
-}
-
-PortableServer::ThreadPolicy*
-POA_PortableServer::ThreadPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_PortableServer::_tao_collocated_ThreadPolicy (this, stub);
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-class TAO_PortableServer_LifespanPolicy_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-{
-private:
-  unsigned int hash (const char *str, unsigned int len);
-public:
- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-};
-/* starting time is 0:12:47 */
-/* C++ code produced by gperf version 2.7 (GNU C++ version) */
-/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_PortableServer_LifespanPolicy_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_PortableServer_LifespanPolicy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17,  0, 17,  0, 17,  0,
-      0,  0, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17,  0, 17, 17, 17,
-     17,  0, 17, 17, 17, 17, 17, 17,
-    };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
-}
-
-const class TAO_operation_db_entry *
-TAO_PortableServer_LifespanPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 6,
-      MIN_WORD_LENGTH = 4,
-      MAX_WORD_LENGTH = 16,
-      MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 16,
-      HASH_VALUE_RANGE = 13,
-      DUPLICATES = 0
-    };
-
-  static const class TAO_operation_db_entry  wordlist[] =
-    {
-      {"",0}, {"",0}, {"",0}, {"",0},
-      {"copy", 	&POA_PortableServer::LifespanPolicy::copy_skel},
-      {"_is_a",  &POA_PortableServer::LifespanPolicy::_is_a_skel},
-      {"",0},
-      {"destroy", 	&POA_PortableServer::LifespanPolicy::destroy_skel},
-      {"",0}, {"",0},
-      {"_get_value", 	&POA_PortableServer::LifespanPolicy::_get_value_skel},
-      {"",0}, {"",0},
-      {"_non_existent",  &POA_PortableServer::LifespanPolicy::_non_existent_skel},
-      {"",0}, {"",0},
-      {"_get_policy_type", 	&POA_PortableServer::LifespanPolicy::_get_policy_type_skel},
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      unsigned int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-        {
-          const char *s = wordlist[key].opname_;
-
-          if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
-/* ending time is 0:12:47 */
-TAO_PortableServer_LifespanPolicy_Perfect_Hash_OpTable tao_PortableServer_LifespanPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-// skeleton constructor
-POA_PortableServer::LifespanPolicy::LifespanPolicy (void)
-{
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-  this->optable_ = &tao_PortableServer_LifespanPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-void POA_PortableServer::LifespanPolicy::_get_value_skel (
-                                                          CORBA::ServerRequest &_tao_server_request,
-                                                          void *_tao_object_reference,
-                                                          void * /* context */,
-                                                          CORBA::Environment &ACE_TRY_ENV
-                                                          )
-{
-  POA_PortableServer::LifespanPolicy *_tao_impl = (POA_PortableServer::LifespanPolicy *)_tao_object_reference;
-  PortableServer::LifespanPolicyValue _tao_retval;
-  _tao_retval = _tao_impl->value (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval)
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_PortableServer::LifespanPolicy::_is_a_skel (
-                                                     CORBA::ServerRequest &_tao_server_request,
-                                                     void * _tao_object_reference,
-                                                     void * /*context*/,
-                                                     CORBA::Environment &ACE_TRY_ENV
-                                                     )
-{
-  static const TAO_Param_Data_Skel PortableServer_LifespanPolicy_is_a_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0},
-    {CORBA::_tc_string, CORBA::ARG_IN, 0}
-  };
-  static const TAO_Call_Data_Skel PortableServer_LifespanPolicy_is_a_calldata =
-  {"_is_a", 1, 2, PortableServer_LifespanPolicy_is_a_paramdata};
-  POA_PortableServer::LifespanPolicy_ptr  _tao_impl = (POA_PortableServer::LifespanPolicy_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  CORBA::String_var _tao_value;
-  _tao_server_request.demarshal (
-    ACE_TRY_ENV,
-    &PortableServer_LifespanPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-  ACE_CHECK;
-  _tao_retval = _tao_impl->_is_a (_tao_value.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &PortableServer_LifespanPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-}
-
-void POA_PortableServer::LifespanPolicy::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * /* _tao_object_reference */ ,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel PortableServer_LifespanPolicy_non_existent_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0}
-  };
-  static const TAO_Call_Data_Skel PortableServer_LifespanPolicy_non_existent_calldata =
-  {"_non_existent", 1, 1, PortableServer_LifespanPolicy_non_existent_paramdata};
-  CORBA::Boolean _tao_retval = 0;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &PortableServer_LifespanPolicy_non_existent_calldata,
-    &_tao_retval
-  );
-}
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-CORBA::Boolean POA_PortableServer::LifespanPolicy::_is_a (
-                                                          const char* value,
-                                                          CORBA::Environment &ACE_TRY_ENV
-                                                          )
-{
-  if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/LifespanPolicy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-    return 1;
-  else
-    return 0;
-}
-
-void* POA_PortableServer::LifespanPolicy::_downcast (
-                                                     const char* logical_type_id
-                                                     )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/LifespanPolicy:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::LifespanPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-void POA_PortableServer::LifespanPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
-}
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-const char* POA_PortableServer::LifespanPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/LifespanPolicy:1.0";
-}
-
-POA_PortableServer::_tao_collocated_LifespanPolicy::_tao_collocated_LifespanPolicy (
-                                                                                    POA_PortableServer::LifespanPolicy_ptr  servant,
-                                                                                    TAO_Stub *stub
-                                                                                    )
-  : ACE_NESTED_CLASS (PortableServer, LifespanPolicy) (stub, servant, 1),
-    ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_PortableServer::LifespanPolicy_ptr POA_PortableServer::_tao_collocated_LifespanPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_LifespanPolicy::_is_a (
-                                                                          const char* logical_type_id,
-                                                                          CORBA::Environment &ACE_TRY_ENV
-                                                                          )
-{
-  return this->servant_->_is_a (
-                                logical_type_id,
-                                ACE_TRY_ENV
-                                );
-}
-
-CORBA::Policy_ptr POA_PortableServer::_tao_collocated_LifespanPolicy::copy (
-                                                                            CORBA::Environment &ACE_TRY_ENV
-                                                                            )
-{
-  return this->servant_->copy (
-                               ACE_TRY_ENV
-                               );
-}
-
-void POA_PortableServer::_tao_collocated_LifespanPolicy::destroy (
-                                                                  CORBA::Environment &ACE_TRY_ENV
-                                                                  )
-{
-  this->servant_->destroy (
-                           ACE_TRY_ENV
-                           );
-}
-
-CORBA::PolicyType POA_PortableServer::_tao_collocated_LifespanPolicy::policy_type (
-                                                                                   CORBA::Environment &ACE_TRY_ENV
-                                                                                   )
-{
-  return this->servant_->policy_type (ACE_TRY_ENV);
-}
-
-PortableServer::LifespanPolicyValue
-POA_PortableServer::_tao_collocated_LifespanPolicy::value (
-                                                           CORBA::Environment &ACE_TRY_ENV
-                                                           )
-{
-  return this->servant_->value(ACE_TRY_ENV);
-}
-
-PortableServer::LifespanPolicy*
-POA_PortableServer::LifespanPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_PortableServer::_tao_collocated_LifespanPolicy (this, stub);
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-class TAO_PortableServer_IdUniquenessPolicy_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-{
-private:
-  unsigned int hash (const char *str, unsigned int len);
-public:
- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-};
-/* starting time is 0:12:47 */
-/* C++ code produced by gperf version 2.7 (GNU C++ version) */
-/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_PortableServer_IdUniquenessPolicy_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_PortableServer_IdUniquenessPolicy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17,  0, 17,  0, 17,  0,
-      0,  0, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17,  0, 17, 17, 17,
-     17,  0, 17, 17, 17, 17, 17, 17,
-    };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
-}
-
-const class TAO_operation_db_entry *
-TAO_PortableServer_IdUniquenessPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 6,
-      MIN_WORD_LENGTH = 4,
-      MAX_WORD_LENGTH = 16,
-      MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 16,
-      HASH_VALUE_RANGE = 13,
-      DUPLICATES = 0
-    };
-
-  static const class TAO_operation_db_entry  wordlist[] =
-    {
-      {"",0}, {"",0}, {"",0}, {"",0},
-      {"copy", 	&POA_PortableServer::IdUniquenessPolicy::copy_skel},
-      {"_is_a",  &POA_PortableServer::IdUniquenessPolicy::_is_a_skel},
-      {"",0},
-      {"destroy", 	&POA_PortableServer::IdUniquenessPolicy::destroy_skel},
-      {"",0}, {"",0},
-      {"_get_value", 	&POA_PortableServer::IdUniquenessPolicy::_get_value_skel},
-      {"",0}, {"",0},
-      {"_non_existent",  &POA_PortableServer::IdUniquenessPolicy::_non_existent_skel},
-      {"",0}, {"",0},
-      {"_get_policy_type", 	&POA_PortableServer::IdUniquenessPolicy::_get_policy_type_skel},
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      unsigned int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-        {
-          const char *s = wordlist[key].opname_;
-
-          if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
-/* ending time is 0:12:47 */
-TAO_PortableServer_IdUniquenessPolicy_Perfect_Hash_OpTable tao_PortableServer_IdUniquenessPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-// skeleton constructor
-POA_PortableServer::IdUniquenessPolicy::IdUniquenessPolicy (void)
-{
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-  this->optable_ = &tao_PortableServer_IdUniquenessPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-void POA_PortableServer::IdUniquenessPolicy::_get_value_skel (
-                                                              CORBA::ServerRequest &_tao_server_request,
-                                                              void *_tao_object_reference,
-                                                              void * /* context */,
-                                                              CORBA::Environment &ACE_TRY_ENV
-                                                              )
-{
-  POA_PortableServer::IdUniquenessPolicy *_tao_impl = (POA_PortableServer::IdUniquenessPolicy *)_tao_object_reference;
-  PortableServer::IdUniquenessPolicyValue _tao_retval;
-  _tao_retval = _tao_impl->value (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval)
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_PortableServer::IdUniquenessPolicy::_is_a_skel (
-                                                         CORBA::ServerRequest &_tao_server_request,
-                                                         void * _tao_object_reference,
-                                                         void * /*context*/,
-                                                         CORBA::Environment &ACE_TRY_ENV
-                                                         )
-{
-  static const TAO_Param_Data_Skel PortableServer_IdUniquenessPolicy_is_a_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0},
-    {CORBA::_tc_string, CORBA::ARG_IN, 0}
-  };
-  static const TAO_Call_Data_Skel PortableServer_IdUniquenessPolicy_is_a_calldata =
-  {"_is_a", 1, 2, PortableServer_IdUniquenessPolicy_is_a_paramdata};
-  POA_PortableServer::IdUniquenessPolicy_ptr  _tao_impl = (POA_PortableServer::IdUniquenessPolicy_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  CORBA::String_var _tao_value;
-  _tao_server_request.demarshal (
-    ACE_TRY_ENV,
-    &PortableServer_IdUniquenessPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-  ACE_CHECK;
-  _tao_retval = _tao_impl->_is_a (_tao_value.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &PortableServer_IdUniquenessPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-}
-
-void POA_PortableServer::IdUniquenessPolicy::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * /* _tao_object_reference */ ,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel PortableServer_IdUniquenessPolicy_non_existent_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0}
-  };
-  static const TAO_Call_Data_Skel PortableServer_IdUniquenessPolicy_non_existent_calldata =
-  {"_non_existent", 1, 1, PortableServer_IdUniquenessPolicy_non_existent_paramdata};
-  CORBA::Boolean _tao_retval = 0;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &PortableServer_IdUniquenessPolicy_non_existent_calldata,
-    &_tao_retval
-  );
-}
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-CORBA::Boolean POA_PortableServer::IdUniquenessPolicy::_is_a (
-                                                              const char* value,
-                                                              CORBA::Environment &ACE_TRY_ENV
-                                                              )
-{
-  if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/IdUniquenessPolicy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-    return 1;
-  else
-    return 0;
-}
-
-void* POA_PortableServer::IdUniquenessPolicy::_downcast (
-                                                         const char* logical_type_id
-                                                         )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/IdUniquenessPolicy:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::IdUniquenessPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-void POA_PortableServer::IdUniquenessPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
-}
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-const char* POA_PortableServer::IdUniquenessPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/IdUniquenessPolicy:1.0";
-}
-
-POA_PortableServer::_tao_collocated_IdUniquenessPolicy::_tao_collocated_IdUniquenessPolicy (
-                                                                                            POA_PortableServer::IdUniquenessPolicy_ptr  servant,
-                                                                                            TAO_Stub *stub
-                                                                                            )
-  : ACE_NESTED_CLASS (PortableServer, IdUniquenessPolicy) (stub, servant, 1),
-    ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_PortableServer::IdUniquenessPolicy_ptr POA_PortableServer::_tao_collocated_IdUniquenessPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_IdUniquenessPolicy::_is_a (
-                                                                              const char* logical_type_id,
-                                                                              CORBA::Environment &ACE_TRY_ENV
-                                                                              )
-{
-  return this->servant_->_is_a (
-                                logical_type_id,
-                                ACE_TRY_ENV
-                                );
-}
-
-CORBA::Policy_ptr POA_PortableServer::_tao_collocated_IdUniquenessPolicy::copy (
-                                                                                CORBA::Environment &ACE_TRY_ENV
-                                                                                )
-{
-  return this->servant_->copy (
-                               ACE_TRY_ENV
-                               );
-}
-
-void POA_PortableServer::_tao_collocated_IdUniquenessPolicy::destroy (
-                                                                      CORBA::Environment &ACE_TRY_ENV
-                                                                      )
-{
-  this->servant_->destroy (
-                           ACE_TRY_ENV
-                           );
-}
-
-CORBA::PolicyType POA_PortableServer::_tao_collocated_IdUniquenessPolicy::policy_type (
-                                                                                       CORBA::Environment &ACE_TRY_ENV
-                                                                                       )
-{
-  return this->servant_->policy_type (ACE_TRY_ENV);
-}
-
-PortableServer::IdUniquenessPolicyValue
-POA_PortableServer::_tao_collocated_IdUniquenessPolicy::value (
-                                                               CORBA::Environment &ACE_TRY_ENV
-                                                               )
-{
-  return this->servant_->value(ACE_TRY_ENV);
-}
-
-
-PortableServer::IdUniquenessPolicy*
-POA_PortableServer::IdUniquenessPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_PortableServer::_tao_collocated_IdUniquenessPolicy (this, stub);
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-class TAO_PortableServer_IdAssignmentPolicy_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-{
-private:
-  unsigned int hash (const char *str, unsigned int len);
-public:
- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-};
-/* starting time is 0:12:47 */
-/* C++ code produced by gperf version 2.7 (GNU C++ version) */
-/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_PortableServer_IdAssignmentPolicy_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_PortableServer_IdAssignmentPolicy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17,  0, 17,  0, 17,  0,
-      0,  0, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17,  0, 17, 17, 17,
-     17,  0, 17, 17, 17, 17, 17, 17,
-    };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
-}
-
-const class TAO_operation_db_entry *
-TAO_PortableServer_IdAssignmentPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 6,
-      MIN_WORD_LENGTH = 4,
-      MAX_WORD_LENGTH = 16,
-      MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 16,
-      HASH_VALUE_RANGE = 13,
-      DUPLICATES = 0
-    };
-
-  static const class TAO_operation_db_entry  wordlist[] =
-    {
-      {"",0}, {"",0}, {"",0}, {"",0},
-      {"copy", 	&POA_PortableServer::IdAssignmentPolicy::copy_skel},
-      {"_is_a",  &POA_PortableServer::IdAssignmentPolicy::_is_a_skel},
-      {"",0},
-      {"destroy", 	&POA_PortableServer::IdAssignmentPolicy::destroy_skel},
-      {"",0}, {"",0},
-      {"_get_value", 	&POA_PortableServer::IdAssignmentPolicy::_get_value_skel},
-      {"",0}, {"",0},
-      {"_non_existent",  &POA_PortableServer::IdAssignmentPolicy::_non_existent_skel},
-      {"",0}, {"",0},
-      {"_get_policy_type", 	&POA_PortableServer::IdAssignmentPolicy::_get_policy_type_skel},
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      unsigned int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-        {
-          const char *s = wordlist[key].opname_;
-
-          if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
-/* ending time is 0:12:47 */
-TAO_PortableServer_IdAssignmentPolicy_Perfect_Hash_OpTable tao_PortableServer_IdAssignmentPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-// skeleton constructor
-POA_PortableServer::IdAssignmentPolicy::IdAssignmentPolicy (void)
-{
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-  this->optable_ = &tao_PortableServer_IdAssignmentPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-void POA_PortableServer::IdAssignmentPolicy::_get_value_skel (
-                                                              CORBA::ServerRequest &_tao_server_request,
-                                                              void *_tao_object_reference,
-                                                              void * /* context */,
-                                                              CORBA::Environment &ACE_TRY_ENV
-                                                              )
-{
-  POA_PortableServer::IdAssignmentPolicy *_tao_impl = (POA_PortableServer::IdAssignmentPolicy *)_tao_object_reference;
-  PortableServer::IdAssignmentPolicyValue _tao_retval;
-  _tao_retval = _tao_impl->value (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval)
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_PortableServer::IdAssignmentPolicy::_is_a_skel (
-                                                         CORBA::ServerRequest &_tao_server_request,
-                                                         void * _tao_object_reference,
-                                                         void * /*context*/,
-                                                         CORBA::Environment &ACE_TRY_ENV
-                                                         )
-{
-  static const TAO_Param_Data_Skel PortableServer_IdAssignmentPolicy_is_a_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0},
-    {CORBA::_tc_string, CORBA::ARG_IN, 0}
-  };
-  static const TAO_Call_Data_Skel PortableServer_IdAssignmentPolicy_is_a_calldata =
-  {"_is_a", 1, 2, PortableServer_IdAssignmentPolicy_is_a_paramdata};
-  POA_PortableServer::IdAssignmentPolicy_ptr  _tao_impl = (POA_PortableServer::IdAssignmentPolicy_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  CORBA::String_var _tao_value;
-  _tao_server_request.demarshal (
-    ACE_TRY_ENV,
-    &PortableServer_IdAssignmentPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-  ACE_CHECK;
-  _tao_retval = _tao_impl->_is_a (_tao_value.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &PortableServer_IdAssignmentPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-}
-
-void POA_PortableServer::IdAssignmentPolicy::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * /* _tao_object_reference */ ,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel PortableServer_IdAssignmentPolicy_non_existent_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0}
-  };
-  static const TAO_Call_Data_Skel PortableServer_IdAssignmentPolicy_non_existent_calldata =
-  {"_non_existent", 1, 1, PortableServer_IdAssignmentPolicy_non_existent_paramdata};
-  CORBA::Boolean _tao_retval = 0;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &PortableServer_IdAssignmentPolicy_non_existent_calldata,
-    &_tao_retval
-  );
-}
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-CORBA::Boolean POA_PortableServer::IdAssignmentPolicy::_is_a (
-                                                              const char* value,
-                                                              CORBA::Environment &ACE_TRY_ENV
-                                                              )
-{
-  if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-    return 1;
-  else
-    return 0;
-}
-
-void* POA_PortableServer::IdAssignmentPolicy::_downcast (
-                                                         const char* logical_type_id
-                                                         )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::IdAssignmentPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-void POA_PortableServer::IdAssignmentPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
-}
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-const char* POA_PortableServer::IdAssignmentPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0";
-}
-
-POA_PortableServer::_tao_collocated_IdAssignmentPolicy::_tao_collocated_IdAssignmentPolicy (
-                                                                                            POA_PortableServer::IdAssignmentPolicy_ptr  servant,
-                                                                                            TAO_Stub *stub
-                                                                                            )
-  : ACE_NESTED_CLASS (PortableServer, IdAssignmentPolicy) (stub, servant, 1),
-    ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_PortableServer::IdAssignmentPolicy_ptr POA_PortableServer::_tao_collocated_IdAssignmentPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_IdAssignmentPolicy::_is_a (
-                                                                              const char* logical_type_id,
-                                                                              CORBA::Environment &ACE_TRY_ENV
-                                                                              )
-{
-  return this->servant_->_is_a (
-                                logical_type_id,
-                                ACE_TRY_ENV
-                                );
-}
-
-CORBA::Policy_ptr POA_PortableServer::_tao_collocated_IdAssignmentPolicy::copy (
-                                                                                CORBA::Environment &ACE_TRY_ENV
-                                                                                )
-{
-  return this->servant_->copy (
-                               ACE_TRY_ENV
-                               );
-}
-
-void POA_PortableServer::_tao_collocated_IdAssignmentPolicy::destroy (
-                                                                      CORBA::Environment &ACE_TRY_ENV
-                                                                      )
-{
-  this->servant_->destroy (
-                           ACE_TRY_ENV
-                           );
-}
-
-CORBA::PolicyType POA_PortableServer::_tao_collocated_IdAssignmentPolicy::policy_type (
-                                                                                       CORBA::Environment &ACE_TRY_ENV
-                                                                                       )
-{
-  return this->servant_->policy_type (ACE_TRY_ENV);
-}
-
-PortableServer::IdAssignmentPolicyValue
-POA_PortableServer::_tao_collocated_IdAssignmentPolicy::value (
-                                                               CORBA::Environment &ACE_TRY_ENV
-                                                               )
-{
-  return this->servant_->value(ACE_TRY_ENV);
-}
-
-PortableServer::IdAssignmentPolicy*
-POA_PortableServer::IdAssignmentPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_PortableServer::_tao_collocated_IdAssignmentPolicy (this, stub);
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-class TAO_PortableServer_ImplicitActivationPolicy_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-{
-private:
-  unsigned int hash (const char *str, unsigned int len);
-public:
- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-};
-/* starting time is 0:12:47 */
-/* C++ code produced by gperf version 2.7 (GNU C++ version) */
-/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_PortableServer_ImplicitActivationPolicy_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_PortableServer_ImplicitActivationPolicy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17,  0, 17,  0, 17,  0,
-      0,  0, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17,  0, 17, 17, 17,
-     17,  0, 17, 17, 17, 17, 17, 17,
-    };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
-}
-
-const class TAO_operation_db_entry *
-TAO_PortableServer_ImplicitActivationPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 6,
-      MIN_WORD_LENGTH = 4,
-      MAX_WORD_LENGTH = 16,
-      MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 16,
-      HASH_VALUE_RANGE = 13,
-      DUPLICATES = 0
-    };
-
-  static const class TAO_operation_db_entry  wordlist[] =
-    {
-      {"",0}, {"",0}, {"",0}, {"",0},
-      {"copy", 	&POA_PortableServer::ImplicitActivationPolicy::copy_skel},
-      {"_is_a",  &POA_PortableServer::ImplicitActivationPolicy::_is_a_skel},
-      {"",0},
-      {"destroy", 	&POA_PortableServer::ImplicitActivationPolicy::destroy_skel},
-      {"",0}, {"",0},
-      {"_get_value", 	&POA_PortableServer::ImplicitActivationPolicy::_get_value_skel},
-      {"",0}, {"",0},
-      {"_non_existent",  &POA_PortableServer::ImplicitActivationPolicy::_non_existent_skel},
-      {"",0}, {"",0},
-      {"_get_policy_type", 	&POA_PortableServer::ImplicitActivationPolicy::_get_policy_type_skel},
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      unsigned int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-        {
-          const char *s = wordlist[key].opname_;
-
-          if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
-/* ending time is 0:12:47 */
-TAO_PortableServer_ImplicitActivationPolicy_Perfect_Hash_OpTable tao_PortableServer_ImplicitActivationPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-// skeleton constructor
-POA_PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy (void)
-{
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-  this->optable_ = &tao_PortableServer_ImplicitActivationPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-void POA_PortableServer::ImplicitActivationPolicy::_get_value_skel (
-                                                                    CORBA::ServerRequest &_tao_server_request,
-                                                                    void *_tao_object_reference,
-                                                                    void * /* context */,
-                                                                    CORBA::Environment &ACE_TRY_ENV
-                                                                    )
-{
-  POA_PortableServer::ImplicitActivationPolicy *_tao_impl = (POA_PortableServer::ImplicitActivationPolicy *)_tao_object_reference;
-  PortableServer::ImplicitActivationPolicyValue _tao_retval;
-  _tao_retval = _tao_impl->value (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval)
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_PortableServer::ImplicitActivationPolicy::_is_a_skel (
-                                                               CORBA::ServerRequest &_tao_server_request,
-                                                               void * _tao_object_reference,
-                                                               void * /*context*/,
-                                                               CORBA::Environment &ACE_TRY_ENV
-                                                               )
-{
-  static const TAO_Param_Data_Skel PortableServer_ImplicitActivationPolicy_is_a_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0},
-    {CORBA::_tc_string, CORBA::ARG_IN, 0}
-  };
-  static const TAO_Call_Data_Skel PortableServer_ImplicitActivationPolicy_is_a_calldata =
-  {"_is_a", 1, 2, PortableServer_ImplicitActivationPolicy_is_a_paramdata};
-  POA_PortableServer::ImplicitActivationPolicy_ptr  _tao_impl = (POA_PortableServer::ImplicitActivationPolicy_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  CORBA::String_var _tao_value;
-  _tao_server_request.demarshal (
-    ACE_TRY_ENV,
-    &PortableServer_ImplicitActivationPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-  ACE_CHECK;
-  _tao_retval = _tao_impl->_is_a (_tao_value.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &PortableServer_ImplicitActivationPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-}
-
-void POA_PortableServer::ImplicitActivationPolicy::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * /* _tao_object_reference */ ,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel PortableServer_ImplicitActivationPolicy_non_existent_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0}
-  };
-  static const TAO_Call_Data_Skel PortableServer_ImplicitActivationPolicy_non_existent_calldata =
-  {"_non_existent", 1, 1, PortableServer_ImplicitActivationPolicy_non_existent_paramdata};
-  CORBA::Boolean _tao_retval = 0;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &PortableServer_ImplicitActivationPolicy_non_existent_calldata,
-    &_tao_retval
-  );
-}
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-CORBA::Boolean POA_PortableServer::ImplicitActivationPolicy::_is_a (
-                                                                    const char* value,
-                                                                    CORBA::Environment &ACE_TRY_ENV
-                                                                    )
-{
-  if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ImplicitActivationPolicy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-    return 1;
-  else
-    return 0;
-}
-
-void* POA_PortableServer::ImplicitActivationPolicy::_downcast (
-                                                               const char* logical_type_id
-                                                               )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/ImplicitActivationPolicy:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::ImplicitActivationPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-void POA_PortableServer::ImplicitActivationPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
-}
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-const char* POA_PortableServer::ImplicitActivationPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/ImplicitActivationPolicy:1.0";
-}
-
-POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::_tao_collocated_ImplicitActivationPolicy (
-                                                                                                        POA_PortableServer::ImplicitActivationPolicy_ptr  servant,
-                                                                                                        TAO_Stub *stub
-                                                                                                        )
-  : ACE_NESTED_CLASS (PortableServer, ImplicitActivationPolicy) (stub, servant, 1),
-    ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_PortableServer::ImplicitActivationPolicy_ptr POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::_is_a (
-                                                                                    const char* logical_type_id,
-                                                                                    CORBA::Environment &ACE_TRY_ENV
-                                                                                    )
-{
-  return this->servant_->_is_a (
-                                logical_type_id,
-                                ACE_TRY_ENV
-                                );
-}
-
-CORBA::Policy_ptr POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::copy (
-                                                                                      CORBA::Environment &ACE_TRY_ENV
-                                                                                      )
-{
-  return this->servant_->copy (
-                               ACE_TRY_ENV
-                               );
-}
-
-void POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::destroy (
-                                                                            CORBA::Environment &ACE_TRY_ENV
-                                                                            )
-{
-  this->servant_->destroy (
-                           ACE_TRY_ENV
-                           );
-}
-
-CORBA::PolicyType POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::policy_type (
-                                                                                             CORBA::Environment &ACE_TRY_ENV
-                                                                                             )
-{
-  return this->servant_->policy_type (ACE_TRY_ENV);
-}
-
-PortableServer::ImplicitActivationPolicyValue
-POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::value (
-                                                                     CORBA::Environment &ACE_TRY_ENV
-                                                                     )
-{
-  return this->servant_->value(ACE_TRY_ENV);
-}
-
-PortableServer::ImplicitActivationPolicy*
-POA_PortableServer::ImplicitActivationPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_PortableServer::_tao_collocated_ImplicitActivationPolicy (this, stub);
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-class TAO_PortableServer_ServantRetentionPolicy_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-{
-private:
-  unsigned int hash (const char *str, unsigned int len);
-public:
- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-};
-/* starting time is 0:12:47 */
-/* C++ code produced by gperf version 2.7 (GNU C++ version) */
-/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_PortableServer_ServantRetentionPolicy_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_PortableServer_ServantRetentionPolicy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17,  0, 17,  0, 17,  0,
-      0,  0, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17,  0, 17, 17, 17,
-     17,  0, 17, 17, 17, 17, 17, 17,
-    };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
-}
-
-const class TAO_operation_db_entry *
-TAO_PortableServer_ServantRetentionPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 6,
-      MIN_WORD_LENGTH = 4,
-      MAX_WORD_LENGTH = 16,
-      MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 16,
-      HASH_VALUE_RANGE = 13,
-      DUPLICATES = 0
-    };
-
-  static const class TAO_operation_db_entry  wordlist[] =
-    {
-      {"",0}, {"",0}, {"",0}, {"",0},
-      {"copy", 	&POA_PortableServer::ServantRetentionPolicy::copy_skel},
-      {"_is_a",  &POA_PortableServer::ServantRetentionPolicy::_is_a_skel},
-      {"",0},
-      {"destroy", 	&POA_PortableServer::ServantRetentionPolicy::destroy_skel},
-      {"",0}, {"",0},
-      {"_get_value", 	&POA_PortableServer::ServantRetentionPolicy::_get_value_skel},
-      {"",0}, {"",0},
-      {"_non_existent",  &POA_PortableServer::ServantRetentionPolicy::_non_existent_skel},
-      {"",0}, {"",0},
-      {"_get_policy_type", 	&POA_PortableServer::ServantRetentionPolicy::_get_policy_type_skel},
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      unsigned int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-        {
-          const char *s = wordlist[key].opname_;
-
-          if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
-/* ending time is 0:12:47 */
-TAO_PortableServer_ServantRetentionPolicy_Perfect_Hash_OpTable tao_PortableServer_ServantRetentionPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-// skeleton constructor
-POA_PortableServer::ServantRetentionPolicy::ServantRetentionPolicy (void)
-{
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-  this->optable_ = &tao_PortableServer_ServantRetentionPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-void POA_PortableServer::ServantRetentionPolicy::_get_value_skel (
-                                                                  CORBA::ServerRequest &_tao_server_request,
-                                                                  void *_tao_object_reference,
-                                                                  void * /* context */,
-                                                                  CORBA::Environment &ACE_TRY_ENV
-                                                                  )
-{
-  POA_PortableServer::ServantRetentionPolicy *_tao_impl = (POA_PortableServer::ServantRetentionPolicy *)_tao_object_reference;
-  PortableServer::ServantRetentionPolicyValue _tao_retval;
-  _tao_retval = _tao_impl->value (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval)
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_PortableServer::ServantRetentionPolicy::_is_a_skel (
-                                                             CORBA::ServerRequest &_tao_server_request,
-                                                             void * _tao_object_reference,
-                                                             void * /*context*/,
-                                                             CORBA::Environment &ACE_TRY_ENV
-                                                             )
-{
-  static const TAO_Param_Data_Skel PortableServer_ServantRetentionPolicy_is_a_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0},
-    {CORBA::_tc_string, CORBA::ARG_IN, 0}
-  };
-  static const TAO_Call_Data_Skel PortableServer_ServantRetentionPolicy_is_a_calldata =
-  {"_is_a", 1, 2, PortableServer_ServantRetentionPolicy_is_a_paramdata};
-  POA_PortableServer::ServantRetentionPolicy_ptr  _tao_impl = (POA_PortableServer::ServantRetentionPolicy_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  CORBA::String_var _tao_value;
-  _tao_server_request.demarshal (
-    ACE_TRY_ENV,
-    &PortableServer_ServantRetentionPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-  ACE_CHECK;
-  _tao_retval = _tao_impl->_is_a (_tao_value.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &PortableServer_ServantRetentionPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-}
-
-void POA_PortableServer::ServantRetentionPolicy::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * /* _tao_object_reference */ ,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel PortableServer_ServantRetentionPolicy_non_existent_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0}
-  };
-  static const TAO_Call_Data_Skel PortableServer_ServantRetentionPolicy_non_existent_calldata =
-  {"_non_existent", 1, 1, PortableServer_ServantRetentionPolicy_non_existent_paramdata};
-  CORBA::Boolean _tao_retval = 0;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &PortableServer_ServantRetentionPolicy_non_existent_calldata,
-    &_tao_retval
-  );
-}
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-CORBA::Boolean POA_PortableServer::ServantRetentionPolicy::_is_a (
-                                                                  const char* value,
-                                                                  CORBA::Environment &ACE_TRY_ENV
-                                                                  )
-{
-  if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ServantRetentionPolicy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-    return 1;
-  else
-    return 0;
-}
-
-void* POA_PortableServer::ServantRetentionPolicy::_downcast (
-                                                             const char* logical_type_id
-                                                             )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/ServantRetentionPolicy:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::ServantRetentionPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-void POA_PortableServer::ServantRetentionPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
-}
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-const char* POA_PortableServer::ServantRetentionPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/ServantRetentionPolicy:1.0";
-}
-
-POA_PortableServer::_tao_collocated_ServantRetentionPolicy::_tao_collocated_ServantRetentionPolicy (
-                                                                                                    POA_PortableServer::ServantRetentionPolicy_ptr  servant,
-                                                                                                    TAO_Stub *stub
-                                                                                                    )
-  : ACE_NESTED_CLASS (PortableServer, ServantRetentionPolicy) (stub, servant, 1),
-    ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_PortableServer::ServantRetentionPolicy_ptr POA_PortableServer::_tao_collocated_ServantRetentionPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_ServantRetentionPolicy::_is_a (
-                                                                                  const char* logical_type_id,
-                                                                                  CORBA::Environment &ACE_TRY_ENV
-                                                                                  )
-{
-  return this->servant_->_is_a (
-                                logical_type_id,
-                                ACE_TRY_ENV
-                                );
-}
-
-CORBA::Policy_ptr POA_PortableServer::_tao_collocated_ServantRetentionPolicy::copy (
-                                                                                    CORBA::Environment &ACE_TRY_ENV
-                                                                                    )
-{
-  return this->servant_->copy (
-                               ACE_TRY_ENV
-                               );
-}
-
-void POA_PortableServer::_tao_collocated_ServantRetentionPolicy::destroy (
-                                                                          CORBA::Environment &ACE_TRY_ENV
-                                                                          )
-{
-  this->servant_->destroy (
-                           ACE_TRY_ENV
-                           );
-}
-
-CORBA::PolicyType POA_PortableServer::_tao_collocated_ServantRetentionPolicy::policy_type (
-                                                                                           CORBA::Environment &ACE_TRY_ENV
-                                                                                           )
-{
-  return this->servant_->policy_type (ACE_TRY_ENV);
-}
-
-PortableServer::ServantRetentionPolicyValue
-POA_PortableServer::_tao_collocated_ServantRetentionPolicy::value (
-                                                                   CORBA::Environment &ACE_TRY_ENV
-                                                                   )
-{
-  return this->servant_->value(ACE_TRY_ENV);
-}
-
-PortableServer::ServantRetentionPolicy*
-POA_PortableServer::ServantRetentionPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_PortableServer::_tao_collocated_ServantRetentionPolicy (this, stub);
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-class TAO_PortableServer_RequestProcessingPolicy_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-{
-private:
-  unsigned int hash (const char *str, unsigned int len);
-public:
- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-};
-/* starting time is 0:12:47 */
-/* C++ code produced by gperf version 2.7 (GNU C++ version) */
-/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_PortableServer_RequestProcessingPolicy_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_PortableServer_RequestProcessingPolicy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17,  0, 17,  0, 17,  0,
-      0,  0, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17,  0, 17, 17, 17,
-     17,  0, 17, 17, 17, 17, 17, 17,
-    };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
-}
-
-const class TAO_operation_db_entry *
-TAO_PortableServer_RequestProcessingPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 6,
-      MIN_WORD_LENGTH = 4,
-      MAX_WORD_LENGTH = 16,
-      MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 16,
-      HASH_VALUE_RANGE = 13,
-      DUPLICATES = 0
-    };
-
-  static const class TAO_operation_db_entry  wordlist[] =
-    {
-      {"",0}, {"",0}, {"",0}, {"",0},
-      {"copy", 	&POA_PortableServer::RequestProcessingPolicy::copy_skel},
-      {"_is_a",  &POA_PortableServer::RequestProcessingPolicy::_is_a_skel},
-      {"",0},
-      {"destroy", 	&POA_PortableServer::RequestProcessingPolicy::destroy_skel},
-      {"",0}, {"",0},
-      {"_get_value", 	&POA_PortableServer::RequestProcessingPolicy::_get_value_skel},
-      {"",0}, {"",0},
-      {"_non_existent",  &POA_PortableServer::RequestProcessingPolicy::_non_existent_skel},
-      {"",0}, {"",0},
-      {"_get_policy_type", 	&POA_PortableServer::RequestProcessingPolicy::_get_policy_type_skel},
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      unsigned int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-        {
-          const char *s = wordlist[key].opname_;
-
-          if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
-/* ending time is 0:12:47 */
-TAO_PortableServer_RequestProcessingPolicy_Perfect_Hash_OpTable tao_PortableServer_RequestProcessingPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-// skeleton constructor
-POA_PortableServer::RequestProcessingPolicy::RequestProcessingPolicy (void)
-{
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-  this->optable_ = &tao_PortableServer_RequestProcessingPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-void POA_PortableServer::RequestProcessingPolicy::_get_value_skel (
-                                                                   CORBA::ServerRequest &_tao_server_request,
-                                                                   void *_tao_object_reference,
-                                                                   void * /* context */,
-                                                                   CORBA::Environment &ACE_TRY_ENV
-                                                                   )
-{
-  POA_PortableServer::RequestProcessingPolicy *_tao_impl = (POA_PortableServer::RequestProcessingPolicy *)_tao_object_reference;
-  PortableServer::RequestProcessingPolicyValue _tao_retval;
-  _tao_retval = _tao_impl->value (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval)
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_PortableServer::RequestProcessingPolicy::_is_a_skel (
-                                                              CORBA::ServerRequest &_tao_server_request,
-                                                              void * _tao_object_reference,
-                                                              void * /*context*/,
-                                                              CORBA::Environment &ACE_TRY_ENV
-                                                              )
-{
-  static const TAO_Param_Data_Skel PortableServer_RequestProcessingPolicy_is_a_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0},
-    {CORBA::_tc_string, CORBA::ARG_IN, 0}
-  };
-  static const TAO_Call_Data_Skel PortableServer_RequestProcessingPolicy_is_a_calldata =
-  {"_is_a", 1, 2, PortableServer_RequestProcessingPolicy_is_a_paramdata};
-  POA_PortableServer::RequestProcessingPolicy_ptr  _tao_impl = (POA_PortableServer::RequestProcessingPolicy_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  CORBA::String_var _tao_value;
-  _tao_server_request.demarshal (
-    ACE_TRY_ENV,
-    &PortableServer_RequestProcessingPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-  ACE_CHECK;
-  _tao_retval = _tao_impl->_is_a (_tao_value.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &PortableServer_RequestProcessingPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-}
-
-void POA_PortableServer::RequestProcessingPolicy::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * /* _tao_object_reference */ ,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel PortableServer_RequestProcessingPolicy_non_existent_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0}
-  };
-  static const TAO_Call_Data_Skel PortableServer_RequestProcessingPolicy_non_existent_calldata =
-  {"_non_existent", 1, 1, PortableServer_RequestProcessingPolicy_non_existent_paramdata};
-  CORBA::Boolean _tao_retval = 0;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &PortableServer_RequestProcessingPolicy_non_existent_calldata,
-    &_tao_retval
-  );
-}
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-CORBA::Boolean POA_PortableServer::RequestProcessingPolicy::_is_a (
-                                                                   const char* value,
-                                                                   CORBA::Environment &ACE_TRY_ENV
-                                                                   )
-{
-  if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-    return 1;
-  else
-    return 0;
-}
-
-void* POA_PortableServer::RequestProcessingPolicy::_downcast (
-                                                              const char* logical_type_id
-                                                              )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::RequestProcessingPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-void POA_PortableServer::RequestProcessingPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
-}
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-const char* POA_PortableServer::RequestProcessingPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0";
-}
-
-POA_PortableServer::_tao_collocated_RequestProcessingPolicy::_tao_collocated_RequestProcessingPolicy (
-                                                                                                      POA_PortableServer::RequestProcessingPolicy_ptr  servant,
-                                                                                                      TAO_Stub *stub
-                                                                                                      )
-  : ACE_NESTED_CLASS (PortableServer, RequestProcessingPolicy) (stub, servant, 1),
-    ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_PortableServer::RequestProcessingPolicy_ptr POA_PortableServer::_tao_collocated_RequestProcessingPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_RequestProcessingPolicy::_is_a (
-                                                                                   const char* logical_type_id,
-                                                                                   CORBA::Environment &ACE_TRY_ENV
-                                                                                   )
-{
-  return this->servant_->_is_a (
-                                logical_type_id,
-                                ACE_TRY_ENV
-                                );
-}
-
-CORBA::Policy_ptr POA_PortableServer::_tao_collocated_RequestProcessingPolicy::copy (
-                                                                                     CORBA::Environment &ACE_TRY_ENV
-                                                                                     )
-{
-  return this->servant_->copy (
-                               ACE_TRY_ENV
-                               );
-}
-
-void POA_PortableServer::_tao_collocated_RequestProcessingPolicy::destroy (
-                                                                           CORBA::Environment &ACE_TRY_ENV
-                                                                           )
-{
-  this->servant_->destroy (
-                           ACE_TRY_ENV
-                           );
-}
-
-CORBA::PolicyType POA_PortableServer::_tao_collocated_RequestProcessingPolicy::policy_type (
-                                                                                            CORBA::Environment &ACE_TRY_ENV
-                                                                                            )
-{
-  return this->servant_->policy_type (ACE_TRY_ENV);
-}
-
-PortableServer::RequestProcessingPolicyValue
-POA_PortableServer::_tao_collocated_RequestProcessingPolicy::value (
-                                                                    CORBA::Environment &ACE_TRY_ENV
-                                                                    )
-{
-  return this->servant_->value(ACE_TRY_ENV);
-}
-
-PortableServer::RequestProcessingPolicy*
-POA_PortableServer::RequestProcessingPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_PortableServer::_tao_collocated_RequestProcessingPolicy (this, stub);
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-// skeleton constructor
-POA_PortableServer::POAManager::POAManager (void)
-{
-}
-
-CORBA::Boolean POA_PortableServer::POAManager::_is_a (
-                                                      const char* value,
-                                                      CORBA::Environment &ACE_TRY_ENV
-                                                      )
-{
-  if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/POAManager:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-    return 1;
-  else
-    return 0;
-}
-
-void* POA_PortableServer::POAManager::_downcast (
-                                                 const char* logical_type_id
-                                                 )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/POAManager:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::POAManager_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-const char* POA_PortableServer::POAManager::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/POAManager:1.0";
-}
-
-POA_PortableServer::_tao_collocated_POAManager::_tao_collocated_POAManager (
-                                                                            POA_PortableServer::POAManager_ptr  servant,
-                                                                            TAO_Stub *stub
-                                                                            )
-  : ACE_NESTED_CLASS (PortableServer, POAManager) (stub, servant, 1),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_PortableServer::POAManager_ptr POA_PortableServer::_tao_collocated_POAManager::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_POAManager::_is_a (
-                                                                      const char* logical_type_id,
-                                                                      CORBA::Environment &ACE_TRY_ENV
-                                                                      )
-{
-  return this->servant_->_is_a (
-                                logical_type_id,
-                                ACE_TRY_ENV
-                                );
-}
-
-void POA_PortableServer::_tao_collocated_POAManager::activate (
-                                                               CORBA::Environment &ACE_TRY_ENV
-                                                               )
-{
-  this->servant_->activate (
-                            ACE_TRY_ENV
-                            );
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-void POA_PortableServer::_tao_collocated_POAManager::hold_requests (
-                                                                    CORBA::Boolean wait_for_completion,
-                                                                    CORBA::Environment &ACE_TRY_ENV
-                                                                    )
-{
-  this->servant_->hold_requests (
-                                 wait_for_completion,
-                                 ACE_TRY_ENV
-                                 );
-}
-
-void POA_PortableServer::_tao_collocated_POAManager::discard_requests (
-                                                                       CORBA::Boolean wait_for_completion,
-                                                                       CORBA::Environment &ACE_TRY_ENV
-                                                                       )
-{
-  this->servant_->discard_requests (
-                                    wait_for_completion,
-                                    ACE_TRY_ENV
-                                    );
-}
-
-void POA_PortableServer::_tao_collocated_POAManager::deactivate (
-                                                                 CORBA::Boolean etherealize_objects,
-                                                                 CORBA::Boolean wait_for_completion,
-                                                                 CORBA::Environment &ACE_TRY_ENV
-                                                                 )
-{
-  this->servant_->deactivate (
-                              etherealize_objects,
-                              wait_for_completion,
-                              ACE_TRY_ENV
-                              );
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-PortableServer::POAManager::State
-POA_PortableServer::_tao_collocated_POAManager:: get_state(CORBA::Environment &ACE_TRY_ENV)
-{
-  return this->servant_->get_state (ACE_TRY_ENV);
-}
-
-PortableServer::POAManager*
-POA_PortableServer::POAManager::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_PortableServer::_tao_collocated_POAManager (this, stub);
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-// skeleton constructor
-POA_PortableServer::AdapterActivator::AdapterActivator (void)
-{
-}
-
-CORBA::Boolean POA_PortableServer::AdapterActivator::_is_a (
-                                                            const char* value,
-                                                            CORBA::Environment &ACE_TRY_ENV
-                                                            )
-{
-  if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/AdapterActivator:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-    return 1;
-  else
-    return 0;
-}
-
-void* POA_PortableServer::AdapterActivator::_downcast (
-                                                       const char* logical_type_id
-                                                       )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/AdapterActivator:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::AdapterActivator_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-const char* POA_PortableServer::AdapterActivator::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/AdapterActivator:1.0";
-}
-
-POA_PortableServer::_tao_collocated_AdapterActivator::_tao_collocated_AdapterActivator (
-                                                                                        POA_PortableServer::AdapterActivator_ptr  servant,
-                                                                                        TAO_Stub *stub
-                                                                                        )
-  : ACE_NESTED_CLASS (PortableServer, AdapterActivator) (stub, servant, 1),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_PortableServer::AdapterActivator_ptr POA_PortableServer::_tao_collocated_AdapterActivator::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_AdapterActivator::_is_a (
-                                                                            const char* logical_type_id,
-                                                                            CORBA::Environment &ACE_TRY_ENV
-                                                                            )
-{
-  return this->servant_->_is_a (
-                                logical_type_id,
-                                ACE_TRY_ENV
-                                );
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_AdapterActivator::unknown_adapter (
-                                                                                      PortableServer::POA_ptr  parent,
-                                                                                      const char* name,
-                                                                                      CORBA::Environment &ACE_TRY_ENV
-                                                                                      )
-{
-  return this->servant_->unknown_adapter (
-                                          parent,
-                                          name,
-                                          ACE_TRY_ENV
-                                          );
-}
-
-
-PortableServer::AdapterActivator*
-POA_PortableServer::AdapterActivator::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_PortableServer::_tao_collocated_AdapterActivator (this, stub);
-}
-
-// skeleton constructor
-POA_PortableServer::ServantManager::ServantManager (void)
-{
-}
-
-CORBA::Boolean POA_PortableServer::ServantManager::_is_a (
-                                                          const char* value,
-                                                          CORBA::Environment &ACE_TRY_ENV
-                                                          )
-{
-  if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ServantManager:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-    return 1;
-  else
-    return 0;
-}
-
-void* POA_PortableServer::ServantManager::_downcast (
-                                                     const char* logical_type_id
-                                                     )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/ServantManager:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::ServantManager_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-const char* POA_PortableServer::ServantManager::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/ServantManager:1.0";
-}
-
-POA_PortableServer::_tao_collocated_ServantManager::_tao_collocated_ServantManager (
-                                                                                    POA_PortableServer::ServantManager_ptr  servant,
-                                                                                    TAO_Stub *stub
-                                                                                    )
-  : ACE_NESTED_CLASS (PortableServer, ServantManager) (stub, servant, 1),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_PortableServer::ServantManager_ptr POA_PortableServer::_tao_collocated_ServantManager::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_ServantManager::_is_a (
-                                                                          const char* logical_type_id,
-                                                                          CORBA::Environment &ACE_TRY_ENV
-                                                                          )
-{
-  return this->servant_->_is_a (
-                                logical_type_id,
-                                ACE_TRY_ENV
-                                );
-}
-
-
-PortableServer::ServantManager*
-POA_PortableServer::ServantManager::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_PortableServer::_tao_collocated_ServantManager (this, stub);
-}
-
-// skeleton constructor
-POA_PortableServer::ServantActivator::ServantActivator (void)
-{
-}
-
-CORBA::Boolean POA_PortableServer::ServantActivator::_is_a (
-                                                            const char* value,
-                                                            CORBA::Environment &ACE_TRY_ENV
-                                                            )
-{
-  if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ServantActivator:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ServantManager:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-    return 1;
-  else
-    return 0;
-}
-
-void* POA_PortableServer::ServantActivator::_downcast (
-                                                       const char* logical_type_id
-                                                       )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/ServantActivator:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::ServantActivator_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/ServantManager:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::ServantManager_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-const char* POA_PortableServer::ServantActivator::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/ServantActivator:1.0";
-}
-
-POA_PortableServer::_tao_collocated_ServantActivator::_tao_collocated_ServantActivator (
-                                                                                        POA_PortableServer::ServantActivator_ptr  servant,
-                                                                                        TAO_Stub *stub
-                                                                                        )
-  : ACE_NESTED_CLASS (PortableServer, ServantActivator) (stub, servant, 1),
-    ACE_NESTED_CLASS (POA_PortableServer, _tao_collocated_ServantManager) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_PortableServer::ServantActivator_ptr POA_PortableServer::_tao_collocated_ServantActivator::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_ServantActivator::_is_a (
-                                                                            const char* logical_type_id,
-                                                                            CORBA::Environment &ACE_TRY_ENV
-                                                                            )
-{
-  return this->servant_->_is_a (
-                                logical_type_id,
-                                ACE_TRY_ENV
-                                );
-}
-
-PortableServer::Servant POA_PortableServer::_tao_collocated_ServantActivator::incarnate (
-                                                                                         const PortableServer::ObjectId & oid,
-                                                                                         PortableServer::POA_ptr  adapter,
-                                                                                         CORBA::Environment &ACE_TRY_ENV
-                                                                                         )
-{
-  return this->servant_->incarnate (
-                                    oid,
-                                    adapter,
-                                    ACE_TRY_ENV
-                                    );
-}
-
-void POA_PortableServer::_tao_collocated_ServantActivator::etherealize (
-                                                                        const PortableServer::ObjectId & oid,
-                                                                        PortableServer::POA_ptr  adapter,
-                                                                        PortableServer::Servant serv,
-                                                                        CORBA::Boolean cleanup_in_progress,
-                                                                        CORBA::Boolean remaining_activations,
-                                                                        CORBA::Environment &ACE_TRY_ENV
-                                                                        )
-{
-  this->servant_->etherealize (
-                               oid,
-                               adapter,
-                               serv,
-                               cleanup_in_progress,
-                               remaining_activations,
-                               ACE_TRY_ENV
-                               );
-}
-
-
-PortableServer::ServantActivator*
-POA_PortableServer::ServantActivator::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_PortableServer::_tao_collocated_ServantActivator (this, stub);
-}
-
-// skeleton constructor
-POA_PortableServer::ServantLocator::ServantLocator (void)
-{
-}
-
-CORBA::Boolean POA_PortableServer::ServantLocator::_is_a (
-                                                          const char* value,
-                                                          CORBA::Environment &ACE_TRY_ENV
-                                                          )
-{
-  if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ServantLocator:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ServantManager:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-    return 1;
-  else
-    return 0;
-}
-
-void* POA_PortableServer::ServantLocator::_downcast (
-                                                     const char* logical_type_id
-                                                     )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/ServantLocator:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::ServantLocator_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/ServantManager:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::ServantManager_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-const char* POA_PortableServer::ServantLocator::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/ServantLocator:1.0";
-}
-
-POA_PortableServer::_tao_collocated_ServantLocator::_tao_collocated_ServantLocator (
-                                                                                    POA_PortableServer::ServantLocator_ptr  servant,
-                                                                                    TAO_Stub *stub
-                                                                                    )
-  : ACE_NESTED_CLASS (PortableServer, ServantLocator) (stub, servant, 1),
-    ACE_NESTED_CLASS (POA_PortableServer, _tao_collocated_ServantManager) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_PortableServer::ServantLocator_ptr POA_PortableServer::_tao_collocated_ServantLocator::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_ServantLocator::_is_a (
-                                                                          const char* logical_type_id,
-                                                                          CORBA::Environment &ACE_TRY_ENV
-                                                                          )
-{
-  return this->servant_->_is_a (
-                                logical_type_id,
-                                ACE_TRY_ENV
-                                );
-}
-
-PortableServer::Servant POA_PortableServer::_tao_collocated_ServantLocator::preinvoke (
-                                                                                       const PortableServer::ObjectId & oid,
-                                                                                       PortableServer::POA_ptr  adapter,
-                                                                                       const char * operation,
-                                                                                       PortableServer::ServantLocator::Cookie & the_cookie,
-                                                                                       CORBA::Environment &ACE_TRY_ENV
-                                                                                       )
-{
-  return this->servant_->preinvoke (
-                                    oid,
-                                    adapter,
-                                    operation,
-                                    the_cookie,
-                                    ACE_TRY_ENV
-                                    );
-}
-
-void POA_PortableServer::_tao_collocated_ServantLocator::postinvoke (
-                                                                     const PortableServer::ObjectId & oid,
-                                                                     PortableServer::POA_ptr  adapter,
-                                                                     const char * operation,
-                                                                     PortableServer::ServantLocator::Cookie the_cookie,
-                                                                     PortableServer::Servant the_servant,
-                                                                     CORBA::Environment &ACE_TRY_ENV
-                                                                     )
-{
-  this->servant_->postinvoke (
-                              oid,
-                              adapter,
-                              operation,
-                              the_cookie,
-                              the_servant,
-                              ACE_TRY_ENV
-                              );
-}
-
-
-PortableServer::ServantLocator*
-POA_PortableServer::ServantLocator::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_PortableServer::_tao_collocated_ServantLocator (this, stub);
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-// skeleton constructor
-POA_PortableServer::POA::POA (void)
-{
-}
-
-CORBA::Boolean POA_PortableServer::POA::_is_a (
-                                               const char* value,
-                                               CORBA::Environment &ACE_TRY_ENV
-                                               )
-{
-  if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/POA:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-    return 1;
-  else
-    return 0;
-}
-
-void* POA_PortableServer::POA::_downcast (
-                                          const char* logical_type_id
-                                          )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/POA:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::POA_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-const char* POA_PortableServer::POA::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/POA:1.0";
-}
-
-POA_PortableServer::_tao_collocated_POA::_tao_collocated_POA (
-                                                              POA_PortableServer::POA_ptr  servant,
-                                                              TAO_Stub *stub
-                                                              )
-  : ACE_NESTED_CLASS (PortableServer, POA) (stub, servant, 1),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_PortableServer::POA_ptr POA_PortableServer::_tao_collocated_POA::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_POA::_is_a (
-                                                               const char* logical_type_id,
-                                                               CORBA::Environment &ACE_TRY_ENV
-                                                               )
-{
-  return this->servant_->_is_a (
-                                logical_type_id,
-                                ACE_TRY_ENV
-                                );
-}
-
-PortableServer::POA_ptr POA_PortableServer::_tao_collocated_POA::create_POA (
-                                                                             const char* adapter_name,
-                                                                             PortableServer::POAManager_ptr  a_POAManager,
-                                                                             const CORBA::PolicyList & policies,
-                                                                             CORBA::Environment &ACE_TRY_ENV
-                                                                             )
-{
-  return this->servant_->create_POA (
-                                     adapter_name,
-                                     a_POAManager,
-                                     policies,
-                                     ACE_TRY_ENV
-                                     );
-}
-
-PortableServer::POA_ptr POA_PortableServer::_tao_collocated_POA::find_POA (
-                                                                           const char* adapter_name,
-                                                                           CORBA::Boolean activate_it,
-                                                                           CORBA::Environment &ACE_TRY_ENV
-                                                                           )
-{
-  return this->servant_->find_POA (
-                                   adapter_name,
-                                   activate_it,
-                                   ACE_TRY_ENV
-                                   );
-}
-
-void POA_PortableServer::_tao_collocated_POA::destroy (
-                                                       CORBA::Boolean etherealize_objects,
-                                                       CORBA::Boolean wait_for_completion,
-                                                       CORBA::Environment &ACE_TRY_ENV
-                                                       )
-{
-  this->servant_->destroy (
-                           etherealize_objects,
-                           wait_for_completion,
-                           ACE_TRY_ENV
-                           );
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-PortableServer::ThreadPolicy_ptr POA_PortableServer::_tao_collocated_POA::create_thread_policy (
-                                                                                                PortableServer::ThreadPolicyValue value,
-                                                                                                CORBA::Environment &ACE_TRY_ENV
-                                                                                                )
-{
-  return this->servant_->create_thread_policy (
-                                               value,
-                                               ACE_TRY_ENV
-                                               );
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-PortableServer::LifespanPolicy_ptr POA_PortableServer::_tao_collocated_POA::create_lifespan_policy (
-                                                                                                    PortableServer::LifespanPolicyValue value,
-                                                                                                    CORBA::Environment &ACE_TRY_ENV
-                                                                                                    )
-{
-  return this->servant_->create_lifespan_policy (
-                                                 value,
-                                                 ACE_TRY_ENV
-                                                 );
-}
-
-PortableServer::IdUniquenessPolicy_ptr POA_PortableServer::_tao_collocated_POA::create_id_uniqueness_policy (
-                                                                                                             PortableServer::IdUniquenessPolicyValue value,
-                                                                                                             CORBA::Environment &ACE_TRY_ENV
-                                                                                                             )
-{
-  return this->servant_->create_id_uniqueness_policy (
-                                                      value,
-                                                      ACE_TRY_ENV
-                                                      );
-}
-
-PortableServer::IdAssignmentPolicy_ptr POA_PortableServer::_tao_collocated_POA::create_id_assignment_policy (
-                                                                                                             PortableServer::IdAssignmentPolicyValue value,
-                                                                                                             CORBA::Environment &ACE_TRY_ENV
-                                                                                                             )
-{
-  return this->servant_->create_id_assignment_policy (
-                                                      value,
-                                                      ACE_TRY_ENV
-                                                      );
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-PortableServer::ImplicitActivationPolicy_ptr POA_PortableServer::_tao_collocated_POA::create_implicit_activation_policy (
-                                                                                                                         PortableServer::ImplicitActivationPolicyValue value,
-                                                                                                                         CORBA::Environment &ACE_TRY_ENV
-                                                                                                                         )
-{
-  return this->servant_->create_implicit_activation_policy (
-                                                            value,
-                                                            ACE_TRY_ENV
-                                                            );
-}
-
-PortableServer::ServantRetentionPolicy_ptr POA_PortableServer::_tao_collocated_POA::create_servant_retention_policy (
-                                                                                                                     PortableServer::ServantRetentionPolicyValue value,
-                                                                                                                     CORBA::Environment &ACE_TRY_ENV
-                                                                                                                     )
-{
-  return this->servant_->create_servant_retention_policy (
-                                                          value,
-                                                          ACE_TRY_ENV
-                                                          );
-}
-
-PortableServer::RequestProcessingPolicy_ptr POA_PortableServer::_tao_collocated_POA::create_request_processing_policy (
-                                                                                                                       PortableServer::RequestProcessingPolicyValue value,
-                                                                                                                       CORBA::Environment &ACE_TRY_ENV
-                                                                                                                       )
-{
-  return this->servant_->create_request_processing_policy (
-                                                           value,
-                                                           ACE_TRY_ENV
-                                                           );
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-char*
-POA_PortableServer::_tao_collocated_POA::the_name (
-                                                   CORBA::Environment &ACE_TRY_ENV
-                                                   )
-{
-  return this->servant_->the_name(ACE_TRY_ENV);
-}
-PortableServer::POA_ptr
-POA_PortableServer::_tao_collocated_POA::the_parent (
-                                                     CORBA::Environment &ACE_TRY_ENV
-                                                     )
-{
-  return this->servant_->the_parent(ACE_TRY_ENV);
-}
-PortableServer::POAManager_ptr
-POA_PortableServer::_tao_collocated_POA::the_POAManager (
-                                                         CORBA::Environment &ACE_TRY_ENV
-                                                         )
-{
-  return this->servant_->the_POAManager(ACE_TRY_ENV);
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-PortableServer::AdapterActivator_ptr
-POA_PortableServer::_tao_collocated_POA::the_activator (
-                                                        CORBA::Environment &ACE_TRY_ENV
-                                                        )
-{
-  return this->servant_->the_activator(ACE_TRY_ENV);
-}
-
-void POA_PortableServer::_tao_collocated_POA::the_activator (
-                                                             PortableServer::AdapterActivator_ptr _tao_value,
-                                                             CORBA::Environment &ACE_TRY_ENV
-                                                             )
-{
-  this->servant_->the_activator (
-                                 _tao_value,
-                                 ACE_TRY_ENV
-                                 );
-}
-
-PortableServer::ServantManager_ptr POA_PortableServer::_tao_collocated_POA::get_servant_manager (
-                                                                                                 CORBA::Environment &ACE_TRY_ENV
-                                                                                                 )
-{
-  return this->servant_->get_servant_manager (
-                                              ACE_TRY_ENV
-                                              );
-}
-
-void POA_PortableServer::_tao_collocated_POA::set_servant_manager (
-                                                                   PortableServer::ServantManager_ptr  imgr,
-                                                                   CORBA::Environment &ACE_TRY_ENV
-                                                                   )
-{
-  this->servant_->set_servant_manager (
-                                       imgr,
-                                       ACE_TRY_ENV
-                                       );
-}
-
-PortableServer::Servant POA_PortableServer::_tao_collocated_POA::get_servant (
-                                                                              CORBA::Environment &ACE_TRY_ENV
-                                                                              )
-{
-  return this->servant_->get_servant (
-                                      ACE_TRY_ENV
-                                      );
-}
-
-void POA_PortableServer::_tao_collocated_POA::set_servant (
-                                                           PortableServer::Servant p_servant,
-                                                           CORBA::Environment &ACE_TRY_ENV
-                                                           )
-{
-  this->servant_->set_servant (
-                               p_servant,
-                               ACE_TRY_ENV
-                               );
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-PortableServer::ObjectId * POA_PortableServer::_tao_collocated_POA::activate_object (
-                                                                                     PortableServer::Servant p_servant,
-                                                                                     CORBA::Environment &ACE_TRY_ENV
-                                                                                     )
-{
-  return this->servant_->activate_object (
-                                          p_servant,
-                                          ACE_TRY_ENV
-                                          );
-}
-
-void POA_PortableServer::_tao_collocated_POA::activate_object_with_id (
-                                                                       const PortableServer::ObjectId & id,
-                                                                       PortableServer::Servant p_servant,
-                                                                       CORBA::Environment &ACE_TRY_ENV
-                                                                       )
-{
-  this->servant_->activate_object_with_id (
-                                           id,
-                                           p_servant,
-                                           ACE_TRY_ENV
-                                           );
-}
-
-void POA_PortableServer::_tao_collocated_POA::deactivate_object (
-                                                                 const PortableServer::ObjectId & oid,
-                                                                 CORBA::Environment &ACE_TRY_ENV
-                                                                 )
-{
-  this->servant_->deactivate_object (
-                                     oid,
-                                     ACE_TRY_ENV
-                                     );
-}
-
-CORBA::Object_ptr POA_PortableServer::_tao_collocated_POA::create_reference (
-                                                                             const char *intf,
-                                                                             CORBA::Environment &ACE_TRY_ENV
-                                                                             )
-{
-  return this->servant_->create_reference (
-                                           intf,
-                                           ACE_TRY_ENV
-                                           );
-}
-
-CORBA::Object_ptr POA_PortableServer::_tao_collocated_POA::create_reference_with_id (
-                                                                                     const PortableServer::ObjectId & oid,
-                                                                                     const char *intf,
-                                                                                     CORBA::Environment &ACE_TRY_ENV
-                                                                                     )
-{
-  return this->servant_->create_reference_with_id (
-                                                   oid,
-                                                   intf,
-                                                   ACE_TRY_ENV
-                                                   );
-}
-
-PortableServer::ObjectId * POA_PortableServer::_tao_collocated_POA::servant_to_id (
-                                                                                   PortableServer::Servant p_servant,
-                                                                                   CORBA::Environment &ACE_TRY_ENV
-                                                                                   )
-{
-  return this->servant_->servant_to_id (
-                                        p_servant,
-                                        ACE_TRY_ENV
-                                        );
-}
-
-CORBA::Object_ptr POA_PortableServer::_tao_collocated_POA::servant_to_reference (
-                                                                                 PortableServer::Servant p_servant,
-                                                                                 CORBA::Environment &ACE_TRY_ENV
-                                                                                 )
-{
-  return this->servant_->servant_to_reference (
-                                               p_servant,
-                                               ACE_TRY_ENV
-                                               );
-}
-
-PortableServer::Servant POA_PortableServer::_tao_collocated_POA::reference_to_servant (
-                                                                                       CORBA::Object_ptr  reference,
-                                                                                       CORBA::Environment &ACE_TRY_ENV
-                                                                                       )
-{
-  return this->servant_->reference_to_servant (
-                                               reference,
-                                               ACE_TRY_ENV
-                                               );
-}
-
-PortableServer::ObjectId * POA_PortableServer::_tao_collocated_POA::reference_to_id (
-                                                                                     CORBA::Object_ptr  reference,
-                                                                                     CORBA::Environment &ACE_TRY_ENV
-                                                                                     )
-{
-  return this->servant_->reference_to_id (
-                                          reference,
-                                          ACE_TRY_ENV
-                                          );
-}
-
-PortableServer::Servant POA_PortableServer::_tao_collocated_POA::id_to_servant (
-                                                                                const PortableServer::ObjectId & oid,
-                                                                                CORBA::Environment &ACE_TRY_ENV
-                                                                                )
-{
-  return this->servant_->id_to_servant (
-                                        oid,
-                                        ACE_TRY_ENV
-                                        );
-}
-
-CORBA::Object_ptr POA_PortableServer::_tao_collocated_POA::id_to_reference (
-                                                                            const PortableServer::ObjectId & oid,
-                                                                            CORBA::Environment &ACE_TRY_ENV
-                                                                            )
-{
-  return this->servant_->id_to_reference (
-                                          oid,
-                                          ACE_TRY_ENV
-                                          );
-}
-
-
-PortableServer::POA*
-POA_PortableServer::POA::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_PortableServer::_tao_collocated_POA (this, stub);
-}
-
-// skeleton constructor
-POA_PortableServer::Current::Current (void)
-{
-}
-
-CORBA::Boolean POA_PortableServer::Current::_is_a (
-                                                   const char* value,
-                                                   CORBA::Environment &ACE_TRY_ENV
-                                                   )
-{
-  if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Current:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Current:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-    return 1;
-  else
-    return 0;
-}
-
-void* POA_PortableServer::Current::_downcast (
-                                              const char* logical_type_id
-                                              )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/Current:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::Current_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Current:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Current_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-const char* POA_PortableServer::Current::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/Current:1.0";
-}
-
-POA_PortableServer::_tao_collocated_Current::_tao_collocated_Current (
-                                                                      POA_PortableServer::Current_ptr  servant,
-                                                                      TAO_Stub *stub
-                                                                      )
-  : ACE_NESTED_CLASS (PortableServer, Current) (stub, servant, 1),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Current) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_PortableServer::Current_ptr POA_PortableServer::_tao_collocated_Current::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_Current::_is_a (
-                                                                   const char* logical_type_id,
-                                                                   CORBA::Environment &ACE_TRY_ENV
-                                                                   )
-{
-  return this->servant_->_is_a (
-                                logical_type_id,
-                                ACE_TRY_ENV
-                                );
-}
-
-PortableServer::POA_ptr POA_PortableServer::_tao_collocated_Current::get_POA (
-                                                                              CORBA::Environment &ACE_TRY_ENV
-                                                                              )
-{
-  return this->servant_->get_POA (
-                                  ACE_TRY_ENV
-                                  );
-}
-
-PortableServer::ObjectId * POA_PortableServer::_tao_collocated_Current::get_object_id (
-                                                                                       CORBA::Environment &ACE_TRY_ENV
-                                                                                       )
-{
-  return this->servant_->get_object_id (
-                                        ACE_TRY_ENV
-                                        );
-}
-
-
-PortableServer::Current*
-POA_PortableServer::Current::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_PortableServer::_tao_collocated_Current (this, stub);
-}
diff --git a/TAO/tao/POAS.h b/TAO/tao/POAS.h
deleted file mode 100644
index a5213c1b748..00000000000
--- a/TAO/tao/POAS.h
+++ /dev/null
@@ -1,1219 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    POAC.h
-//
-// = DESCRIPTION
-//
-//    POA skels. This code generated by the The ACE ORB (TAO) IDL
-//    Compiler and is not meant to be read.
-//
-// ============================================================================
-
-#ifndef TAO_IDL_POAS_H
-#define TAO_IDL_POAS_H
-
-#include "tao/POAC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Servant_Base.h"
-#include "tao/POA_CORBA.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-TAO_NAMESPACE POA_PortableServer
-{
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  class ThreadPolicy;
-  typedef ThreadPolicy *ThreadPolicy_ptr;
-  class TAO_Export ThreadPolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    ThreadPolicy (void);
-  public:
-    virtual ~ThreadPolicy (void);
-    virtual CORBA::Boolean _is_a (
-                                  const char* logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual void* _downcast (
-                             const char* logical_type_id
-                             );
-    virtual PortableServer::ThreadPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-    static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ());
-
-    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-    static void _get_policy_type_skel (
-                                       CORBA::ServerRequest &_tao_req,
-                                       void *_tao_obj,
-                                       void *_tao_context,
-                                       CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                       );
-
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-    PortableServer::ThreadPolicy *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-
-#if !defined (_PORTABLESERVER_THREADPOLICY___COLLOCATED_SH_)
-#define _PORTABLESERVER_THREADPOLICY___COLLOCATED_SH_
-
-  class TAO_Export _tao_collocated_ThreadPolicy    : public virtual PortableServer::ThreadPolicy,
-                                                     public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_ThreadPolicy (
-                                  ThreadPolicy_ptr  servant,
-                                  TAO_Stub *stub
-                                  );
-    ThreadPolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-                                  const char *logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                  );
-    virtual PortableServer::ThreadPolicyValue value (
-                                                     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                                     );
-    virtual CORBA::Policy_ptr copy (
-                                    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                    );
-    virtual void destroy (
-                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                          );
-    virtual CORBA::PolicyType policy_type (
-                                           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                           );
-  private:
-    ThreadPolicy_ptr servant_;
-  };
-
-
-#endif // end #if !defined
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  class LifespanPolicy;
-  typedef LifespanPolicy *LifespanPolicy_ptr;
-  class TAO_Export LifespanPolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    LifespanPolicy (void);
-  public:
-    virtual ~LifespanPolicy (void);
-    virtual CORBA::Boolean _is_a (
-                                  const char* logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual void* _downcast (
-                             const char* logical_type_id
-                             );
-    virtual PortableServer::LifespanPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-    static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ());
-
-    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-    static void _get_policy_type_skel (
-                                       CORBA::ServerRequest &_tao_req,
-                                       void *_tao_obj,
-                                       void *_tao_context,
-                                       CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                       );
-
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-    PortableServer::LifespanPolicy *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-
-#if !defined (_PORTABLESERVER_LIFESPANPOLICY___COLLOCATED_SH_)
-#define _PORTABLESERVER_LIFESPANPOLICY___COLLOCATED_SH_
-
-  class TAO_Export _tao_collocated_LifespanPolicy    : public virtual PortableServer::LifespanPolicy,
-                                                       public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_LifespanPolicy (
-                                    LifespanPolicy_ptr  servant,
-                                    TAO_Stub *stub
-                                    );
-    LifespanPolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-                                  const char *logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                  );
-    virtual PortableServer::LifespanPolicyValue value (
-                                                       CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                                       );
-    virtual CORBA::Policy_ptr copy (
-                                    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                    );
-    virtual void destroy (
-                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                          );
-    virtual CORBA::PolicyType policy_type (
-                                           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                           );
-
-  private:
-    LifespanPolicy_ptr servant_;
-  };
-
-
-#endif // end #if !defined
-
-
-  class IdUniquenessPolicy;
-  typedef IdUniquenessPolicy *IdUniquenessPolicy_ptr;
-  class TAO_Export IdUniquenessPolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    IdUniquenessPolicy (void);
-  public:
-    virtual ~IdUniquenessPolicy (void);
-    virtual CORBA::Boolean _is_a (
-                                  const char* logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual void* _downcast (
-                             const char* logical_type_id
-                             );
-    virtual PortableServer::IdUniquenessPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-    static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ());
-
-    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-    static void _get_policy_type_skel (
-                                       CORBA::ServerRequest &_tao_req,
-                                       void *_tao_obj,
-                                       void *_tao_context,
-                                       CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                       );
-
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-    PortableServer::IdUniquenessPolicy *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-
-#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___COLLOCATED_SH_)
-#define _PORTABLESERVER_IDUNIQUENESSPOLICY___COLLOCATED_SH_
-
-  class TAO_Export _tao_collocated_IdUniquenessPolicy    : public virtual PortableServer::IdUniquenessPolicy,
-                                                           public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_IdUniquenessPolicy (
-                                        IdUniquenessPolicy_ptr  servant,
-                                        TAO_Stub *stub
-                                        );
-    IdUniquenessPolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-                                  const char *logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                  );
-    virtual PortableServer::IdUniquenessPolicyValue value (
-                                                           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                                           );
-    virtual CORBA::Policy_ptr copy (
-                                    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                    );
-    virtual void destroy (
-                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                          );
-    virtual CORBA::PolicyType policy_type (
-                                           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                           );
-
-  private:
-    IdUniquenessPolicy_ptr servant_;
-  };
-
-
-#endif // end #if !defined
-
-
-  class IdAssignmentPolicy;
-  typedef IdAssignmentPolicy *IdAssignmentPolicy_ptr;
-  class TAO_Export IdAssignmentPolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    IdAssignmentPolicy (void);
-  public:
-    virtual ~IdAssignmentPolicy (void);
-    virtual CORBA::Boolean _is_a (
-                                  const char* logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual void* _downcast (
-                             const char* logical_type_id
-                             );
-    virtual PortableServer::IdAssignmentPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-    static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ());
-
-    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-    static void _get_policy_type_skel (
-                                       CORBA::ServerRequest &_tao_req,
-                                       void *_tao_obj,
-                                       void *_tao_context,
-                                       CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                       );
-
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-    PortableServer::IdAssignmentPolicy *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-
-#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___COLLOCATED_SH_)
-#define _PORTABLESERVER_IDASSIGNMENTPOLICY___COLLOCATED_SH_
-
-  class TAO_Export _tao_collocated_IdAssignmentPolicy    : public virtual PortableServer::IdAssignmentPolicy,
-                                                           public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_IdAssignmentPolicy (
-                                        IdAssignmentPolicy_ptr  servant,
-                                        TAO_Stub *stub
-                                        );
-    IdAssignmentPolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-                                  const char *logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                  );
-    virtual PortableServer::IdAssignmentPolicyValue value (
-                                                           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                                           );
-    virtual CORBA::Policy_ptr copy (
-                                    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                    );
-    virtual void destroy (
-                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                          );
-    virtual CORBA::PolicyType policy_type (
-                                           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                           );
-
-  private:
-    IdAssignmentPolicy_ptr servant_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  class ImplicitActivationPolicy;
-  typedef ImplicitActivationPolicy *ImplicitActivationPolicy_ptr;
-  class TAO_Export ImplicitActivationPolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    ImplicitActivationPolicy (void);
-  public:
-    virtual ~ImplicitActivationPolicy (void);
-    virtual CORBA::Boolean _is_a (
-                                  const char* logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual void* _downcast (
-                             const char* logical_type_id
-                             );
-    virtual PortableServer::ImplicitActivationPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-    static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ());
-
-    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-    static void _get_policy_type_skel (
-                                       CORBA::ServerRequest &_tao_req,
-                                       void *_tao_obj,
-                                       void *_tao_context,
-                                       CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                       );
-
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-    PortableServer::ImplicitActivationPolicy *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-
-#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___COLLOCATED_SH_)
-#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___COLLOCATED_SH_
-
-  class TAO_Export _tao_collocated_ImplicitActivationPolicy    : public virtual PortableServer::ImplicitActivationPolicy,
-                                                                 public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_ImplicitActivationPolicy (
-                                              ImplicitActivationPolicy_ptr  servant,
-                                              TAO_Stub *stub
-                                              );
-    ImplicitActivationPolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-                                  const char *logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                  );
-    virtual PortableServer::ImplicitActivationPolicyValue value (
-                                                                 CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                                                 );
-    virtual CORBA::Policy_ptr copy (
-                                    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                    );
-    virtual void destroy (
-                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                          );
-    virtual CORBA::PolicyType policy_type (
-                                           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                           );
-
-  private:
-    ImplicitActivationPolicy_ptr servant_;
-  };
-
-
-#endif // end #if !defined
-
-
-  class ServantRetentionPolicy;
-  typedef ServantRetentionPolicy *ServantRetentionPolicy_ptr;
-  class TAO_Export ServantRetentionPolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    ServantRetentionPolicy (void);
-  public:
-    virtual ~ServantRetentionPolicy (void);
-    virtual CORBA::Boolean _is_a (
-                                  const char* logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual void* _downcast (
-                             const char* logical_type_id
-                             );
-    virtual PortableServer::ServantRetentionPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-    static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ());
-
-    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-    static void _get_policy_type_skel (
-                                       CORBA::ServerRequest &_tao_req,
-                                       void *_tao_obj,
-                                       void *_tao_context,
-                                       CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                       );
-
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-    PortableServer::ServantRetentionPolicy *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-
-#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___COLLOCATED_SH_)
-#define _PORTABLESERVER_SERVANTRETENTIONPOLICY___COLLOCATED_SH_
-
-  class TAO_Export _tao_collocated_ServantRetentionPolicy    : public virtual PortableServer::ServantRetentionPolicy,
-                                                               public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_ServantRetentionPolicy (
-                                            ServantRetentionPolicy_ptr  servant,
-                                            TAO_Stub *stub
-                                            );
-    ServantRetentionPolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-                                  const char *logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                  );
-    virtual PortableServer::ServantRetentionPolicyValue value (
-                                                               CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                                               );
-    virtual CORBA::Policy_ptr copy (
-                                    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                    );
-    virtual void destroy (
-                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                          );
-    virtual CORBA::PolicyType policy_type (
-                                           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                           );
-
-  private:
-    ServantRetentionPolicy_ptr servant_;
-  };
-
-
-#endif // end #if !defined
-
-
-  class RequestProcessingPolicy;
-  typedef RequestProcessingPolicy *RequestProcessingPolicy_ptr;
-  class TAO_Export RequestProcessingPolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    RequestProcessingPolicy (void);
-  public:
-    virtual ~RequestProcessingPolicy (void);
-    virtual CORBA::Boolean _is_a (
-                                  const char* logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual void* _downcast (
-                             const char* logical_type_id
-                             );
-    virtual PortableServer::RequestProcessingPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-    static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ());
-
-    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-    static void _get_policy_type_skel (
-                                       CORBA::ServerRequest &_tao_req,
-                                       void *_tao_obj,
-                                       void *_tao_context,
-                                       CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                       );
-
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-    PortableServer::RequestProcessingPolicy *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-
-#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___COLLOCATED_SH_)
-#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___COLLOCATED_SH_
-
-  class TAO_Export _tao_collocated_RequestProcessingPolicy    : public virtual PortableServer::RequestProcessingPolicy,
-                                                                public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_RequestProcessingPolicy (
-                                             RequestProcessingPolicy_ptr  servant,
-                                             TAO_Stub *stub
-                                             );
-    RequestProcessingPolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-                                  const char *logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                  );
-    virtual PortableServer::RequestProcessingPolicyValue value (
-                                                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                                                );
-    virtual CORBA::Policy_ptr copy (
-                                    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                    );
-    virtual void destroy (
-                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                          );
-    virtual CORBA::PolicyType policy_type (
-                                           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                           );
-
-  private:
-    RequestProcessingPolicy_ptr servant_;
-  };
-
-
-#endif // end #if !defined
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-
-  class POAManager;
-  typedef POAManager *POAManager_ptr;
-  class TAO_Export POAManager :  public virtual TAO_Local_ServantBase
-  {
-  protected:
-    POAManager (void);
-  public:
-    virtual ~POAManager (void);
-    virtual CORBA::Boolean _is_a (
-                                  const char* logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual void* _downcast (
-                             const char* logical_type_id
-                             );
-    virtual void activate ( CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-    virtual void hold_requests (CORBA::Boolean wait_for_completion,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-    virtual void discard_requests (CORBA::Boolean wait_for_completion,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-    virtual void deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-    virtual PortableServer::POAManager::State get_state (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-    PortableServer::POAManager *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-
-#if !defined (_PORTABLESERVER_POAMANAGER___COLLOCATED_SH_)
-#define _PORTABLESERVER_POAMANAGER___COLLOCATED_SH_
-
-  class TAO_Export _tao_collocated_POAManager    : public virtual PortableServer::POAManager
-  {
-  public:
-    _tao_collocated_POAManager (
-                                POAManager_ptr  servant,
-                                TAO_Stub *stub
-                                );
-    POAManager_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-                                  const char *logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                  );
-    virtual void activate (
-                           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                           );
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-    virtual void hold_requests (
-                                CORBA::Boolean wait_for_completion,
-                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                );
-    virtual void discard_requests (
-                                   CORBA::Boolean wait_for_completion,
-                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                   );
-    virtual void deactivate (
-                             CORBA::Boolean etherealize_objects,
-                             CORBA::Boolean wait_for_completion,
-                             CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                             );
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-    virtual PortableServer::POAManager::State get_state (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  private:
-    POAManager_ptr servant_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  class AdapterActivator;
-  typedef AdapterActivator *AdapterActivator_ptr;
-  class TAO_Export AdapterActivator :  public virtual TAO_Local_ServantBase
-  {
-  protected:
-    AdapterActivator (void);
-  public:
-    virtual ~AdapterActivator (void);
-    virtual CORBA::Boolean _is_a (
-                                  const char* logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual void* _downcast (
-                             const char* logical_type_id
-                             );
-    virtual CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent, const char *name,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-    PortableServer::AdapterActivator *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-
-#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___COLLOCATED_SH_)
-#define _PORTABLESERVER_ADAPTERACTIVATOR___COLLOCATED_SH_
-
-  class TAO_Export _tao_collocated_AdapterActivator    : public virtual PortableServer::AdapterActivator
-  {
-  public:
-    _tao_collocated_AdapterActivator (
-                                      AdapterActivator_ptr  servant,
-                                      TAO_Stub *stub
-                                      );
-    AdapterActivator_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-                                  const char *logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                  );
-    virtual CORBA::Boolean unknown_adapter (
-                                            PortableServer::POA_ptr  parent,
-                                            const char* name,
-                                            CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                            );
-
-  private:
-    AdapterActivator_ptr servant_;
-  };
-
-
-#endif // end #if !defined
-
-
-  class ServantManager;
-  typedef ServantManager *ServantManager_ptr;
-  class TAO_Export ServantManager :  public virtual TAO_Local_ServantBase
-  {
-  protected:
-    ServantManager (void);
-  public:
-    virtual ~ServantManager (void);
-    virtual CORBA::Boolean _is_a (
-                                  const char* logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual void* _downcast (
-                             const char* logical_type_id
-                             );
-
-    PortableServer::ServantManager *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-
-#if !defined (_PORTABLESERVER_SERVANTMANAGER___COLLOCATED_SH_)
-#define _PORTABLESERVER_SERVANTMANAGER___COLLOCATED_SH_
-
-  class TAO_Export _tao_collocated_ServantManager    : public virtual PortableServer::ServantManager
-  {
-  public:
-    _tao_collocated_ServantManager (
-                                    ServantManager_ptr  servant,
-                                    TAO_Stub *stub
-                                    );
-    ServantManager_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-                                  const char *logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                  );
-
-  private:
-    ServantManager_ptr servant_;
-  };
-
-
-#endif // end #if !defined
-
-
-  class ServantActivator;
-  typedef ServantActivator *ServantActivator_ptr;
-  class TAO_Export ServantActivator : public virtual ServantManager
-  {
-  protected:
-    ServantActivator (void);
-  public:
-    virtual ~ServantActivator (void);
-    virtual CORBA::Boolean _is_a (
-                                  const char* logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual void* _downcast (
-                             const char* logical_type_id
-                             );
-    virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-    virtual void etherealize (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, PortableServer::Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-    PortableServer::ServantActivator *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-
-#if !defined (_PORTABLESERVER_SERVANTACTIVATOR___COLLOCATED_SH_)
-#define _PORTABLESERVER_SERVANTACTIVATOR___COLLOCATED_SH_
-
-  class TAO_Export _tao_collocated_ServantActivator    : public virtual PortableServer::ServantActivator,
-                                                         public virtual _tao_collocated_ServantManager
-  {
-  public:
-    _tao_collocated_ServantActivator (
-                                      ServantActivator_ptr  servant,
-                                      TAO_Stub *stub
-                                      );
-    ServantActivator_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-                                  const char *logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                  );
-    virtual PortableServer::Servant incarnate (
-                                               const PortableServer::ObjectId & oid,
-                                               PortableServer::POA_ptr  adapter,
-                                               CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                               );
-    virtual void etherealize (
-                              const PortableServer::ObjectId & oid,
-                              PortableServer::POA_ptr  adapter,
-                              PortableServer::Servant serv,
-                              CORBA::Boolean cleanup_in_progress,
-                              CORBA::Boolean remaining_activations,
-                              CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                              );
-
-  private:
-    ServantActivator_ptr servant_;
-  };
-
-
-#endif // end #if !defined
-
-
-  class ServantLocator;
-  typedef ServantLocator *ServantLocator_ptr;
-  class TAO_Export ServantLocator : public virtual ServantManager
-  {
-  protected:
-    ServantLocator (void);
-  public:
-    virtual ~ServantLocator (void);
-    virtual CORBA::Boolean _is_a (
-                                  const char* logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual void* _downcast (
-                             const char* logical_type_id
-                             );
-    virtual PortableServer::Servant preinvoke (const PortableServer::ObjectId &oid,
-                                               PortableServer::POA_ptr adapter,
-                                               const char *operation,
-                                               PortableServer::ServantLocator::Cookie & the_cookie,
-                                               CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-    virtual void postinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-    PortableServer::ServantLocator *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-
-#if !defined (_PORTABLESERVER_SERVANTLOCATOR___COLLOCATED_SH_)
-#define _PORTABLESERVER_SERVANTLOCATOR___COLLOCATED_SH_
-
-  class TAO_Export _tao_collocated_ServantLocator    : public virtual PortableServer::ServantLocator,
-                                                       public virtual _tao_collocated_ServantManager
-  {
-  public:
-    _tao_collocated_ServantLocator (
-                                    ServantLocator_ptr  servant,
-                                    TAO_Stub *stub
-                                    );
-    ServantLocator_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-                                  const char *logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                  );
-    virtual PortableServer::Servant preinvoke (
-                                               const PortableServer::ObjectId & oid,
-                                               PortableServer::POA_ptr  adapter,
-                                               const char * operation,
-                                               PortableServer::ServantLocator::Cookie & the_cookie,
-                                               CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                               );
-    virtual void postinvoke (
-                             const PortableServer::ObjectId & oid,
-                             PortableServer::POA_ptr  adapter,
-                             const char * operation,
-                             PortableServer::ServantLocator::Cookie the_cookie,
-                             PortableServer::Servant the_servant,
-                             CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                             );
-
-  private:
-    ServantLocator_ptr servant_;
-  };
-
-
-#endif // end #if !defined
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  class POA;
-  typedef POA *POA_ptr;
-  class TAO_Export POA :  public virtual TAO_Local_ServantBase
-  {
-  protected:
-    POA (void);
-  public:
-    virtual ~POA (void);
-    virtual CORBA::Boolean _is_a (
-                                  const char* logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual void* _downcast (
-                             const char* logical_type_id
-                             );
-    virtual PortableServer::POA_ptr  create_POA (const char *adapter_name, PortableServer::POAManager_ptr a_POAManager, const CORBA::PolicyList &policies,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-    virtual PortableServer::POA_ptr  find_POA (const char *adapter_name, CORBA::Boolean activate_it,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-    virtual void destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-    virtual PortableServer::ThreadPolicy_ptr  create_thread_policy (PortableServer::ThreadPolicyValue value,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-    virtual PortableServer::LifespanPolicy_ptr  create_lifespan_policy (PortableServer::LifespanPolicyValue value,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-    virtual PortableServer::IdUniquenessPolicy_ptr  create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-    virtual PortableServer::IdAssignmentPolicy_ptr  create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-    virtual PortableServer::ImplicitActivationPolicy_ptr  create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-    virtual PortableServer::ServantRetentionPolicy_ptr  create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-    virtual PortableServer::RequestProcessingPolicy_ptr  create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-    virtual char * the_name (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-
-    virtual PortableServer::POA_ptr  the_parent (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-
-    virtual PortableServer::POAManager_ptr  the_POAManager (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-    virtual PortableServer::AdapterActivator_ptr  the_activator (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-
-    virtual void the_activator(PortableServer::AdapterActivator_ptr the_activator, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-
-    virtual PortableServer::ServantManager_ptr  get_servant_manager ( CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-    virtual void set_servant_manager (PortableServer::ServantManager_ptr imgr,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-    virtual PortableServer::Servant get_servant ( CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-    virtual void set_servant (PortableServer::Servant p_servant,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-    virtual PortableServer::ObjectId * activate_object (PortableServer::Servant p_servant,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-    virtual void activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant p_servant,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-    virtual void deactivate_object (const PortableServer::ObjectId &oid,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-    virtual CORBA::Object_ptr create_reference (const char *intf,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-    virtual CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid, const char *intf,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-    virtual PortableServer::ObjectId * servant_to_id (PortableServer::Servant p_servant,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-    virtual CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-    virtual PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-    virtual PortableServer::ObjectId * reference_to_id (CORBA::Object_ptr reference,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-    virtual PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-    virtual CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid,  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-    PortableServer::POA *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-
-#if !defined (_PORTABLESERVER_POA___COLLOCATED_SH_)
-#define _PORTABLESERVER_POA___COLLOCATED_SH_
-
-  class TAO_Export _tao_collocated_POA    : public virtual PortableServer::POA
-  {
-  public:
-    _tao_collocated_POA (
-                         POA_ptr  servant,
-                         TAO_Stub *stub
-                         );
-    POA_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-                                  const char *logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                  );
-    virtual PortableServer::POA_ptr create_POA (
-                                                const char* adapter_name,
-                                                PortableServer::POAManager_ptr  a_POAManager,
-                                                const CORBA::PolicyList & policies,
-                                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                                );
-    virtual PortableServer::POA_ptr find_POA (
-                                              const char* adapter_name,
-                                              CORBA::Boolean activate_it,
-                                              CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                              );
-    virtual void destroy (
-                          CORBA::Boolean etherealize_objects,
-                          CORBA::Boolean wait_for_completion,
-                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                          );
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-    virtual PortableServer::ThreadPolicy_ptr create_thread_policy (
-                                                                   PortableServer::ThreadPolicyValue value,
-                                                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                                                   );
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-    virtual PortableServer::LifespanPolicy_ptr create_lifespan_policy (
-                                                                       PortableServer::LifespanPolicyValue value,
-                                                                       CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                                                       );
-    virtual PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (
-                                                                                PortableServer::IdUniquenessPolicyValue value,
-                                                                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                                                                );
-    virtual PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (
-                                                                                PortableServer::IdAssignmentPolicyValue value,
-                                                                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                                                                );
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-    virtual PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (
-                                                                                            PortableServer::ImplicitActivationPolicyValue value,
-                                                                                            CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                                                                            );
-    virtual PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (
-                                                                                        PortableServer::ServantRetentionPolicyValue value,
-                                                                                        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                                                                        );
-    virtual PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (
-                                                                                          PortableServer::RequestProcessingPolicyValue value,
-                                                                                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                                                                          );
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-
-    virtual char*  the_name (
-                             CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                             );
-    virtual PortableServer::POA_ptr the_parent (
-                                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                                );
-    virtual PortableServer::POAManager_ptr the_POAManager (
-                                                           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                                           );
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-    virtual PortableServer::AdapterActivator_ptr the_activator (
-                                                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                                                );
-    virtual void the_activator (PortableServer::AdapterActivator_ptr  _tao_value,
-                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                );
-    virtual PortableServer::ServantManager_ptr get_servant_manager (
-                                                                    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                                                    );
-    virtual void set_servant_manager (
-                                      PortableServer::ServantManager_ptr  imgr,
-                                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                      );
-    virtual PortableServer::Servant get_servant (
-                                                 CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                                 );
-    virtual void set_servant (
-                              PortableServer::Servant p_servant,
-                              CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                              );
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-    virtual PortableServer::ObjectId * activate_object (
-                                                        PortableServer::Servant p_servant,
-                                                        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                                        );
-    virtual void activate_object_with_id (
-                                          const PortableServer::ObjectId & id,
-                                          PortableServer::Servant p_servant,
-                                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                          );
-    virtual void deactivate_object (
-                                    const PortableServer::ObjectId & oid,
-                                    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                    );
-    virtual CORBA::Object_ptr create_reference (
-                                                const char *intf,
-                                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                                );
-    virtual CORBA::Object_ptr create_reference_with_id (
-                                                        const PortableServer::ObjectId & oid,
-                                                        const char *intf,
-                                                        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                                        );
-    virtual PortableServer::ObjectId * servant_to_id (
-                                                      PortableServer::Servant p_servant,
-                                                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                                      );
-    virtual CORBA::Object_ptr servant_to_reference (
-                                                    PortableServer::Servant p_servant,
-                                                    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                                    );
-    virtual PortableServer::Servant reference_to_servant (
-                                                          CORBA::Object_ptr  reference,
-                                                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                                          );
-    virtual PortableServer::ObjectId * reference_to_id (
-                                                        CORBA::Object_ptr  reference,
-                                                        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                                        );
-    virtual PortableServer::Servant id_to_servant (
-                                                   const PortableServer::ObjectId & oid,
-                                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                                   );
-    virtual CORBA::Object_ptr id_to_reference (
-                                               const PortableServer::ObjectId & oid,
-                                               CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                               );
-
-  private:
-    POA_ptr servant_;
-  };
-
-
-#endif // end #if !defined
-
-
-  class Current;
-  typedef Current *Current_ptr;
-  class TAO_Export Current : public virtual POA_CORBA::Current
-  {
-  protected:
-    Current (void);
-  public:
-    virtual ~Current (void);
-    virtual CORBA::Boolean _is_a (
-                                  const char* logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual void* _downcast (
-                             const char* logical_type_id
-                             );
-    virtual PortableServer::POA_ptr  get_POA ( CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-    virtual PortableServer::ObjectId * get_object_id ( CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual
-
-    PortableServer::Current *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-
-#if !defined (_PORTABLESERVER_CURRENT___COLLOCATED_SH_)
-#define _PORTABLESERVER_CURRENT___COLLOCATED_SH_
-
-  class TAO_Export _tao_collocated_Current    : public virtual PortableServer::Current,
-                                                public virtual POA_CORBA::_tao_collocated_Current
-  {
-  public:
-    _tao_collocated_Current (
-                             Current_ptr  servant,
-                             TAO_Stub *stub
-                             );
-    Current_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-                                  const char *logical_type_id,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                  );
-    virtual PortableServer::POA_ptr get_POA (
-                                             CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                             );
-    virtual PortableServer::ObjectId * get_object_id (
-                                                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-                                                      );
-
-  private:
-    Current_ptr servant_;
-  };
-
-
-#endif // end #if !defined
-
-
-};
-
-
-#if defined (__ACE_INLINE__)
-#include "POAS.i"
-#endif // defined INLINE
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_IDL_POAS_H */
diff --git a/TAO/tao/POAS.i b/TAO/tao/POAS.i
deleted file mode 100644
index 0d08448e83d..00000000000
--- a/TAO/tao/POAS.i
+++ /dev/null
@@ -1,226 +0,0 @@
-// $Id$
-//
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-// skeleton destructor
-ACE_INLINE
-POA_PortableServer::ThreadPolicy::~ThreadPolicy (void)
-{
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-ACE_INLINE void POA_PortableServer::ThreadPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  POA_CORBA::Policy_ptr impl = (POA_PortableServer::ThreadPolicy_ptr) obj;
-  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
-}
-ACE_INLINE void POA_PortableServer::ThreadPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  POA_CORBA::Policy_ptr impl = (POA_PortableServer::ThreadPolicy_ptr) obj;
-  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
-}
-ACE_INLINE void POA_PortableServer::ThreadPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  POA_CORBA::Policy_ptr impl = (POA_PortableServer::ThreadPolicy_ptr) obj;
-  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
-}
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-// skeleton destructor
-ACE_INLINE
-POA_PortableServer::LifespanPolicy::~LifespanPolicy (void)
-{
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-ACE_INLINE void POA_PortableServer::LifespanPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  POA_CORBA::Policy_ptr impl = (POA_PortableServer::LifespanPolicy_ptr) obj;
-  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
-}
-ACE_INLINE void POA_PortableServer::LifespanPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  POA_CORBA::Policy_ptr impl = (POA_PortableServer::LifespanPolicy_ptr) obj;
-  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
-}
-ACE_INLINE void POA_PortableServer::LifespanPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  POA_CORBA::Policy_ptr impl = (POA_PortableServer::LifespanPolicy_ptr) obj;
-  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
-}
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-// skeleton destructor
-ACE_INLINE
-POA_PortableServer::IdUniquenessPolicy::~IdUniquenessPolicy (void)
-{
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-ACE_INLINE void POA_PortableServer::IdUniquenessPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  POA_CORBA::Policy_ptr impl = (POA_PortableServer::IdUniquenessPolicy_ptr) obj;
-  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
-}
-ACE_INLINE void POA_PortableServer::IdUniquenessPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  POA_CORBA::Policy_ptr impl = (POA_PortableServer::IdUniquenessPolicy_ptr) obj;
-  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
-}
-ACE_INLINE void POA_PortableServer::IdUniquenessPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  POA_CORBA::Policy_ptr impl = (POA_PortableServer::IdUniquenessPolicy_ptr) obj;
-  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
-}
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-// skeleton destructor
-ACE_INLINE
-POA_PortableServer::IdAssignmentPolicy::~IdAssignmentPolicy (void)
-{
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-ACE_INLINE void POA_PortableServer::IdAssignmentPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  POA_CORBA::Policy_ptr impl = (POA_PortableServer::IdAssignmentPolicy_ptr) obj;
-  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
-}
-ACE_INLINE void POA_PortableServer::IdAssignmentPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  POA_CORBA::Policy_ptr impl = (POA_PortableServer::IdAssignmentPolicy_ptr) obj;
-  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
-}
-ACE_INLINE void POA_PortableServer::IdAssignmentPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  POA_CORBA::Policy_ptr impl = (POA_PortableServer::IdAssignmentPolicy_ptr) obj;
-  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
-}
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-// skeleton destructor
-ACE_INLINE
-POA_PortableServer::ImplicitActivationPolicy::~ImplicitActivationPolicy (void)
-{
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-ACE_INLINE void POA_PortableServer::ImplicitActivationPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  POA_CORBA::Policy_ptr impl = (POA_PortableServer::ImplicitActivationPolicy_ptr) obj;
-  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
-}
-ACE_INLINE void POA_PortableServer::ImplicitActivationPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  POA_CORBA::Policy_ptr impl = (POA_PortableServer::ImplicitActivationPolicy_ptr) obj;
-  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
-}
-ACE_INLINE void POA_PortableServer::ImplicitActivationPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  POA_CORBA::Policy_ptr impl = (POA_PortableServer::ImplicitActivationPolicy_ptr) obj;
-  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
-}
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-// skeleton destructor
-ACE_INLINE
-POA_PortableServer::ServantRetentionPolicy::~ServantRetentionPolicy (void)
-{
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-ACE_INLINE void POA_PortableServer::ServantRetentionPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  POA_CORBA::Policy_ptr impl = (POA_PortableServer::ServantRetentionPolicy_ptr) obj;
-  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
-}
-ACE_INLINE void POA_PortableServer::ServantRetentionPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  POA_CORBA::Policy_ptr impl = (POA_PortableServer::ServantRetentionPolicy_ptr) obj;
-  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
-}
-ACE_INLINE void POA_PortableServer::ServantRetentionPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  POA_CORBA::Policy_ptr impl = (POA_PortableServer::ServantRetentionPolicy_ptr) obj;
-  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
-}
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-// skeleton destructor
-ACE_INLINE
-POA_PortableServer::RequestProcessingPolicy::~RequestProcessingPolicy (void)
-{
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-ACE_INLINE void POA_PortableServer::RequestProcessingPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  POA_CORBA::Policy_ptr impl = (POA_PortableServer::RequestProcessingPolicy_ptr) obj;
-  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
-}
-ACE_INLINE void POA_PortableServer::RequestProcessingPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  POA_CORBA::Policy_ptr impl = (POA_PortableServer::RequestProcessingPolicy_ptr) obj;
-  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
-}
-ACE_INLINE void POA_PortableServer::RequestProcessingPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  POA_CORBA::Policy_ptr impl = (POA_PortableServer::RequestProcessingPolicy_ptr) obj;
-  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
-}
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-// skeleton destructor
-ACE_INLINE
-POA_PortableServer::POAManager::~POAManager (void)
-{
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-// skeleton destructor
-ACE_INLINE
-POA_PortableServer::AdapterActivator::~AdapterActivator (void)
-{
-}
-// skeleton destructor
-ACE_INLINE
-POA_PortableServer::ServantManager::~ServantManager (void)
-{
-}
-// skeleton destructor
-ACE_INLINE
-POA_PortableServer::ServantActivator::~ServantActivator (void)
-{
-}
-// skeleton destructor
-ACE_INLINE
-POA_PortableServer::ServantLocator::~ServantLocator (void)
-{
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-// skeleton destructor
-ACE_INLINE
-POA_PortableServer::POA::~POA (void)
-{
-}
-// skeleton destructor
-ACE_INLINE
-POA_PortableServer::Current::~Current (void)
-{
-}
diff --git a/TAO/tao/POA_CORBA.h b/TAO/tao/POA_CORBA.h
deleted file mode 100644
index 5218093bbee..00000000000
--- a/TAO/tao/POA_CORBA.h
+++ /dev/null
@@ -1,1802 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//   POA_CORBA.h
-//
-//   This file is created by merging the CurrentS.h, PolicyS.h,
-//   PollableS.h, DomainC.h and DynAnyS.h files which have been removed.
-//
-// = AUTHOR
-//
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-//
-//
-// Modified by Aniruddha Gokhale.
-//
-// ============================================================================
-
-#ifndef TAO_IDL_POA_CORBA_H
-#define TAO_IDL_POA_CORBA_H
-
-#include "tao/CurrentC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PolicyC.h"
-#include "tao/DynAnyC.h"
-#include "tao/DomainC.h"
-#include "tao/Servant_Base.h"
-#if defined(TAO_POLLER)
-#include "tao/PollableC.h"
-#endif /* TAO_POLLER */
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class TAO_Export  POA_CORBA
-{
-public:
-  // ****************************************************************
-
-  class Current;
-  typedef Current *Current_ptr;
-  class  Current :  public virtual TAO_Local_ServantBase
-  {
-  protected:
-    Current (void);
-  public:
-    virtual ~Current (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    ACE_CORBA_1(Current) *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef Current_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
-  };
-
-  class  _tao_collocated_Current     : public virtual CORBA_Current
-  {
-  public:
-    _tao_collocated_Current (void) {} // Needed by the IBM VisualAge C++ compiler.
-    _tao_collocated_Current (
-        Current_ptr  servant,
-        TAO_Stub *stub
-      );
-    Current_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-
-  private:
-    Current_ptr servant_;
-  };
-
-  // ****************************************************************
-
-  class Policy;
-  typedef Policy *Policy_ptr;
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-  class TAO_Export  Policy :  public virtual TAO_ServantBase
-#else
-  class TAO_Export  Policy :  public virtual TAO_Local_ServantBase
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-  {
-  protected:
-    Policy (void);
-  public:
-    Policy (const Policy& rhs);
-    virtual ~Policy (void);
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    virtual CORBA::PolicyType policy_type (
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-       ) = 0;
-
-    virtual CORBA::Policy_ptr copy (
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-       ) = 0;
-
-    virtual void destroy (
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-       ) = 0;
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    static void _get_policy_type_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-
-    static void copy_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA_Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA_Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-    CORBA_Policy_ptr _this (
-        CORBA_Environment &ACE_TRY_ENV =
-          TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef Policy_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
-  };
-
-  class TAO_Export  _tao_collocated_Policy     : public virtual CORBA_Policy
-  {
-  public:
-    _tao_collocated_Policy (
-        Policy_ptr  servant,
-        TAO_Stub *stub
-      );
-    Policy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    virtual CORBA::PolicyType policy_type (
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-       );
-    virtual CORBA::Policy_ptr copy (
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-       );
-    virtual void destroy (
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-       );
-
-  private:
-    Policy_ptr servant_;
-  };
-
-  // ****************************************************************
-
-  class PolicyManager;
-  typedef PolicyManager *PolicyManager_ptr;
-  class TAO_Export PolicyManager :  public virtual TAO_Local_ServantBase
-  {
-  protected:
-    PolicyManager (void);
-  public:
-    PolicyManager (const PolicyManager& rhs);
-    virtual ~PolicyManager (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual CORBA::PolicyList * get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    virtual void set_policy_overrides (
-        const CORBA::PolicyList & policies,
-        CORBA::SetOverrideType set_add,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    CORBA::PolicyManager *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_PolicyManager     : public virtual CORBA::PolicyManager
-  {
-  public:
-    _tao_collocated_PolicyManager (
-        PolicyManager_ptr  servant,
-        TAO_Stub *stub
-      );
-    PolicyManager_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::PolicyList * get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void set_policy_overrides (
-        const CORBA::PolicyList & policies,
-        CORBA::SetOverrideType set_add,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    PolicyManager_ptr servant_;
-  };
-
-  // ****************************************************************
-
-  class PolicyCurrent;
-  typedef PolicyCurrent *PolicyCurrent_ptr;
-  class TAO_Export PolicyCurrent : public virtual PolicyManager, public virtual Current
-  {
-  protected:
-    PolicyCurrent (void);
-  public:
-    PolicyCurrent (const PolicyCurrent& rhs);
-    virtual ~PolicyCurrent (void);
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    CORBA::PolicyCurrent *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_PolicyCurrent     : public virtual CORBA::PolicyCurrent,
-      public virtual _tao_collocated_PolicyManager,
-      public virtual _tao_collocated_Current
-  {
-  public:
-    _tao_collocated_PolicyCurrent (
-        PolicyCurrent_ptr  servant,
-        TAO_Stub *stub
-      );
-    PolicyCurrent_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    PolicyCurrent_ptr servant_;
-  };
-
-  // ****************************************************************
-
-  class DomainManager;
-  typedef DomainManager *DomainManager_ptr;
-  class  DomainManager :  public virtual PortableServer::ServantBase
-  {
-  protected:
-    DomainManager (void);
-
-  public:
-    DomainManager (const DomainManager& rhs);
-    virtual ~DomainManager (void);
-
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-        static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    CORBA::DomainManager *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Policy_ptr get_domain_policy (
-      CORBA::PolicyType policy_type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    ) = 0;
-    static void get_domain_policy_skel (
-      CORBA::ServerRequest &_tao_req,
-      void *_tao_obj,
-      void *_tao_context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-
-  };
-
-  class  _tao_collocated_DomainManager : public virtual CORBA::DomainManager
-  {
-  public:
-    _tao_collocated_DomainManager (
-        DomainManager_ptr  servant,
-        TAO_Stub *stub
-      );
-    DomainManager_ptr _get_servant (void) const;
-        virtual CORBA::Policy_ptr get_domain_policy (
-        CORBA::PolicyType policy_type,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-  private:
-    DomainManager_ptr servant_;
-  };
-
-  // ****************************************************************
-
-#if defined (TAO_POLLER)
-  class Pollable;
-  typedef Pollable *Pollable_ptr;
-  class TAO_Export Pollable :  public virtual PortableServer::ServantBase
-  {
-  protected:
-    Pollable (void);
-  public:
-    Pollable (const Pollable& rhs);
-    virtual ~Pollable (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual CORBA::Boolean is_ready (
-        CORBA::ULong timeout,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void is_ready_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual CORBA::PollableSet_ptr create_pollable_set (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void create_pollable_set_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    CORBA::Pollable *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_Pollable     : public virtual CORBA::Pollable
-  {
-  public:
-    _tao_collocated_Pollable (
-        Pollable_ptr  servant,
-        TAO_Stub *stub
-      );
-    Pollable_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::Boolean is_ready (
-        CORBA::ULong timeout,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::PollableSet_ptr create_pollable_set (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    Pollable_ptr servant_;
-  };
-
-  // ****************************************************************
-
-  class DIIPollable;
-  typedef DIIPollable *DIIPollable_ptr;
-  class TAO_Export DIIPollable : public virtual Pollable
-  {
-  protected:
-    DIIPollable (void);
-  public:
-    DIIPollable (const DIIPollable& rhs);
-    virtual ~DIIPollable (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    CORBA::Boolean in_mult_inheritance (void);
-
-    static void is_ready_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void create_pollable_set_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    CORBA::DIIPollable *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_DIIPollable     : public virtual CORBA::DIIPollable,
-      public virtual _tao_collocated_Pollable
-  {
-  public:
-    _tao_collocated_DIIPollable (
-        DIIPollable_ptr  servant,
-        TAO_Stub *stub
-      );
-    DIIPollable_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    DIIPollable_ptr servant_;
-  };
-
-  // ****************************************************************
-
-  class PollableSet;
-  typedef PollableSet *PollableSet_ptr;
-  class TAO_Export PollableSet :  public virtual PortableServer::ServantBase
-  {
-  protected:
-    PollableSet (void);
-  public:
-    PollableSet (const PollableSet& rhs);
-    virtual ~PollableSet (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual CORBA::DIIPollable_ptr create_dii_pollable (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void create_dii_pollable_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual void add_pollable (
-        CORBA::Pollable_ptr potential,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void add_pollable_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual CORBA::Pollable_ptr poll (
-        CORBA::ULong timeout,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void poll_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual void remove (
-        CORBA::Pollable_ptr potential,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void remove_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual CORBA::UShort number_left (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void number_left_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    CORBA::PollableSet *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_PollableSet : public virtual CORBA::PollableSet
-  {
-  public:
-    _tao_collocated_PollableSet (
-        PollableSet_ptr  servant,
-        TAO_Stub *stub
-      );
-    PollableSet_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::DIIPollable_ptr create_dii_pollable (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void add_pollable (
-        CORBA::Pollable_ptr potential,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::Pollable_ptr poll (
-        CORBA::ULong timeout,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void remove (
-        CORBA::Pollable_ptr potential,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::UShort number_left (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    PollableSet_ptr servant_;
-  };
-#endif /* 0 */
-
-  // ****************************************************************
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-class DynAny;
-typedef DynAny *DynAny_ptr;
-class TAO_Export DynAny : public virtual TAO_Local_ServantBase
-{
-protected:
-  DynAny (void);
-public:
-  DynAny (DynAny& rhs);
-  virtual ~DynAny (void);
-  virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-  virtual void* _downcast (
-      const char* logical_type_id
-    );
-  virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-        ) = 0;
-
-  virtual void assign (
-      CORBA_DynAny_ptr dyn_any,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-        ) = 0;
-
-  virtual void from_any (
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-        ) = 0;
-
-  virtual CORBA::Any * to_any (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-        ) = 0;
-
-  virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-        ) = 0;
-
-  virtual CORBA_DynAny_ptr copy (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-        ) = 0;
-
-  virtual void insert_boolean (
-      CORBA::Boolean value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-        ) = 0;
-
-  virtual void insert_octet (
-      CORBA::Octet value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual void insert_char (
-      CORBA::Char value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual void insert_short (
-      CORBA::Short value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual void insert_ushort (
-      CORBA::UShort value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual void insert_long (
-      CORBA::Long value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual void insert_ulong (
-      CORBA::ULong value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual void insert_float (
-      CORBA::Float value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual void insert_double (
-      CORBA::Double value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual void insert_string (
-      const char * value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual void insert_reference (
-      CORBA::Object_ptr value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual void insert_typecode (
-      CORBA::TypeCode_ptr value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual void insert_longlong (
-      CORBA::LongLong value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual void insert_ulonglong (
-      CORBA::ULongLong value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual void insert_wchar (
-      CORBA::WChar value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual void insert_any (
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual CORBA::Boolean get_boolean (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-        ) = 0;
-
-  virtual CORBA::Octet get_octet (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual CORBA::Char get_char (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual CORBA::Short get_short (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual CORBA::UShort get_ushort (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual CORBA::Long get_long (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual CORBA::ULong get_ulong (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual CORBA::Float get_float (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual CORBA::Double get_double (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual char * get_string (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual CORBA::Object_ptr get_reference (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual CORBA::TypeCode_ptr get_typecode (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual CORBA::LongLong get_longlong (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual CORBA::ULongLong get_ulonglong (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual CORBA::WChar get_wchar (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual CORBA::Any * get_any (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual CORBA_DynAny_ptr current_component (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-        ) = 0;
-
-  virtual CORBA::Boolean next (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-        ) = 0;
-
-  virtual CORBA::Boolean seek (
-      CORBA::Long slot,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-        ) = 0;
-
-  virtual void rewind (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-        ) = 0;
-
-  CORBA_DynAny *_this (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-  virtual const char* _interface_repository_id (void) const;
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef DynAny_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
-};
-
-class  _tao_collocated_DynAny : public virtual CORBA_DynAny
-{
-public:
-  _tao_collocated_DynAny (
-      DynAny_ptr  servant,
-      TAO_Stub *stub
-     );
-  DynAny_ptr _get_servant (void) const;
-  virtual CORBA::Boolean _is_a (
-      const char *logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-  virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-  virtual void assign (
-      CORBA_DynAny_ptr CORBA_Dyn_any,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void from_any (
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::Any * to_any (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA_DynAny_ptr copy (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void insert_boolean (
-      CORBA::Boolean value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void insert_octet (
-      CORBA::Octet value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void insert_char (
-      CORBA::Char value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void insert_short (
-      CORBA::Short value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void insert_ushort (
-      CORBA::UShort value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void insert_long (
-      CORBA::Long value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void insert_ulong (
-      CORBA::ULong value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void insert_float (
-      CORBA::Float value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void insert_double (
-      CORBA::Double value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void insert_string (
-      const char * value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void insert_reference (
-      CORBA::Object_ptr value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void insert_typecode (
-      CORBA::TypeCode_ptr value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void insert_longlong (
-      CORBA::LongLong value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void insert_ulonglong (
-      CORBA::ULongLong value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void insert_wchar (
-      CORBA::WChar value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void insert_any (
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::Boolean get_boolean (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::Octet get_octet (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::Char get_char (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::Short get_short (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::UShort get_ushort (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::Long get_long (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::ULong get_ulong (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::Float get_float (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::Double get_double (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual char * get_string (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::Object_ptr get_reference (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::TypeCode_ptr get_typecode (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::LongLong get_longlong (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::ULongLong get_ulonglong (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::WChar get_wchar (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::Any * get_any (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA_DynAny_ptr current_component (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::Boolean next (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::Boolean seek (
-      CORBA::Long slot,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void rewind (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-
-private:
-  DynAny_ptr servant_;
-};
-
-class DynEnum;
-typedef DynEnum *DynEnum_ptr;
-class TAO_Export DynEnum : public virtual DynAny
-{
-protected:
-  DynEnum (void);
-public:
-  DynEnum (DynEnum& rhs);
-  virtual ~DynEnum (void);
-  virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-  virtual void* _downcast (
-      const char* logical_type_id
-    );
-  virtual char * value_as_string (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual void value_as_string (
-      const char * value_as_string,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual CORBA::ULong value_as_ulong (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual void value_as_ulong (
-      CORBA::ULong value_as_ulong,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  CORBA_DynEnum *_this (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-  virtual const char* _interface_repository_id (void) const;
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef DynEnum_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
-};
-
-class  _tao_collocated_DynEnum : public virtual CORBA_DynEnum,
-    public virtual _tao_collocated_DynAny
-{
-public:
-  _tao_collocated_DynEnum (
-      DynEnum_ptr  servant,
-      TAO_Stub *stub
-    );
-  DynEnum_ptr _get_servant (void) const;
-  virtual CORBA::Boolean _is_a (
-      const char *logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-  virtual char * value_as_string (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void value_as_string (
-      const char * value_as_string,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::ULong value_as_ulong (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void value_as_ulong (
-      CORBA::ULong value_as_ulong,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-
-private:
-  DynEnum_ptr servant_;
-};
-
-class DynStruct;
-typedef DynStruct *DynStruct_ptr;
-class TAO_Export DynStruct : public virtual DynAny
-{
-protected:
-  DynStruct (void);
-public:
-  DynStruct (DynStruct& rhs);
-  virtual ~DynStruct (void);
-  virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-  virtual void* _downcast (
-      const char* logical_type_id
-    );
-  virtual char * current_member_name (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual CORBA::TCKind current_member_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual CORBA::NameValuePairSeq * get_members (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual void set_members (
-      const CORBA::NameValuePairSeq & value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  CORBA_DynStruct *_this (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-  virtual const char* _interface_repository_id (void) const;
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef DynStruct_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
-};
-
-class  _tao_collocated_DynStruct : public virtual CORBA_DynStruct,
-    public virtual _tao_collocated_DynAny
-{
-public:
-  _tao_collocated_DynStruct (
-      DynStruct_ptr  servant,
-      TAO_Stub *stub
-    );
-  DynStruct_ptr _get_servant (void) const;
-  virtual CORBA::Boolean _is_a (
-      const char *logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-  virtual char * current_member_name (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::TCKind current_member_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::NameValuePairSeq * get_members (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void set_members (
-      const CORBA::NameValuePairSeq & value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-
-private:
-  DynStruct_ptr servant_;
-};
-
-class DynUnion;
-typedef DynUnion *DynUnion_ptr;
-class TAO_Export DynUnion : public virtual DynAny
-{
-protected:
-  DynUnion (void);
-public:
-  DynUnion (DynUnion& rhs);
-  virtual ~DynUnion (void);
-  virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-  virtual void* _downcast (
-      const char* logical_type_id
-    );
-  virtual CORBA::Boolean set_as_default (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual void set_as_default (
-      CORBA::Boolean set_as_default,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual CORBA_DynAny_ptr discriminator (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual CORBA::TCKind discriminator_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual CORBA_DynAny_ptr member (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual char * member_name (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual void member_name (
-      const char * member_name,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual CORBA::TCKind member_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  CORBA_DynUnion *_this (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-  virtual const char* _interface_repository_id (void) const;
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef DynUnion_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
-};
-
-class  _tao_collocated_DynUnion : public virtual CORBA_DynUnion,
-    public virtual _tao_collocated_DynAny
-{
-public:
-  _tao_collocated_DynUnion (
-      DynUnion_ptr  servant,
-      TAO_Stub *stub
-    );
-  DynUnion_ptr _get_servant (void) const;
-  virtual CORBA::Boolean _is_a (
-      const char *logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-  virtual CORBA::Boolean set_as_default (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void set_as_default (
-      CORBA::Boolean set_as_default,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA_DynAny_ptr discriminator (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::TCKind discriminator_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA_DynAny_ptr member (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual char * member_name (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void member_name (
-      const char * member_name,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA::TCKind member_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-
-private:
-  DynUnion_ptr servant_;
-};
-
-class DynSequence;
-typedef DynSequence *DynSequence_ptr;
-class TAO_Export DynSequence : public virtual DynAny
-{
-protected:
-  DynSequence (void);
-public:
-  DynSequence (DynSequence& rhs);
-  virtual ~DynSequence (void);
-  virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-  virtual void* _downcast (
-      const char* logical_type_id
-    );
-  virtual CORBA::ULong length (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual void length (
-      CORBA::ULong length,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual CORBA_AnySeq * get_elements (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual void set_elements (
-      const CORBA_AnySeq & value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  static void type_skel (
-      CORBA::ServerRequest &req,
-      void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-
-  CORBA_DynSequence *_this (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-  virtual const char* _interface_repository_id (void) const;
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef DynSequence_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
-};
-
-class  _tao_collocated_DynSequence : public virtual CORBA_DynSequence,
-    public virtual _tao_collocated_DynAny
-{
-public:
-  _tao_collocated_DynSequence (
-      DynSequence_ptr  servant,
-      TAO_Stub *stub
-    );
-  DynSequence_ptr _get_servant (void) const;
-  virtual CORBA::Boolean _is_a (
-      const char *logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-  virtual CORBA::ULong length (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void length (
-      CORBA::ULong length,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual CORBA_AnySeq * get_elements (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void set_elements (
-      const CORBA_AnySeq & value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-
-private:
-  DynSequence_ptr servant_;
-};
-
-class DynArray;
-typedef DynArray *DynArray_ptr;
-class TAO_Export DynArray : public virtual DynAny
-{
-protected:
-  DynArray (void);
-public:
-  DynArray (DynArray& rhs);
-  virtual ~DynArray (void);
-  virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-  virtual void* _downcast (
-      const char* logical_type_id
-    );
-  virtual CORBA_AnySeq * get_elements (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  virtual void set_elements (
-      const CORBA_AnySeq & value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     ) = 0;
-
-  CORBA_DynArray *_this (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-  virtual const char* _interface_repository_id (void) const;
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef DynArray_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
-};
-
-class  _tao_collocated_DynArray : public virtual CORBA_DynArray,
-    public virtual _tao_collocated_DynAny
-{
-public:
-  _tao_collocated_DynArray (
-      DynArray_ptr  servant,
-      TAO_Stub *stub
-    );
-  DynArray_ptr _get_servant (void) const;
-  virtual CORBA::Boolean _is_a (
-      const char *logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-    );
-  virtual CORBA_AnySeq * get_elements (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-  virtual void set_elements (
-      const CORBA_AnySeq & value,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::Environment::default_environment ()
-     );
-
-private:
-  DynArray_ptr servant_;
-};
-
-  class ConstructionPolicy;
-  typedef ConstructionPolicy *ConstructionPolicy_ptr;
-  class  ConstructionPolicy : public virtual Policy
-  {
-  protected:
-    ConstructionPolicy (void);
-
-  public:
-    ConstructionPolicy (const ConstructionPolicy& rhs);
-    virtual ~ConstructionPolicy (void);
-
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-        static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    CORBA::ConstructionPolicy *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-    virtual void make_domain_manager (
-      CORBA::InterfaceDef_ptr object_type,
-      CORBA::Boolean constr_policy,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    ) = 0;
-  static void make_domain_manager_skel (
-      CORBA::ServerRequest &_tao_req,
-      void *_tao_obj,
-      void *_tao_context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-
-  };
-
-  class  _tao_collocated_ConstructionPolicy : public virtual CORBA::ConstructionPolicy,
-      public virtual _tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_ConstructionPolicy (
-        ConstructionPolicy_ptr  servant,
-        TAO_Stub *stub
-      );
-    ConstructionPolicy_ptr _get_servant (void) const;
-        virtual void make_domain_manager (
-        CORBA::InterfaceDef_ptr object_type,
-        CORBA::Boolean constr_policy,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    ConstructionPolicy_ptr servant_;
-  };
-
-#endif /* ! defined TAO_HAS_MINIMUM_CORBA */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-};
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_IDL_POA_CORBA_H */
diff --git a/TAO/tao/Pluggable.cpp b/TAO/tao/Pluggable.cpp
deleted file mode 100644
index 973d7dfe61b..00000000000
--- a/TAO/tao/Pluggable.cpp
+++ /dev/null
@@ -1,486 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-#include "tao/Pluggable.h"
-#include "tao/Stub.h"
-#include "tao/Environment.h"
-#include "tao/GIOP.h"
-#include "tao/ORB_Core.h"
-#include "tao/Object_KeyC.h"
-#include "tao/Client_Strategy_Factory.h"
-#include "tao/Wait_Strategy.h"
-#include "tao/Transport_Mux_Strategy.h"
-#include "tao/Reply_Dispatcher.h"
-#include "tao/debug.h"
-
-#include "ace/ACE.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Pluggable.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(tao, Pluggable, "$Id$")
-
-// ****************************************************************
-
-TAO_Profile::~TAO_Profile (void)
-{
-}
-
-// Generic Profile
-CORBA::ULong
-TAO_Profile::tag (void) const
-{
-  return this->tag_;
-}
-
-CORBA::ULong
-TAO_Profile::_incr_refcnt (void)
-{
-  // OK, think I got it.  When this object is created (guard) the
-  // lock is automatically acquired (refcount_lock_).  Then when
-  // we leave this method the destructir for guard is called which
-  // releases the lock!
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->refcount_lock_, 0);
-
-  return this->refcount_++;
-}
-
-CORBA::ULong
-TAO_Profile::_decr_refcnt (void)
-{
-  {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->refcount_lock_, 0);
-    this->refcount_--;
-    if (this->refcount_ != 0)
-      return this->refcount_;
-  }
-
-  // refcount is 0, so delete us!
-  // delete will call our ~ destructor which in turn deletes stuff.
-  delete this;
-  return 0;
-}
-
-// ****************************************************************
-
-TAO_Unknown_Profile::TAO_Unknown_Profile (CORBA::ULong tag)
-  : TAO_Profile (tag)
-{
-}
-
-int
-TAO_Unknown_Profile::parse_string (const char *,
-                                   CORBA::Environment &)
-{
-  // @@ THROW something????
-  return -1;
-}
-
-CORBA::String
-TAO_Unknown_Profile::to_string (CORBA::Environment &)
-{
-  // @@ THROW something?
-  return 0;
-}
-
-int
-TAO_Unknown_Profile::decode (TAO_InputCDR& cdr)
-{
-  if ((cdr >> this->body_) == 0)
-    return -1;
-  return 0;
-}
-
-int
-TAO_Unknown_Profile::encode (TAO_OutputCDR &stream) const
-{
-  stream.write_ulong (this->tag ());
-  return (stream << this->body_);
-}
-
-const TAO_ObjectKey &
-TAO_Unknown_Profile::object_key (void) const
-{
-  // @@ TODO this is wrong, but the function is deprecated anyway....
-  static TAO_ObjectKey empty_key;
-  return empty_key;
-}
-
-TAO_ObjectKey *
-TAO_Unknown_Profile::_key (void) const
-{
-  return 0;
-}
-
-CORBA::Boolean
-TAO_Unknown_Profile::is_equivalent (const TAO_Profile* other_profile)
-{
-  if (other_profile->tag () != this->tag ())
-    return 0;
-
-  const TAO_Unknown_Profile *op =
-    ACE_dynamic_cast (const TAO_Unknown_Profile*, other_profile);
-
-  return (this->body_ == op->body_);
-}
-
-CORBA::ULong
-TAO_Unknown_Profile::hash (CORBA::ULong max,
-                           CORBA::Environment &)
-{
-  return (ACE::hash_pjw (ACE_reinterpret_cast (const char*,
-                                               this->body_.get_buffer ()),
-                         this->body_.length ()) % max);
-}
-
-int
-TAO_Unknown_Profile::addr_to_string (char * /* buffer */,
-                                     size_t /* length */)
-{
-  return 0;
-}
-
-void
-TAO_Unknown_Profile::reset_hint (void)
-{
-  // do nothing
-}
-
-// ****************************************************************
-
-// Constructor.
-TAO_Transport::TAO_Transport (CORBA::ULong tag,
-                              TAO_ORB_Core *orb_core)
-  : tag_ (tag),
-    orb_core_ (orb_core),
-    tms_ (0),
-    ws_ (0)
-{
-  // Create WS now.
-  this->ws_ = orb_core->client_factory ()->create_wait_strategy (this);
-
-  // Create TMS now.
-  this->tms_ = orb_core->client_factory ()->create_transport_mux_strategy (orb_core);
-}
-
-TAO_Transport::~TAO_Transport (void)
-{
-  delete this->ws_;
-  this->ws_ = 0;
-  delete this->tms_;
-  this->tms_ =0;
-}
-
-CORBA::ULong
-TAO_Transport::tag (void) const
-{
-  return this->tag_;
-}
-
-// Get it.
-TAO_ORB_Core *
-TAO_Transport::orb_core (void) const
-{
-  return this->orb_core_;
-}
-
-TAO_Transport_Mux_Strategy *
-TAO_Transport::tms (void) const
-{
-  return tms_;
-}
-
-// Return the Wait strategy used by the Transport.
-TAO_Wait_Strategy *
-TAO_Transport::wait_strategy (void) const
-{
-  return this->ws_;
-}
-
-// Get request id for the current invocation from the TMS object.
-CORBA::ULong
-TAO_Transport::request_id (void)
-{
-  return this->tms ()->request_id ();
-}
-
-// Bind the reply dispatcher with the TMS object.
-int
-TAO_Transport::bind_reply_dispatcher (CORBA::ULong request_id,
-                                      TAO_Reply_Dispatcher *rd)
-{
-  return this->tms_->bind_dispatcher (request_id,
-                                      rd);
-}
-
-int
-TAO_Transport::wait_for_reply (ACE_Time_Value *max_wait_time)
-{
-  return this->ws_->wait (max_wait_time);
-}
-
-// Read and handle the reply. Returns 0 when there is Short Read on
-// the connection. Returns 1 when the full reply is read and
-// handled. Returns -1 on errors.
-// If <block> is 1, then reply is read in a blocking manner.
-
-int
-TAO_Transport::handle_client_input (int /* block */,
-                                    ACE_Time_Value * /* max_wait_time */)
-{
-  ACE_NOTSUP_RETURN (-1);
-}
-
-int
-TAO_Transport::register_handler (void)
-{
-  ACE_NOTSUP_RETURN (-1);
-}
-
-int
-TAO_Transport::idle_after_send (void)
-{
-  return this->tms ()->idle_after_send (this);
-}  
-
-int
-TAO_Transport::idle_after_reply (void)
-{
-  return this->tms ()->idle_after_reply (this);
-}
-
-int
-TAO_Transport::reply_received (const CORBA::ULong request_id)
-{
-  return this->tms ()->reply_received (request_id);
-}
-
-void
-TAO_Transport::start_request (TAO_ORB_Core *,
-                              const TAO_Profile *,
-                              const char* ,
-                              CORBA::ULong ,
-                              CORBA::Boolean,
-                              TAO_OutputCDR &,
-                              CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_THROW (CORBA::INTERNAL ());
-}
-
-void
-TAO_Transport::start_locate (TAO_ORB_Core *,
-                             const TAO_Profile *,
-                             CORBA::ULong,
-                             TAO_OutputCDR &,
-                             CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_THROW (CORBA::INTERNAL ());
-}
-
-// *********************************************************************
-
-// Connector
-TAO_Connector::TAO_Connector (CORBA::ULong tag)
-  : tag_(tag)
-{
-}
-
-TAO_Connector::~TAO_Connector (void)
-{
-}
-
-CORBA::ULong
-TAO_Connector::tag (void) const
-{
-  return this->tag_;
-}
-
-int
-TAO_Connector::make_mprofile (const char *string,
-                              TAO_MProfile &mprofile,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  // This method utilizes the "Template Method" design pattern to
-  // parse the given URL style IOR for the protocol being used
-  // and create an mprofile from it.
-  //
-  // The methods that must be defined by all Connector sub-classes are:
-  //      make_profile
-  //      check_prefix
-
-  // Check for a valid string
-  if (!string || !*string)
-    {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (
-        CORBA_SystemException::_tao_minor_code (
-          TAO_NULL_POINTER_MINOR_CODE,
-          0),
-        CORBA::COMPLETED_NO),
-        -1);
-    }
-
-  // Check for the proper prefix in the IOR.  If the proper prefix isn't
-  // in the IOR then it is not an IOR we can use.
-  if (this->check_prefix (string) != 0)
-    {
-      return 1;
-      // Failure: not the correct IOR for this protocol.
-      // DO NOT throw an exception here since the Connector_Registry
-      // should be allowed the opportunity to continue looking for
-      // an appropriate connector.
-    }
-
-  if (TAO_debug_level > 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - TAO_Connector::make_mprofile <%s>\n",
-                  string));
-    }
-
-  ACE_CString ior;
-
-  ior.set (string, ACE_OS::strlen (string), 1);
-
-  // Find out where the protocol ends
-  int ior_index = ior.find ("://");
-
-  if (ior_index == ACE_CString::npos)
-    {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (), -1);
-      // No colon ':' in the IOR!
-    }
-  else
-    {
-      ior_index += 3;
-      // Add the length of the colon and the two forward slashes `://'
-      // to the IOR string index (i.e. 3)
-    }
-
-  const int objkey_index =
-    ior.find (this->object_key_delimiter (), ior_index) + ior_index;
-  // Find the object key
-
-  if (objkey_index == 0 || objkey_index == ACE_CString::npos)
-    {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (), -1);
-      // Failure: No endpoints specified or no object key specified.
-    }
-
-  const char endpoint_delimiter = ',';
-  // The delimiter used to seperate inidividual addresses.
-
-  // Count the number of endpoints in the IOR.  This will be the number
-  // of entries in the MProfile.
-
-  CORBA::ULong profile_count = 1;
-  // Number of endpoints in the IOR  (initialized to 1).
-
-  // Only check for endpoints after the protocol specification and
-  // before the object key.
-  for (int i = ior_index; i < objkey_index; ++i)
-    {
-      if (ior[i] == endpoint_delimiter)
-        profile_count++;
-    }
-
-  // Tell the MProfile object how many Profiles it should hold.
-  // MProfile::set(size) returns the number profiles it can hold.
-  if (mprofile.set (profile_count) != ACE_static_cast (int, profile_count))
-    {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (
-        CORBA_SystemException::_tao_minor_code (
-          TAO_MPROFILE_CREATION_ERROR,
-          0),
-        CORBA::COMPLETED_NO),
-      -1);
-      // Error while setting the MProfile size!
-    }
-
-  // The idea behind the following loop is to split the IOR into several
-  // strings that can be parsed by each profile.
-  // For example,
-  //    `1.3@moo,shu,1.1@chicken/arf'
-  // will be parsed into:
-  //    `1.3@moo/arf'
-  //    `shu/arf'
-  //    `1.1@chicken/arf'
-
-  int begin = 0;
-  int end = ior_index - 1;
-  // Initialize the end of the endpoint index
-
-  for (CORBA::ULong j = 0; j < profile_count; ++j)
-    {
-      begin += end + 1;
-
-      if (j < profile_count - 1)
-        end = ior.find (endpoint_delimiter, begin);
-      else
-        end = objkey_index - begin;  // Handle last endpoint differently
-
-      if (end < ACE_static_cast (int, ior.length ()) && end != ior.npos)
-        {
-          ACE_CString endpoint = ior.substring (begin, end);
-          endpoint += ior.substring (objkey_index);
-          // Add the object key to the string.
-
-          // The endpoint should now be of the form:
-          //    `N.n@endpoint/object_key'
-          // or
-          //    `endpoint/object_key'
-
-          TAO_Profile *profile = 0;
-          // Must initialize since pointer is passed as a reference!
-
-          this->make_profile (endpoint.c_str (),
-                              profile,
-                              ACE_TRY_ENV);
-
-          ACE_CHECK_RETURN (-1);
-          // Failure:  Problem during profile creation
-
-          // Create a Profile using the individual endpoint string
-
-          // Give up ownership of the profile.
-          if (mprofile.give_profile (profile) == -1)
-            {
-              ACE_THROW_RETURN (CORBA::INV_OBJREF (
-                CORBA_SystemException::_tao_minor_code (
-                  TAO_MPROFILE_CREATION_ERROR,
-                  0),
-                CORBA::COMPLETED_NO),
-              -1);
-              // Failure presumably only occurs when MProfile is full!
-              // This should never happen.
-            }
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA::INV_OBJREF (), -1);
-          // Unable to seperate endpoints
-        }
-    }
-
-  return 0;  // Success
-}
-
-// ****************************************************************
-
-// Acceptor
-TAO_Acceptor::TAO_Acceptor (CORBA::ULong tag)
-  :  tag_ (tag)
-{
-}
-
-TAO_Acceptor::~TAO_Acceptor (void)
-{
-}
-
-CORBA::ULong
-TAO_Acceptor::tag (void) const
-{
-  return this->tag_;
-}
diff --git a/TAO/tao/Pluggable.h b/TAO/tao/Pluggable.h
deleted file mode 100644
index 7657e6360ae..00000000000
--- a/TAO/tao/Pluggable.h
+++ /dev/null
@@ -1,474 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     Pluggable.h
-//
-// = DESCRIPTION
-//     Interface for the TAO pluggable protocol framework.
-//
-// = AUTHOR
-//     Fred Kuhns <fredk@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_PLUGGABLE_H
-#define TAO_PLUGGABLE_H
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Sequence.h"
-#include "tao/Typecode.h"
-
-// Forward declarations.
-class ACE_Addr;
-class ACE_Reactor;
-class TAO_ORB_Core;
-
-class TAO_Stub;
-class TAO_Profile;
-class TAO_MProfile;
-class TAO_Resource_Factory;
-
-class TAO_Reply_Dispatcher;
-class TAO_Transport_Mux_Strategy;
-class TAO_Wait_Strategy;
-
-class TAO_Export TAO_Transport
-{
-  // = TITLE
-  //   Generic definitions for the new Transport class.
-  //
-  // = DESCRIPTION
-  //   The transport object is created in the Service handler
-  //   constructor and deleted in the service handlers destructor!!
-
-public:
-  TAO_Transport (CORBA::ULong tag,
-                 TAO_ORB_Core *orb_core);
-  // default creator, requres the tag value be supplied.
-
-  virtual ~TAO_Transport (void);
-  // destructor
-
-  CORBA::ULong tag (void) const;
-  // The tag, each concrete class will have a specific tag value.
-
-  virtual void close_connection() = 0;
-  // Call the corresponding connection handler's <close>
-  // method.
-
-  virtual int idle (void) = 0;
-  // Idles the corresponding connection handler.
-
-  virtual ACE_HANDLE handle (void) = 0;
-  // This method provides a way to gain access to the underlying
-  // file handle used by the reactor.
-
-  virtual ssize_t send (const ACE_Message_Block *mblk,
-                        ACE_Time_Value *s = 0) = 0;
-  // Write the complete Message_Block chain to the connection.
-  // @@ The ACE_Time_Value *s is just a place holder for now.  It is
-  // not clear this this is the best place to specify this.  The actual
-  // timeout values will be kept in the Policies.
-
-  virtual ssize_t send (const u_char *buf,
-                        size_t len,
-                        ACE_Time_Value *s = 0) = 0;
-  // Write the contents of the buffer of length len to the connection.
-  // @@ The ACE_Time_Value *s is just a place holder for now.  It is
-  // not clear this this is the best place to specify this.  The actual
-  // timeout values will be kept in the Policies.
-
-  virtual ssize_t send (const iovec *iov,
-                        int iovcnt,
-                        ACE_Time_Value *s = 0) = 0;
-  // Write the contents of iovcnt iovec's to the connection.
-  // @@ The ACE_Time_Value *s is just a place holder for now.  It is
-  // not clear this this is the best place to specify this.  The actual
-  // timeout values will be kept in the Policies.
-
-  virtual ssize_t recv (char *buf,
-                        size_t len,
-                        ACE_Time_Value *s = 0) = 0;
-  // Read len bytes from into buf.
-  // @@ The ACE_Time_Value *s is just a place holder for now.  It is
-  // not clear this this is the best place to specify this.  The actual
-  // timeout values will be kept in the Policies.
-
-  virtual ssize_t recv (char *buf,
-                        size_t len,
-                        int flags,
-                        ACE_Time_Value *s = 0) = 0;
-  // Read len bytes from into buf using flags.
-  // @@ The ACE_Time_Value *s is just a place holder for now.  It is
-  // not clear this this is the best place to specify this.  The actual
-  // timeout values will be kept in the Policies.
-
-  virtual ssize_t recv (iovec *iov,
-                        int iovcnt,
-                        ACE_Time_Value *s = 0) = 0;
-  //  Read received data into the iovec buffers.
-  // @@ The ACE_Time_Value *s is just a place holder for now.  It is
-  // not clear this this is the best place to specify this.  The actual
-  // timeout values will be kept in the Policies.
-
-  virtual void start_request (TAO_ORB_Core *orb_core,
-                              const TAO_Profile *profile,
-                              const char* opname,
-                              CORBA::ULong request_id,
-                              CORBA::Boolean is_twoway,
-                              TAO_OutputCDR &output,
-                              CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Fill into <output> the right headers to make a request.
-
-  virtual void start_locate (TAO_ORB_Core *orb_core,
-                             const TAO_Profile *profile,
-                             CORBA::ULong request_id,
-                             TAO_OutputCDR &output,
-                             CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Fill into <output> the right headers to make a locate request.
-
-  virtual int send_request (TAO_ORB_Core *orb_core,
-                            TAO_OutputCDR &stream,
-                            int twoway,
-                            ACE_Time_Value *max_time_wait) = 0;
-  // Default action to be taken for send request.
-
-  // = Get and set methods for the ORB Core.
-
-  // void orb_core (TAO_ORB_Core *orb_core);
-  // Set it.
-
-  TAO_ORB_Core *orb_core (void) const;
-  // Get it.
-
-  // = Get and set methods for thr TMS object.
-
-  // void tms(TAO_Transport_Mux_Strategy *rms);
-  // Set the TMSobject.
-
-  TAO_Transport_Mux_Strategy *tms (void) const;
-  // Get the TMS used by this Transport object.
-
-  TAO_Wait_Strategy *wait_strategy (void) const;
-  // Return the Wait strategy used by the Transport.
-
-  CORBA::ULong request_id (void);
-  // Get request id for the current invocation from the TMSobject.
-
-  int bind_reply_dispatcher (CORBA::ULong request_id,
-                             TAO_Reply_Dispatcher *rd);
-  // Bind the reply dispatcher with the TMS object.
-
-  virtual int wait_for_reply (ACE_Time_Value *max_wait_time);
-  // Wait for the reply depending on the strategy.
-
-  virtual int handle_client_input (int block = 0,
-                                   ACE_Time_Value *max_wait_time = 0);
-  // Read and handle the reply. Returns 0 when there is Short Read on
-  // the connection. Returns 1 when the full reply is read and
-  // handled. Returns -1 on errors.
-  // If <block> is 1, then reply is read in a blocking manner.
-
-  virtual int register_handler (void);
-  // Register the handler with the reactor. Will be called by the Wait
-  // Strategy if Reactor is used  for that strategy. Default
-  // implementation out here returns -1 setting <errno> to ENOTSUP.
-
-  // = Setting the Transport object in Idle state. Theese methods are
-  //   routed the TMS object. The TMS starategies implement the
-  //   methods accordingly.
-
-  virtual int idle_after_send (void);
-  // Request has been just sent, but the reply is not received. Idle
-  // the transport now.
-
-  virtual int idle_after_reply (void);
-  // Request is sent and the reply is received. Idle the transport
-  // now.
-
-  virtual int reply_received (const CORBA::ULong request_id);
-  // Check with the TMS whether the reply has been receieved for the
-  // request with <request_id>.
-
-protected:
-  CORBA::ULong tag_;
-  // IOP protocol tag.
-
-  TAO_ORB_Core *orb_core_;
-  // Global orbcore resource.
-
-  TAO_Transport_Mux_Strategy *tms_;
-  // Strategy to decide whether multiple requests can be sent over the
-  // same connection or the connection is exclusive for a request.
-
-  TAO_Wait_Strategy *ws_;
-  // Strategy for waiting for the reply after sending the request.
-};
-
-class TAO_Export TAO_Profile
-{
-  // = TITLE
-  //   Defines the Profile interface
-  //
-  // = DESCRIPTION
-  //   An abstract base class for representing object address or location
-  //   information.  This is based on the CORBA IOR definitions.
-  //
-public:
-  TAO_Profile (CORBA::ULong tag);
-  // Constructor
-
-  virtual ~TAO_Profile (void);
-  // If you have a virtual method you need a virtual dtor.
-
-  CORBA::ULong tag (void) const;
-  // The tag, each concrete class will have a specific tag value.
-
-  CORBA::ULong _incr_refcnt (void);
-  // Increase the reference count by one on this object.
-
-  CORBA::ULong _decr_refcnt (void);
-  // Decrement the object's reference count.  When this count goes to
-  // 0 this object will be deleted.
-
-  void forward_to (TAO_MProfile *mprofiles);
-  // Keep a pointer to the forwarded profile
-
-  TAO_MProfile* forward_to (void);
-  // MProfile accessor
-
-  virtual int parse_string (const char *string,
-                            CORBA::Environment &ACE_TRY_ENV) = 0;
-  // Initialize this object using the given input string.
-  // Supports URL stylr of object references
-
-  virtual CORBA::String to_string (CORBA::Environment &ACE_TRY_ENV) = 0;
-  // Return a string representation for this profile.  client must
-  // deallocate memory.
-
-  virtual int decode (TAO_InputCDR& cdr) = 0;
-  // Initialize this object using the given CDR octet string.
-
-  virtual int encode (TAO_OutputCDR &stream) const = 0;
-  // Encode this profile in a stream, i.e. marshal it.
-
-  virtual const TAO_ObjectKey &object_key (void) const = 0;
-  // @@ deprecated. return a reference to the Object Key.
-
-  TAO_ObjectKey &object_key (TAO_ObjectKey& objkey);
-  // @@ deprecated. set the Object Key.
-
-  virtual TAO_ObjectKey *_key (void) const = 0;
-  // Obtain the object key, return 0 if the profile cannot be parsed.
-  // The memory is owned by the caller!
-
-  virtual CORBA::Boolean is_equivalent (const TAO_Profile* other_profile) = 0;
-  // Return true if this profile is equivalent to other_profile.  Two
-  // profiles are equivalent iff their key, port, host, object_key and
-  // version are the same.
-
-  virtual CORBA::ULong hash (CORBA::ULong max,
-                             CORBA::Environment &ACE_TRY_ENV) = 0;
-  // Return a hash value for this object.
-
-  virtual int addr_to_string(char *buffer, size_t length) = 0;
-  // Return a string representation for the address.  Returns
-  // -1 if buffer is too small.  The purpose of this method is to
-  // provide a general interface to the underlying address object's
-  // addr_to_string method.  This allowsthe protocol implementor to
-  // select the appropriate string format.
-
-  virtual void reset_hint (void) = 0;
-  // This method is used with a connection has been reset requiring
-  // the hint to be cleaned up and reset to NULL.
-
-private:
-  TAO_MProfile *forward_to_i (void);
-  // this object keeps ownership of this object
-
-private:
-  CORBA::ULong tag_;
-  // IOP protocol tag.
-
-  TAO_MProfile* forward_to_;
-  // the TAO_MProfile which contains the profiles for the forwarded
-  // object.
-
-  ACE_SYNCH_MUTEX refcount_lock_;
-  // Mutex to protect reference count.
-
-  CORBA::ULong refcount_;
-  // Number of outstanding references to this object.
-};
-
-class TAO_Export TAO_Unknown_Profile : public TAO_Profile
-{
-  // = TITLE
-  //   A TAO_Profile class to handle foreign profiles.
-  //
-  // = DESCRIPTION
-  //   The CORBA spec implies that ORBs must be prepared to save and
-  //   pass around profiles for protocols it does not recognize. It is
-  //   not mandatory to *use* those profiles but they shouldn't be
-  //   dropped.
-  //   This class stores the information required to marshal and
-  //   demarshal an unknown profile, but simply returns an error if
-  //   any of the TAO internal methods are invoked.
-  //
-public:
-  TAO_Unknown_Profile (CORBA::ULong tag);
-  // Create the profile
-
-  // = The TAO_Profile methods look above
-  virtual int parse_string (const char *string,
-                            CORBA::Environment &ACE_TRY_ENV);
-  virtual CORBA::String to_string (CORBA::Environment &ACE_TRY_ENV);
-  virtual int decode (TAO_InputCDR& cdr);
-  virtual int encode (TAO_OutputCDR &stream) const;
-  virtual const TAO_ObjectKey &object_key (void) const;
-  virtual TAO_ObjectKey *_key (void) const;
-  virtual CORBA::Boolean is_equivalent (const TAO_Profile* other_profile);
-  virtual CORBA::ULong hash (CORBA::ULong max,
-                             CORBA::Environment &ACE_TRY_ENV);
-  virtual int addr_to_string(char *buffer, size_t length);
-  virtual void reset_hint (void);
-
-private:
-  TAO_opaque body_;
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_Acceptor
-{
-  // = TITLE
-  //   Abstract Acceptor class used for pluggable protocols.
-  //
-  // = DESCRIPTION
-  //   Base class for the Acceptor bridge calss.
-public:
-
-  TAO_Acceptor (CORBA::ULong tag);
-
-  virtual int create_mprofile (const TAO_ObjectKey &object_key,
-                               TAO_MProfile &mprofile) = 0;
-  // Create the corresponding profile for this endpoint.
-
-  virtual int open (TAO_ORB_Core *orb_core,
-                    int version_major,
-                    int version_minor,
-                    ACE_CString &address) = 0;
-  // method to initialize acceptor for address.
-
-  virtual int open_default (TAO_ORB_Core *orb_core) = 0;
-  // Open an acceptor on the default endpoint for this protocol
-
-  virtual ACE_Event_Handler *acceptor (void) = 0;
-  // Return the ACE acceptor...
-
-  virtual int is_collocated (const TAO_Profile* profile) = 0;
-  // Return 1 if the <profile> has the same endpoint as the acceptor.
-
-  CORBA::ULong tag (void) const;
-  // The tag, each concrete class will have a specific tag value.
-
-  virtual int close (void) = 0;
-  // Closes the acceptor
-
-  virtual CORBA::ULong endpoint_count (void) = 0;
-  // returns the number of endpoints this acceptor is listening on.  This
-  // is used for determining how many profiles will be generated
-  // for this acceptor.
-
-  virtual ~TAO_Acceptor (void);
-  // Destructor
-
-private:
-  CORBA::ULong tag_;
-  // IOP protocol tag.
-};
-
-class TAO_Export TAO_Connector
-{
-  // = TITLE
-  //   Generic Connector interface definitions.
-  //
-  // = DESCRIPTION
-  //   Base class for connector bridge object.
-public:
-
-  TAO_Connector (CORBA::ULong tag);
-  // default constructor.
-
-  virtual ~TAO_Connector (void);
-  // the destructor.
-
-  CORBA::ULong tag (void) const;
-  // The tag identifying the specific ORB transport layer protocol.
-  // For example TAO_IOP_TAG_INTERNET_IOP = 0.  The tag is used in the
-  // IOR to identify the type of profile included. IOR -> {{tag0,
-  // profile0} {tag1, profole1} ...}  GIOP.h defines typedef
-  // CORBA::ULong TAO_IOP_Profile_ID;
-
-  int make_mprofile (const char *ior,
-                     TAO_MProfile &mprofile,
-                     CORBA::Environment &ACE_TRY_ENV);
-  // Parse a string containing a URL style IOR and return an
-  // MProfile.
-
-  virtual int open (TAO_ORB_Core *orb_core) = 0;
-  //  Initialize object and register with reactor.
-
-  virtual int close (void) = 0;
-  // Shutdown Connector bridge and concreate Connector.
-
-  virtual int connect (TAO_Profile *profile,
-                       TAO_Transport *&,
-                       ACE_Time_Value *max_wait_time) = 0;
-  // To support pluggable we need to abstract away the connect()
-  // method so it can be called from the GIOP code independant of the
-  // actual transport protocol in use.
-
-  virtual int preconnect (const char *preconnections) = 0;
-  // Initial set of connections to be established.
-
-  virtual TAO_Profile *create_profile (TAO_InputCDR& cdr) = 0;
-  // Create a profile for this protocol and initialize it based on the
-  // encapsulation in <cdr>
-
-  virtual int check_prefix (const char *endpoint) = 0;
-  // Check that the prefix of the provided endpoint is valid for use
-  // with a given pluggable protocol.
-
-  virtual char object_key_delimiter (void) const = 0;
-  // Return the object key delimiter to use or expect.
-
-protected:
-  virtual void make_profile (const char *endpoint,
-                             TAO_Profile *&,
-                             CORBA::Environment &ACE_TRY_ENV) = 0;
-  // Create a profile with a given endpoint.
-
-private:
-  CORBA::ULong tag_;
-  // IOP protocol tag.
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Pluggable.i"
-#endif /* __ACE_INLINE__ */
-
-#endif  /* TAO_PLUGGABLE_H */
diff --git a/TAO/tao/Pluggable.i b/TAO/tao/Pluggable.i
deleted file mode 100644
index 934cf4e062d..00000000000
--- a/TAO/tao/Pluggable.i
+++ /dev/null
@@ -1,30 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_Profile::TAO_Profile (CORBA::ULong tag)
-  :  tag_ (tag),
-     forward_to_ (0),
-     refcount_ (1)
-{
-}
-
-ACE_INLINE void
-TAO_Profile::forward_to (TAO_MProfile *mprofiles)
-{
-  this->forward_to_ = mprofiles;
-}
-
-ACE_INLINE TAO_MProfile *
-TAO_Profile::forward_to (void)
-{
-  return this->forward_to_;
-}
-
-ACE_INLINE TAO_MProfile *
-TAO_Profile::forward_to_i (void)
-{
-  return this->forward_to_;
-}
diff --git a/TAO/tao/Policy.pidl b/TAO/tao/Policy.pidl
deleted file mode 100644
index a4a74195199..00000000000
--- a/TAO/tao/Policy.pidl
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   Policy.pidl
-//
-// = DESCRIPTION
-//   This file was used to generate the code in Policy{C,S,S_T}.{h,i,cpp}
-//   The code is then hand-crafted to compile it inside the ORB, avoid
-//   cyclic dependencies and enforce the locality constraints on
-//   certain objects.
-//
-// ================================================================
-
-#ifndef TAO_CORBA_POLICY_IDL
-#define TAO_CORBA_POLICY_IDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  typedef short PolicyErrorCode;
-  const PolicyErrorCode BAD_POLICY               = 0;
-  const PolicyErrorCode UNSUPPORTED_POLICY       = 1;
-  const PolicyErrorCode BAD_POLICY_TYPE          = 2;
-  const PolicyErrorCode BAD_POLICY_VALUE         = 3;
-  const PolicyErrorCode UNSUPPORTED_POLICY_VALUE = 4;
-
-  exception PolicyError
-  {
-    PolicyErrorCode reason;
-  };
-
-  exception InvalidPolicies
-  {
-    sequence<unsigned short> indices;
-  };
-
-  typedef unsigned long PolicyType;
-  interface Policy
-  {
-    readonly attribute PolicyType policy_type;
-    Policy copy ();
-    void destroy ();
-  };
-
-  typedef sequence<Policy> PolicyList;
-
-  typedef sequence<PolicyType> PolicyTypeSeq;
-
-  enum SetOverrideType
-  {
-    SET_OVERRIDE,
-    ADD_OVERRIDE
-  };
-
-  interface PolicyManager
-  {
-    PolicyList get_policy_overrides (in PolicyTypeSeq ts);
-    void set_policy_overrides (
-             in PolicyList policies,
-             in SetOverrideType set_add)
-        raises (InvalidPolicies);
-  };
-
-  interface Current
-  {
-  };
-
-  interface PolicyCurrent : PolicyManager, Current
-  {
-  };
-
-};
-
-#pragma prefix ""
-
-#endif /* TAO_CORBA_POLICY_IDL */
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp
deleted file mode 100644
index b41282d2744..00000000000
--- a/TAO/tao/PolicyC.cpp
+++ /dev/null
@@ -1,996 +0,0 @@
-// $Id$
-
-/* -*- C++ -*- */
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "tao/PolicyC.h"
-#include "tao/Stub.h"
-#include "tao/Servant_Base.h"
-#include "tao/POA_CORBA.h"
-#include "tao/Invocation.h"
-
-#if !defined (__ACE_INLINE__)
-#include "PolicyC.i"
-#endif /* !defined INLINE */
-
-ACE_RCSID(tao, PolicyC, "$Id$")
-
-// ****************************************************************
-
-TAO_NAMESPACE_TYPE (const CORBA::PolicyErrorCode)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::PolicyErrorCode, BAD_POLICY, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::PolicyErrorCode)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::PolicyErrorCode, UNSUPPORTED_POLICY, 1)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::PolicyErrorCode)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::PolicyErrorCode, BAD_POLICY_TYPE, 2)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::PolicyErrorCode)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::PolicyErrorCode, BAD_POLICY_VALUE, 3)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::PolicyErrorCode)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::PolicyErrorCode, UNSUPPORTED_POLICY_VALUE, 4)
-TAO_NAMESPACE_END
-
-// ****************************************************************
-
-// default constructor
-CORBA_PolicyError::CORBA_PolicyError (void)
-  : CORBA_UserException (CORBA::_tc_PolicyError)
-{
-}
-
-// destructor - all members are of self managing types
-CORBA_PolicyError::~CORBA_PolicyError (void)
-{
-}
-
-// copy constructor
-CORBA_PolicyError::CORBA_PolicyError (const CORBA_PolicyError &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-    this->reason = _tao_excp.reason;
-}
-
-// assignment operator
-CORBA_PolicyError&
-CORBA_PolicyError::operator= (const CORBA_PolicyError &_tao_excp)
-{
-
-  this->CORBA_UserException::operator= (_tao_excp);
-  this->reason = _tao_excp.reason;
-  return *this;
-}
-
-// narrow
-CORBA_PolicyError_ptr
-CORBA_PolicyError::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PolicyError:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (CORBA_PolicyError_ptr, exc);
-  else
-    return 0;
-}
-
-void CORBA_PolicyError::_raise ()
-{
-  TAO_RAISE(*this);
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *CORBA_PolicyError::_alloc (void)
-{
-  return new CORBA_PolicyError;
-}
-
-CORBA_PolicyError::CORBA_PolicyError(
-  CORBA::PolicyErrorCode _tao_reason)
-
-  : CORBA_UserException  (CORBA::TypeCode::_duplicate (CORBA::_tc_PolicyError))
-{
-    this->reason = _tao_reason;
-}
-
-// ****************************************************************
-
-// default constructor
-CORBA_InvalidPolicies::CORBA_InvalidPolicies (void)
-  : CORBA_UserException (CORBA::_tc_InvalidPolicies)
-{
-}
-
-// destructor - all members are of self managing types
-CORBA_InvalidPolicies::~CORBA_InvalidPolicies (void)
-{
-}
-
-// copy constructor
-CORBA_InvalidPolicies::CORBA_InvalidPolicies (const CORBA_InvalidPolicies &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-    this->indices = _tao_excp.indices;
-}
-
-// assignment operator
-CORBA_InvalidPolicies&
-CORBA_InvalidPolicies::operator= (const CORBA_InvalidPolicies &_tao_excp)
-{
-
-  this->CORBA_UserException::operator= (_tao_excp);
-  this->indices = _tao_excp.indices;
-  return *this;
-}
-
-// narrow
-CORBA_InvalidPolicies_ptr
-CORBA_InvalidPolicies::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/InvalidPolicies:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (CORBA_InvalidPolicies_ptr, exc);
-  else
-    return 0;
-}
-
-void CORBA_InvalidPolicies::_raise ()
-{
-  TAO_RAISE(*this);
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *CORBA_InvalidPolicies::_alloc (void)
-{
-  return new CORBA_InvalidPolicies;
-}
-
-CORBA_InvalidPolicies::CORBA_InvalidPolicies(
-  const CORBA_InvalidPolicies::_tao_seq_UShort & _tao_indices)
-
-  : CORBA_UserException  (CORBA::TypeCode::_duplicate (CORBA::_tc_InvalidPolicies))
-{
-    this->indices = _tao_indices;
-}
-
-// ****************************************************************
-
-CORBA_Policy_ptr CORBA_Policy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA_Policy::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Policy:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_Policy::_nil ());
-  if (is_a == 0)
-    return CORBA_Policy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/Policy:1.0");
-  if (servant == 0)
-#if defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    ACE_THROW_RETURN (CORBA::MARSHAL (), CORBA::Policy::_nil ());
-#else
-    return new CORBA_Policy(stub);
-#endif /* TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-  return new POA_CORBA::_tao_collocated_Policy(
-      ACE_reinterpret_cast(POA_CORBA::Policy_ptr, servant),
-      stub
-    );
-}
-
-CORBA_Policy_ptr CORBA_Policy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA_Policy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/Policy:1.0");
-  if (servant == 0)
-#if defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    ACE_THROW_RETURN (CORBA::MARSHAL (), CORBA::Policy::_nil ());
-#else
-    return new CORBA_Policy(stub);
-#endif /* TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-  return new POA_CORBA::_tao_collocated_Policy(
-      ACE_reinterpret_cast(POA_CORBA::Policy_ptr, servant),
-      stub
-    );
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-CORBA::PolicyType CORBA_Policy::policy_type (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    CORBA::PolicyType _tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""policy_type",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA_Policy_ptr CORBA_Policy::copy (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    CORBA_Policy_ptr _tao_retval = CORBA_Policy::_nil ();
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "copy",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA_Policy::destroy (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "destroy",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-        ACE_CHECK;
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-
-  }
-
-}
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-CORBA::Boolean CORBA_Policy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
-}
-
-const char* CORBA_Policy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/Policy:1.0";
-}
-
-CORBA_Policy_ptr
-CORBA_Policy::_duplicate (CORBA_Policy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-CORBA_Policy_ptr
-CORBA_Policy::_nil (void)
-{
-  return (CORBA_Policy_ptr)0;
-}
-
-// *************************************************************
-// CORBA_PolicyList
-// *************************************************************
-
-CORBA_PolicyList::CORBA_PolicyList (void)
-{}
-CORBA_PolicyList::CORBA_PolicyList (CORBA::ULong max) // uses max size
-  : TAO_Unbounded_Object_Sequence<CORBA_Policy,CORBA_Policy_var> (max)
-{}
-CORBA_PolicyList::CORBA_PolicyList (CORBA::ULong max, CORBA::ULong length, CORBA_Policy_ptr *buffer, CORBA::Boolean release)
-  : TAO_Unbounded_Object_Sequence<CORBA_Policy,CORBA_Policy_var> (max, length, buffer, release)
-{}
-CORBA_PolicyList::CORBA_PolicyList (const CORBA_PolicyList &seq) // copy ctor
-  : TAO_Unbounded_Object_Sequence<CORBA_Policy,CORBA_Policy_var> (seq)
-{}
-CORBA_PolicyList::~CORBA_PolicyList (void) // dtor
-{}
-
-// *************************************************************
-// CORBA_PolicyTypeSeq
-// *************************************************************
-
-CORBA_PolicyTypeSeq::CORBA_PolicyTypeSeq (void)
-{}
-CORBA_PolicyTypeSeq::CORBA_PolicyTypeSeq (CORBA::ULong max) // uses max size
-  : TAO_Unbounded_Sequence<CORBA::ULong>
- (max)
-{}
-CORBA_PolicyTypeSeq::CORBA_PolicyTypeSeq (CORBA::ULong max, CORBA::ULong length, CORBA::ULong *buffer, CORBA::Boolean release)
-  : TAO_Unbounded_Sequence<CORBA::ULong> (max, length, buffer, release)
-{}
-CORBA_PolicyTypeSeq::CORBA_PolicyTypeSeq (const CORBA_PolicyTypeSeq &seq)
-  : TAO_Unbounded_Sequence<CORBA::ULong> (seq)
-{}
-CORBA_PolicyTypeSeq::~CORBA_PolicyTypeSeq (void)
-{}
-
-// ****************************************************************
-
-CORBA::PolicyManager_ptr CORBA_PolicyManager::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA_PolicyManager::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/PolicyManager:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_PolicyManager::_nil ());
-  if (is_a == 0)
-    return CORBA_PolicyManager::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/PolicyManager:1.0");
-  if (servant == 0)
-    return new CORBA_PolicyManager(stub);
-  return new POA_CORBA::_tao_collocated_PolicyManager(
-      ACE_reinterpret_cast(POA_CORBA::PolicyManager_ptr, servant),
-      stub
-    );
-}
-
-CORBA_PolicyManager_ptr CORBA_PolicyManager::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA_PolicyManager::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/PolicyManager:1.0");
-  if (servant == 0)
-    return new CORBA_PolicyManager(stub);
-  return new POA_CORBA::_tao_collocated_PolicyManager(
-      ACE_reinterpret_cast(POA_CORBA::PolicyManager_ptr, servant),
-      stub
-    );
-}
-
-CORBA_PolicyList * CORBA_PolicyManager::get_policy_overrides (
-    const CORBA_PolicyTypeSeq & ts,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  CORBA_PolicyList* _tao_retval = 0;
-  ACE_UNUSED_ARG (_tao_retval);
-  ACE_UNUSED_ARG (ts);
-  ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-}
-
-void CORBA_PolicyManager::set_policy_overrides (
-    const CORBA_PolicyList & policies,
-    CORBA::SetOverrideType set_add,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  ACE_UNUSED_ARG (policies);
-  ACE_UNUSED_ARG (set_add);
-
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-CORBA::Boolean CORBA_PolicyManager::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PolicyManager:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
-}
-
-const char* CORBA_PolicyManager::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/PolicyManager:1.0";
-}
-
-// ****************************************************************
-
-
-CORBA_PolicyCurrent_ptr CORBA_PolicyCurrent::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA_PolicyCurrent::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/PolicyCurrent:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_PolicyCurrent::_nil ());
-  if (is_a == 0)
-    return CORBA_PolicyCurrent::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/PolicyCurrent:1.0");
-  if (servant == 0)
-    return new CORBA_PolicyCurrent(stub);
-  return new POA_CORBA::_tao_collocated_PolicyCurrent(
-      ACE_reinterpret_cast(POA_CORBA::PolicyCurrent_ptr, servant),
-      stub
-    );
-}
-
-CORBA_PolicyCurrent_ptr CORBA_PolicyCurrent::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA_PolicyCurrent::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/PolicyCurrent:1.0");
-  if (servant == 0)
-    return new CORBA_PolicyCurrent(stub);
-  return new POA_CORBA::_tao_collocated_PolicyCurrent(
-      ACE_reinterpret_cast(POA_CORBA::PolicyCurrent_ptr, servant),
-      stub
-    );
-}
-
-CORBA::Boolean CORBA_PolicyCurrent::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PolicyCurrent:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PolicyManager:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Current:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
-}
-
-const char* CORBA_PolicyCurrent::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/PolicyCurrent:1.0";
-}
-
-// ****************************************************************
-
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA_PolicyError &_tao_elem) // copying
-{
-  CORBA_PolicyError *_tao_any_val = new CORBA_PolicyError (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_PolicyError, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA_PolicyError *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_PolicyError, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_PolicyError *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_PolicyError, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA_PolicyError *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA_PolicyError, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_PolicyError, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_PolicyError, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA_InvalidPolicies &_tao_elem) // copying
-{
-  CORBA_InvalidPolicies *_tao_any_val = new CORBA_InvalidPolicies (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_InvalidPolicies, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA_InvalidPolicies *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_InvalidPolicies, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_InvalidPolicies *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_InvalidPolicies, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA_InvalidPolicies *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA_InvalidPolicies, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_InvalidPolicies, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_InvalidPolicies, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA_Policy_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = CORBA_Policy::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_Policy, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_Policy_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA_Policy::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_Policy, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (CORBA::_tc_Policy, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA_Policy::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_Policy, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-// ****************************************************************
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA_PolicyList &_tao_elem
-  ) // copying
-{
-  CORBA_PolicyList *_tao_any_val;
-  ACE_NEW (_tao_any_val, CORBA_PolicyList (_tao_elem));
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_PolicyList, _tao_any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA_PolicyList *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_PolicyList, _tao_elem, 0, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_PolicyList *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_PolicyList, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA_PolicyList *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA_PolicyList, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_PolicyList, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_PolicyList, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA_PolicyTypeSeq &_tao_elem
-  ) // copying
-{
-  CORBA_PolicyTypeSeq *_tao_any_val;
-  ACE_NEW (_tao_any_val, CORBA_PolicyTypeSeq (_tao_elem));
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_PolicyTypeSeq, _tao_any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA_PolicyTypeSeq *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_PolicyTypeSeq, _tao_elem, 0, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_PolicyTypeSeq *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_PolicyTypeSeq, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA_PolicyTypeSeq *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA_PolicyTypeSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_PolicyTypeSeq, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_PolicyTypeSeq, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::SetOverrideType _tao_elem)
-{
-  CORBA::SetOverrideType *_any_val;
-  ACE_NEW (_any_val, CORBA::SetOverrideType (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_SetOverrideType, _any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    // free allocated storage
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::SetOverrideType &_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_SetOverrideType, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    if (stream.decode (CORBA::_tc_SetOverrideType, &_tao_elem, 0, ACE_TRY_ENV)
-      == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      return 1;
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-// ****************************************************************
-
-CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA_Policy_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA_Policy_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA_Policy::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-// ****************************************************************
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO_Unbounded_Sequence<CORBA::UShort>;
-template class TAO_Unbounded_Sequence<CORBA::ULong>;
-template class TAO_Unbounded_Object_Sequence<CORBA_Policy,CORBA_Policy_var>;
-template class TAO_Object_Manager<CORBA_Policy,CORBA_Policy_var>;
-
-template class TAO_Object_Field_T<CORBA_Policy,CORBA_Policy_var>;
-//  template class TAO_Object_Field_T<CORBA_PolicyManager,CORBA_PolicyManager_var>;
-//  template class TAO_Object_Field_T<CORBA_PolicyCurrent,CORBA_PolicyCurrent_var>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_Unbounded_Sequence<CORBA::UShort>
-#pragma instantiate TAO_Unbounded_Sequence<CORBA::ULong>
-#pragma instantiate TAO_Unbounded_Object_Sequence<CORBA_Policy,CORBA_Policy_var>
-#pragma instantiate TAO_Object_Manager<CORBA_Policy,CORBA_Policy_var>
-
-#pragma instantiate TAO_Object_Field_T<CORBA_Policy,CORBA_Policy_var>
-//#  pragma instantiate TAO_Object_Field_T<CORBA_PolicyManager,CORBA_PolicyManager_var>
-//#  pragma instantiate TAO_Object_Field_T<CORBA_PolicyCurrent,CORBA_PolicyCurrent_var>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
deleted file mode 100644
index 7905b1f819e..00000000000
--- a/TAO/tao/PolicyC.h
+++ /dev/null
@@ -1,599 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#ifndef TAO_IDL_POLICYC_H
-#define TAO_IDL_POLICYC_H
-
-#include "tao/CurrentC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CDR.h"
-#include "tao/Sequence.h"
-
-class TAO_Export CORBA_PolicyError : public CORBA::UserException
-{
-public:
-  CORBA::PolicyErrorCode reason;
-
-  CORBA_PolicyError (void); // default ctor
-  CORBA_PolicyError (const CORBA::PolicyError &); // copy ctor
-  ~CORBA_PolicyError (void); // dtor
-  CORBA_PolicyError &operator= (const CORBA_PolicyError &);
-
-  virtual void _raise (void);
-
-  static CORBA_PolicyError *_narrow (CORBA::Exception *);
-
-  CORBA_PolicyError(
-    CORBA::PolicyErrorCode _tao_reason);
-
-  // = TAO extension
-  static CORBA::Exception *_alloc (void);
-}; // exception CORBA::PolicyError
-
-// ****************************************************************
-
-class CORBA_InvalidPolicies;
-typedef CORBA_InvalidPolicies *CORBA_InvalidPolicies_ptr;
-
-class TAO_Export CORBA_InvalidPolicies : public CORBA::UserException
-{
-public:
-  class TAO_Export _tao_seq_UShort : public TAO_Unbounded_Sequence<CORBA::UShort>
-  {
-  public:
-    _tao_seq_UShort (void); // default ctor
-    _tao_seq_UShort (CORBA::ULong max); // uses max size
-    _tao_seq_UShort (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::UShort *buffer,
-        CORBA::Boolean release=0
-      );
-    _tao_seq_UShort (const _tao_seq_UShort &); // copy ctor
-    ~_tao_seq_UShort (void); // dtor
-  };
-  typedef _tao_seq_UShort *_tao_seq_UShort_ptr;
-  static CORBA::TypeCode_ptr _tc__tao_seq_UShort;
-
-  _tao_seq_UShort indices;
-
-  CORBA_InvalidPolicies (void); // default ctor
-  CORBA_InvalidPolicies (const CORBA_InvalidPolicies &); // copy ctor
-  ~CORBA_InvalidPolicies (void); // dtor
-  CORBA_InvalidPolicies &operator= (const CORBA_InvalidPolicies &);
-
-  virtual void _raise (void);
-
-  static CORBA_InvalidPolicies *_narrow (CORBA::Exception *);
-
-  CORBA_InvalidPolicies(
-      const _tao_seq_UShort & _tao_indices);
-
-  // = TAO extension
-  static CORBA::Exception *_alloc (void);
-}; // exception CORBA::InvalidPolicies
-
-// ****************************************************************
-
-class CORBA_Policy;
-typedef CORBA_Policy *CORBA_Policy_ptr;
-
-class TAO_Export  CORBA_Policy_var
-{
-public:
-  CORBA_Policy_var (void); // default constructor
-  CORBA_Policy_var (CORBA_Policy_ptr);
-  CORBA_Policy_var (const CORBA_Policy_var &); // copy constructor
-  ~CORBA_Policy_var (void); // destructor
-
-  CORBA_Policy_var &operator= (CORBA_Policy_ptr);
-  CORBA_Policy_var &operator= (const CORBA_Policy_var &);
-  CORBA_Policy_ptr operator-> (void) const;
-
-  operator const CORBA_Policy_ptr &() const;
-  operator CORBA_Policy_ptr &();
-  // in, inout, out, _retn
-  CORBA_Policy_ptr in (void) const;
-  CORBA_Policy_ptr &inout (void);
-  CORBA_Policy_ptr &out (void);
-  CORBA_Policy_ptr _retn (void);
-  CORBA_Policy_ptr ptr (void) const;
-
-private:
-  CORBA_Policy_ptr ptr_;
-};
-
-class TAO_Export  CORBA_Policy_out
-{
-public:
-  CORBA_Policy_out (CORBA_Policy_ptr &);
-  CORBA_Policy_out (CORBA_Policy_var &);
-  CORBA_Policy_out (CORBA_Policy_out &);
-  CORBA_Policy_out &operator= (CORBA_Policy_out &);
-  CORBA_Policy_out &operator= (const CORBA_Policy_var &);
-  CORBA_Policy_out &operator= (CORBA_Policy_ptr);
-  operator CORBA_Policy_ptr &();
-  CORBA_Policy_ptr &ptr (void);
-  CORBA_Policy_ptr operator-> (void);
-
-private:
-  CORBA_Policy_ptr &ptr_;
-};
-
-class TAO_Export  CORBA_Policy : public virtual CORBA_Object
-{
-public:
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_Policy_ptr _ptr_type;
-  typedef CORBA_Policy_var _var_type;
-#endif /* __GNUC__ */
-
-  // the static operations
-  static CORBA_Policy_ptr _duplicate (CORBA_Policy_ptr obj);
-  static CORBA_Policy_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA_Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static CORBA_Policy_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA_Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static CORBA_Policy_ptr _nil (void);
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-  virtual CORBA::PolicyType policy_type (
-      CORBA_Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  virtual CORBA_Policy_ptr copy (
-      CORBA_Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  virtual void destroy (
-      CORBA_Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-#else
-  virtual CORBA::PolicyType policy_type (
-      CORBA_Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    ) = 0;
-  virtual CORBA_Policy_ptr copy (
-      CORBA_Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    ) = 0;
-  virtual void destroy (
-      CORBA_Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    ) = 0;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id,
-      CORBA_Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  virtual const char* _interface_repository_id (void) const;
-protected:
-  CORBA_Policy (void); // default constructor
-  CORBA_Policy (TAO_Stub *objref,
-                TAO_ServantBase *_tao_servant = 0,
-                CORBA::Boolean _tao_collocated = 0
-                );
-  virtual ~CORBA_Policy (void);
-private:
-  CORBA_Policy (const CORBA_Policy &);
-  void operator= (const CORBA_Policy &);
-};
-
-// *************************************************************
-// CORBA_PolicyList
-// *************************************************************
-
-class TAO_Export  CORBA_PolicyList : public TAO_Unbounded_Object_Sequence<CORBA_Policy,CORBA_Policy_var>
-{
-public:
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_PolicyList_ptr _ptr_type;
-  typedef CORBA_PolicyList_var _var_type;
-#endif /* __GNUC__ */
-
-  CORBA_PolicyList (void); // default ctor
-  CORBA_PolicyList (CORBA::ULong max); // uses max size
-  CORBA_PolicyList (
-      CORBA::ULong max,
-      CORBA::ULong length,
-      CORBA_Policy_ptr *buffer,
-      CORBA::Boolean release=0
-    );
-  CORBA_PolicyList (const CORBA_PolicyList &); // copy ctor
-  ~CORBA_PolicyList (void); // dtor
-};
-typedef CORBA_PolicyList *CORBA_PolicyList_ptr;
-
-// *************************************************************
-// class CORBA::PolicyList_var
-// *************************************************************
-
-class TAO_Export  CORBA_PolicyList_var
-{
-public:
-  CORBA_PolicyList_var (void); // default constructor
-  CORBA_PolicyList_var (CORBA_PolicyList *);
-  CORBA_PolicyList_var (const CORBA_PolicyList_var &); // copy constructor
-  ~CORBA_PolicyList_var (void); // destructor
-
-  CORBA_PolicyList_var &operator= (CORBA_PolicyList *);
-  CORBA_PolicyList_var &operator= (const CORBA_PolicyList_var &);
-  CORBA_PolicyList *operator-> (void);
-  const CORBA_PolicyList *operator-> (void) const;
-
-  operator const CORBA_PolicyList &() const;
-  operator CORBA_PolicyList &();
-  operator CORBA_PolicyList &() const;
-  TAO_Object_Manager <CORBA_Policy,CORBA_Policy_var > operator[] (CORBA::ULong index);
-  // in, inout, out, _retn
-  const CORBA_PolicyList &in (void) const;
-  CORBA_PolicyList &inout (void);
-  CORBA_PolicyList *&out (void);
-  CORBA_PolicyList *_retn (void);
-  CORBA_PolicyList *ptr (void) const;
-
-private:
-  CORBA_PolicyList *ptr_;
-};
-
-class TAO_Export  CORBA_PolicyList_out
-{
-public:
-  CORBA_PolicyList_out (CORBA_PolicyList *&);
-  CORBA_PolicyList_out (CORBA_PolicyList_var &);
-  CORBA_PolicyList_out (CORBA_PolicyList_out &);
-  CORBA_PolicyList_out &operator= (CORBA_PolicyList_out &);
-  CORBA_PolicyList_out &operator= (CORBA_PolicyList *);
-  operator CORBA_PolicyList *&();
-  CORBA_PolicyList *&ptr (void);
-  CORBA_PolicyList *operator-> (void);
-  TAO_Object_Manager <CORBA_Policy,CORBA_Policy_var> operator[] (CORBA::ULong index);
-
-private:
-  CORBA_PolicyList *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_PolicyList_var &);
-};
-
-// *************************************************************
-// PolicyTypeSeq
-// *************************************************************
-
-class TAO_Export CORBA_PolicyTypeSeq : public TAO_Unbounded_Sequence<CORBA::ULong>
-{
-public:
-  CORBA_PolicyTypeSeq (void); // default ctor
-  CORBA_PolicyTypeSeq (CORBA::ULong max); // uses max size
-  CORBA_PolicyTypeSeq (
-      CORBA::ULong max,
-      CORBA::ULong length,
-      CORBA::ULong *buffer,
-      CORBA::Boolean release=0
-    );
-  CORBA_PolicyTypeSeq (const CORBA_PolicyTypeSeq &); // copy ctor
-  ~CORBA_PolicyTypeSeq (void); // dtor
-};
-typedef CORBA_PolicyTypeSeq *CORBA_PolicyTypeSeq_ptr;
-
-// *************************************************************
-// class CORBA::PolicyTypeSeq_var
-// *************************************************************
-
-class TAO_Export CORBA_PolicyTypeSeq_var
-{
-public:
-  CORBA_PolicyTypeSeq_var (void); // default constructor
-  CORBA_PolicyTypeSeq_var (CORBA_PolicyTypeSeq *);
-  CORBA_PolicyTypeSeq_var (const CORBA_PolicyTypeSeq_var &);
-  ~CORBA_PolicyTypeSeq_var (void); // destructor
-
-  CORBA_PolicyTypeSeq_var &operator= (CORBA_PolicyTypeSeq *);
-  CORBA_PolicyTypeSeq_var &operator= (const CORBA_PolicyTypeSeq_var &);
-  CORBA_PolicyTypeSeq *operator-> (void);
-  const CORBA_PolicyTypeSeq *operator-> (void) const;
-
-  operator const CORBA_PolicyTypeSeq &() const;
-  operator CORBA_PolicyTypeSeq &();
-  operator CORBA_PolicyTypeSeq &() const;
-  CORBA::PolicyType &operator[] (CORBA::ULong slot);
-  // in, inout, out, _retn
-  const CORBA_PolicyTypeSeq &in (void) const;
-  CORBA_PolicyTypeSeq &inout (void);
-  CORBA_PolicyTypeSeq *&out (void);
-  CORBA_PolicyTypeSeq *_retn (void);
-  CORBA_PolicyTypeSeq *ptr (void) const;
-
-private:
-  CORBA_PolicyTypeSeq *ptr_;
-};
-
-class TAO_Export CORBA_PolicyTypeSeq_out
-{
-public:
-  CORBA_PolicyTypeSeq_out (CORBA_PolicyTypeSeq *&);
-  CORBA_PolicyTypeSeq_out (CORBA_PolicyTypeSeq_var &);
-  CORBA_PolicyTypeSeq_out (const CORBA_PolicyTypeSeq_out &);
-  CORBA_PolicyTypeSeq_out &operator= (const CORBA_PolicyTypeSeq_out &);
-  CORBA_PolicyTypeSeq_out &operator= (CORBA_PolicyTypeSeq *);
-  operator CORBA_PolicyTypeSeq *&();
-  CORBA_PolicyTypeSeq *&ptr (void);
-  CORBA_PolicyTypeSeq *operator-> (void);
-  CORBA::PolicyType &operator[] (CORBA::ULong slot);
-
-private:
-  CORBA_PolicyTypeSeq *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_PolicyTypeSeq_var &);
-};
-
-class TAO_Export CORBA_PolicyManager_var
-{
-public:
-  CORBA_PolicyManager_var (void); // default constructor
-  CORBA_PolicyManager_var (CORBA_PolicyManager_ptr);
-  CORBA_PolicyManager_var (const CORBA_PolicyManager_var &);
-  ~CORBA_PolicyManager_var (void); // destructor
-
-  CORBA_PolicyManager_var &operator= (CORBA_PolicyManager_ptr);
-  CORBA_PolicyManager_var &operator= (const CORBA_PolicyManager_var &);
-  CORBA_PolicyManager_ptr operator-> (void) const;
-
-  operator const CORBA_PolicyManager_ptr &() const;
-  operator CORBA_PolicyManager_ptr &();
-  // in, inout, out, _retn
-  CORBA_PolicyManager_ptr in (void) const;
-  CORBA_PolicyManager_ptr &inout (void);
-  CORBA_PolicyManager_ptr &out (void);
-  CORBA_PolicyManager_ptr _retn (void);
-  CORBA_PolicyManager_ptr ptr (void) const;
-
-private:
-  CORBA_PolicyManager_ptr ptr_;
-};
-
-class TAO_Export CORBA_PolicyManager_out
-{
-public:
-  CORBA_PolicyManager_out (CORBA_PolicyManager_ptr &);
-  CORBA_PolicyManager_out (CORBA_PolicyManager_var &);
-  CORBA_PolicyManager_out (const CORBA_PolicyManager_out &);
-  CORBA_PolicyManager_out &operator= (const CORBA_PolicyManager_out &);
-  CORBA_PolicyManager_out &operator= (const CORBA_PolicyManager_var &);
-  CORBA_PolicyManager_out &operator= (CORBA_PolicyManager_ptr);
-  operator CORBA_PolicyManager_ptr &();
-  CORBA_PolicyManager_ptr &ptr (void);
-  CORBA_PolicyManager_ptr operator-> (void);
-
-private:
-  CORBA_PolicyManager_ptr &ptr_;
-};
-
-class TAO_Export CORBA_PolicyManager : public virtual CORBA_Object
-{
-public:
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_PolicyManager_ptr _ptr_type;
-  typedef CORBA_PolicyManager_var _var_type;
-#endif /* __GNUC__ */
-
-  // the static operations
-  static CORBA_PolicyManager_ptr _duplicate (CORBA_PolicyManager_ptr obj);
-  static CORBA_PolicyManager_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-  static CORBA_PolicyManager_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-  static CORBA_PolicyManager_ptr _nil (void);
-
-  virtual CORBA_PolicyList * get_policy_overrides (
-        const CORBA_PolicyTypeSeq & ts,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-  virtual void set_policy_overrides (
-        const CORBA_PolicyList & policies,
-        CORBA::SetOverrideType set_add,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-  virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-  virtual const char* _interface_repository_id (void) const;
-protected:
-  CORBA_PolicyManager (void); // default constructor
-  CORBA_PolicyManager (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-  virtual ~CORBA_PolicyManager (void);
-private:
-  CORBA_PolicyManager (const CORBA_PolicyManager &);
-  void operator= (const CORBA_PolicyManager &);
-};
-
-// ****************************************************************
-
-class TAO_Export CORBA_PolicyCurrent_var
-{
-public:
-  CORBA_PolicyCurrent_var (void); // default constructor
-  CORBA_PolicyCurrent_var (CORBA_PolicyCurrent_ptr);
-  CORBA_PolicyCurrent_var (const CORBA_PolicyCurrent_var &);
-  ~CORBA_PolicyCurrent_var (void); // destructor
-
-  CORBA_PolicyCurrent_var &operator= (CORBA_PolicyCurrent_ptr);
-  CORBA_PolicyCurrent_var &operator= (const CORBA_PolicyCurrent_var &);
-  CORBA_PolicyCurrent_ptr operator-> (void) const;
-
-  operator const CORBA_PolicyCurrent_ptr &() const;
-  operator CORBA_PolicyCurrent_ptr &();
-  // in, inout, out, _retn
-  CORBA_PolicyCurrent_ptr in (void) const;
-  CORBA_PolicyCurrent_ptr &inout (void);
-  CORBA_PolicyCurrent_ptr &out (void);
-  CORBA_PolicyCurrent_ptr _retn (void);
-  CORBA_PolicyCurrent_ptr ptr (void) const;
-
-private:
-  CORBA_PolicyCurrent_ptr ptr_;
-};
-
-class TAO_Export CORBA_PolicyCurrent_out
-{
-public:
-  CORBA_PolicyCurrent_out (CORBA_PolicyCurrent_ptr &);
-  CORBA_PolicyCurrent_out (CORBA_PolicyCurrent_var &);
-  CORBA_PolicyCurrent_out (const CORBA_PolicyCurrent_out &);
-  CORBA_PolicyCurrent_out &operator= (const CORBA_PolicyCurrent_out &);
-  CORBA_PolicyCurrent_out &operator= (const CORBA_PolicyCurrent_var &);
-  CORBA_PolicyCurrent_out &operator= (CORBA_PolicyCurrent_ptr);
-  operator CORBA_PolicyCurrent_ptr &();
-  CORBA_PolicyCurrent_ptr &ptr (void);
-  CORBA_PolicyCurrent_ptr operator-> (void);
-
-private:
-  CORBA_PolicyCurrent_ptr &ptr_;
-};
-
-class TAO_Export CORBA_PolicyCurrent: public virtual CORBA_PolicyManager, public virtual CORBA_Current
-{
-public:
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_PolicyCurrent_ptr _ptr_type;
-  typedef CORBA_PolicyCurrent_var _var_type;
-#endif /* __GNUC__ */
-
-  // the static operations
-  static CORBA_PolicyCurrent_ptr _duplicate (CORBA_PolicyCurrent_ptr obj);
-  static CORBA_PolicyCurrent_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-  static CORBA_PolicyCurrent_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-  static CORBA_PolicyCurrent_ptr _nil (void);
-
-  virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-  virtual const char* _interface_repository_id (void) const;
-protected:
-  CORBA_PolicyCurrent (void); // default constructor
-  CORBA_PolicyCurrent (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-  virtual ~CORBA_PolicyCurrent (void);
-private:
-  CORBA_PolicyCurrent (const CORBA_PolicyCurrent &);
-  void operator= (const CORBA_PolicyCurrent &);
-};
-
-// ****************************************************************
-
-void TAO_Export operator<<= (CORBA::Any &,
-                             const CORBA::PolicyError &);
-void TAO_Export operator<<= (CORBA::Any &, CORBA::PolicyError*);
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &,
-                                       CORBA::PolicyError *&);
-void TAO_Export operator<<= (CORBA::Any &,
-                             const CORBA::InvalidPolicies &);
-void TAO_Export operator<<= (CORBA::Any &,
-                             CORBA::InvalidPolicies*);
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &,
-                                       CORBA::InvalidPolicies *&);
-
-// Any operators for interface CORBA::Policy
-void TAO_Export operator<<= (CORBA::Any &,
-                             CORBA::Policy_ptr);
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &,
-                                       CORBA::Policy *&);
-void TAO_Export operator<<= (CORBA::Any &,
-                             const CORBA::PolicyList &);
-void TAO_Export operator<<= (CORBA::Any &,
-                             CORBA::PolicyList*);
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &,
-                                       CORBA::PolicyList *&);
-void TAO_Export operator<<= (CORBA::Any &,
-                             const CORBA::PolicyTypeSeq &);
-void TAO_Export operator<<= (CORBA::Any &,
-                             CORBA::PolicyTypeSeq*);
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &,
-                                       CORBA::PolicyTypeSeq *&);
-void TAO_Export operator<<= (CORBA::Any &,
-                             CORBA::SetOverrideType);
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &,
-                                       CORBA::SetOverrideType &);
-
-// ****************************************************************
-
-#if defined (__ACE_INLINE__)
-#include "PolicyC.i"
-#else
-
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const CORBA::PolicyError &);
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, CORBA::PolicyError &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const CORBA::InvalidPolicies &);
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, CORBA::InvalidPolicies &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const CORBA::InvalidPolicies::_tao_seq_UShort &);
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, CORBA::InvalidPolicies::_tao_seq_UShort &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const CORBA::Policy_ptr );
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, CORBA::Policy_ptr &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const CORBA::PolicyList &);
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, CORBA::PolicyList &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const CORBA::PolicyTypeSeq &);
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, CORBA::PolicyTypeSeq &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const CORBA::SetOverrideType &);
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, CORBA::SetOverrideType &);
-
-#endif /* defined INLINE */
-
-#endif /* TAO_IDL_POLICYC_H */
diff --git a/TAO/tao/PolicyC.i b/TAO/tao/PolicyC.i
deleted file mode 100644
index 9a845dbec38..00000000000
--- a/TAO/tao/PolicyC.i
+++ /dev/null
@@ -1,1151 +0,0 @@
-// $Id$
-
-/* -*- C++ -*- */
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// *************************************************************
-// Inline operations for class CORBA::InvalidPolicies::_tao_seq_UShort
-// *************************************************************
-
-ACE_INLINE
-CORBA_InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (void)
-{
-}
-
-ACE_INLINE
-CORBA_InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (CORBA::ULong max)
-  : TAO_Unbounded_Sequence<CORBA::UShort> (max)
-{
-}
-
-ACE_INLINE
-CORBA_InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::UShort *buffer,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Sequence<CORBA::UShort> (max,
-                                           length,
-                                           buffer,
-                                           release)
-{
-}
-
-ACE_INLINE
-CORBA_InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (
-    const CORBA_InvalidPolicies::_tao_seq_UShort &rhs)
-  : TAO_Unbounded_Sequence<CORBA::UShort> (rhs)
-{
-}
-
-ACE_INLINE
-CORBA_InvalidPolicies::_tao_seq_UShort::~_tao_seq_UShort (void)
-{
-}
-
-// ****************************************************************
-
-ACE_INLINE
-CORBA_Policy::CORBA_Policy (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA_Policy::CORBA_Policy (TAO_Stub *objref,
-                            TAO_ServantBase *_tao_servant,
-                            CORBA::Boolean _tao_collocated)
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA_Policy::~CORBA_Policy (void) // destructor
-{}
-
-ACE_INLINE
-CORBA_Policy_var::CORBA_Policy_var (void) // default constructor
-  : ptr_ (CORBA_Policy::_nil ())
-{}
-
-ACE_INLINE
-CORBA_Policy_var::CORBA_Policy_var (CORBA_Policy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA_Policy_ptr
-CORBA_Policy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// copy constructor
-ACE_INLINE
-CORBA_Policy_var::CORBA_Policy_var (const CORBA_Policy_var &p)
-  : ptr_ (CORBA_Policy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_Policy_var::~CORBA_Policy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_Policy_var &
-CORBA_Policy_var::operator= (CORBA_Policy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_Policy_var &
-CORBA_Policy_var::operator= (const CORBA_Policy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_Policy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_Policy_var::operator const CORBA_Policy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Policy_var::operator CORBA_Policy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Policy_ptr
-CORBA_Policy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Policy_ptr
-CORBA_Policy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Policy_ptr &
-CORBA_Policy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Policy_ptr &
-CORBA_Policy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_Policy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Policy_ptr
-CORBA_Policy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_Policy_ptr val = this->ptr_;
-  this->ptr_ = CORBA_Policy::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_Policy_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_Policy_out::CORBA_Policy_out (CORBA_Policy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA_Policy::_nil ();
-}
-
-ACE_INLINE
-CORBA_Policy_out::CORBA_Policy_out (CORBA_Policy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_Policy::_nil ();
-}
-
-ACE_INLINE
-CORBA_Policy_out::CORBA_Policy_out (CORBA_Policy_out &p) // copy constructor
-  : ptr_ (p.ptr_)
-{}
-
-ACE_INLINE CORBA_Policy_out &
-CORBA_Policy_out::operator= (CORBA_Policy_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_Policy_out &
-CORBA_Policy_out::operator= (const CORBA_Policy_var &p)
-{
-  this->ptr_ = CORBA_Policy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_Policy_out &
-CORBA_Policy_out::operator= (CORBA_Policy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_Policy_out::operator CORBA_Policy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Policy_ptr &
-CORBA_Policy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Policy_ptr
-CORBA_Policy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_PolicyList_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_PolicyList_var::CORBA_PolicyList_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA_PolicyList_var::CORBA_PolicyList_var (CORBA_PolicyList *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_PolicyList_var::CORBA_PolicyList_var (const CORBA_PolicyList_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA_PolicyList(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_PolicyList_var::~CORBA_PolicyList_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyList_var &
-CORBA_PolicyList_var::operator= (CORBA_PolicyList *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_PolicyList_var &
-CORBA_PolicyList_var::operator= (const CORBA_PolicyList_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA_PolicyList (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA_PolicyList *
-CORBA_PolicyList_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyList *
-CORBA_PolicyList_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_PolicyList_var::operator const CORBA_PolicyList &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA_PolicyList_var::operator CORBA_PolicyList &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA_PolicyList_var::operator CORBA_PolicyList &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TAO_Object_Manager <CORBA_Policy,CORBA_Policy_var >
-CORBA_PolicyList_var::operator[] (CORBA::ULong slot)
-{
-  return this->ptr_->operator[] (slot);
-}
-
-ACE_INLINE const CORBA_PolicyList &
-CORBA_PolicyList_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyList &
-CORBA_PolicyList_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE CORBA_PolicyList *&
-CORBA_PolicyList_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyList *
-CORBA_PolicyList_var::_retn (void)
-{
-  CORBA_PolicyList *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA_PolicyList *
-CORBA_PolicyList_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_PolicyList_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_PolicyList_out::CORBA_PolicyList_out (CORBA_PolicyList *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_PolicyList_out::CORBA_PolicyList_out (CORBA_PolicyList_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_PolicyList_out::CORBA_PolicyList_out (CORBA_PolicyList_out &p) // copy constructor
-  : ptr_ (p.ptr_)
-{}
-
-ACE_INLINE CORBA_PolicyList_out &
-CORBA_PolicyList_out::operator= (CORBA_PolicyList_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_PolicyList_out &
-CORBA_PolicyList_out::operator= (CORBA_PolicyList *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_PolicyList_out::operator CORBA_PolicyList *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyList *&
-CORBA_PolicyList_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyList *
-CORBA_PolicyList_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_Object_Manager <CORBA_Policy,CORBA_Policy_var >
-CORBA_PolicyList_out::operator[] (CORBA::ULong slot)
-{
-  return this->ptr_->operator[] (slot);
-}
-
-// *************************************************************
-// Inline operations for class CORBA_PolicyTypeSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_PolicyTypeSeq_var::CORBA_PolicyTypeSeq_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA_PolicyTypeSeq_var::CORBA_PolicyTypeSeq_var (CORBA_PolicyTypeSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_PolicyTypeSeq_var::CORBA_PolicyTypeSeq_var (const CORBA_PolicyTypeSeq_var &p)
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA_PolicyTypeSeq(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_PolicyTypeSeq_var::~CORBA_PolicyTypeSeq_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyTypeSeq_var &
-CORBA_PolicyTypeSeq_var::operator= (CORBA_PolicyTypeSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_PolicyTypeSeq_var &
-CORBA_PolicyTypeSeq_var::operator= (const CORBA_PolicyTypeSeq_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA_PolicyTypeSeq (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA_PolicyTypeSeq *
-CORBA_PolicyTypeSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyTypeSeq *
-CORBA_PolicyTypeSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_PolicyTypeSeq_var::operator const CORBA_PolicyTypeSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA_PolicyTypeSeq_var::operator CORBA_PolicyTypeSeq &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA_PolicyTypeSeq_var::operator CORBA_PolicyTypeSeq &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::PolicyType &
-CORBA_PolicyTypeSeq_var::operator[] (CORBA::ULong slot)
-{
-  return this->ptr_->operator[] (slot);
-}
-
-ACE_INLINE const CORBA_PolicyTypeSeq &
-CORBA_PolicyTypeSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyTypeSeq &
-CORBA_PolicyTypeSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE CORBA_PolicyTypeSeq *&
-CORBA_PolicyTypeSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyTypeSeq *
-CORBA_PolicyTypeSeq_var::_retn (void)
-{
-  CORBA_PolicyTypeSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA_PolicyTypeSeq *
-CORBA_PolicyTypeSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_PolicyTypeSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_PolicyTypeSeq_out::CORBA_PolicyTypeSeq_out (CORBA_PolicyTypeSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_PolicyTypeSeq_out::CORBA_PolicyTypeSeq_out (CORBA_PolicyTypeSeq_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_PolicyTypeSeq_out::CORBA_PolicyTypeSeq_out (const CORBA_PolicyTypeSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_PolicyTypeSeq_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_PolicyTypeSeq_out &
-CORBA_PolicyTypeSeq_out::operator= (const CORBA_PolicyTypeSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_PolicyTypeSeq_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_PolicyTypeSeq_out &
-CORBA_PolicyTypeSeq_out::operator= (CORBA_PolicyTypeSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_PolicyTypeSeq_out::operator CORBA_PolicyTypeSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyTypeSeq *&
-CORBA_PolicyTypeSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyTypeSeq *
-CORBA_PolicyTypeSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::PolicyType &
-CORBA_PolicyTypeSeq_out::operator[] (CORBA::ULong slot)
-{
-  return this->ptr_->operator[] (slot);
-}
-
-// ****************************************************************
-
-ACE_INLINE
-CORBA_PolicyManager::CORBA_PolicyManager (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA_PolicyManager::CORBA_PolicyManager (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA_PolicyManager::~CORBA_PolicyManager (void) // destructor
-{}
-
-ACE_INLINE CORBA_PolicyManager_ptr
-CORBA_PolicyManager::_duplicate (CORBA_PolicyManager_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE CORBA_PolicyManager_ptr
-CORBA_PolicyManager::_nil (void)
-{
-  return (CORBA_PolicyManager_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_PolicyManager_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_PolicyManager_var::CORBA_PolicyManager_var (void) // default constructor
-  : ptr_ (CORBA_PolicyManager::_nil ())
-{}
-
-ACE_INLINE
-CORBA_PolicyManager_var::CORBA_PolicyManager_var (CORBA_PolicyManager_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA_PolicyManager_ptr
-CORBA_PolicyManager_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_PolicyManager_var::CORBA_PolicyManager_var (const CORBA_PolicyManager_var &p) // copy constructor
-  : ptr_ (CORBA_PolicyManager::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_PolicyManager_var::~CORBA_PolicyManager_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_PolicyManager_var &
-CORBA_PolicyManager_var::operator= (CORBA_PolicyManager_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_PolicyManager_var &
-CORBA_PolicyManager_var::operator= (const CORBA_PolicyManager_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_PolicyManager::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_PolicyManager_var::operator const CORBA_PolicyManager_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_PolicyManager_var::operator CORBA_PolicyManager_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyManager_ptr
-CORBA_PolicyManager_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyManager_ptr
-CORBA_PolicyManager_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyManager_ptr &
-CORBA_PolicyManager_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyManager_ptr &
-CORBA_PolicyManager_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_PolicyManager::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyManager_ptr
-CORBA_PolicyManager_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_PolicyManager_ptr val = this->ptr_;
-  this->ptr_ = CORBA_PolicyManager::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_PolicyManager_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_PolicyManager_out::CORBA_PolicyManager_out (CORBA_PolicyManager_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA_PolicyManager::_nil ();
-}
-
-ACE_INLINE
-CORBA_PolicyManager_out::CORBA_PolicyManager_out (CORBA_PolicyManager_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_PolicyManager::_nil ();
-}
-
-ACE_INLINE
-CORBA_PolicyManager_out::CORBA_PolicyManager_out (const CORBA_PolicyManager_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_PolicyManager_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_PolicyManager_out &
-CORBA_PolicyManager_out::operator= (const CORBA_PolicyManager_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_PolicyManager_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_PolicyManager_out &
-CORBA_PolicyManager_out::operator= (const CORBA_PolicyManager_var &p)
-{
-  this->ptr_ = CORBA_PolicyManager::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_PolicyManager_out &
-CORBA_PolicyManager_out::operator= (CORBA_PolicyManager_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_PolicyManager_out::operator CORBA_PolicyManager_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyManager_ptr &
-CORBA_PolicyManager_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyManager_ptr
-CORBA_PolicyManager_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-CORBA_PolicyCurrent::CORBA_PolicyCurrent (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA_PolicyCurrent::CORBA_PolicyCurrent (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA_PolicyCurrent::~CORBA_PolicyCurrent (void) // destructor
-{}
-
-ACE_INLINE CORBA_PolicyCurrent_ptr
-CORBA_PolicyCurrent::_duplicate (CORBA_PolicyCurrent_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE CORBA_PolicyCurrent_ptr
-CORBA_PolicyCurrent::_nil (void)
-{
-  return (CORBA_PolicyCurrent_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_PolicyCurrent_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_PolicyCurrent_var::CORBA_PolicyCurrent_var (void) // default constructor
-  : ptr_ (CORBA_PolicyCurrent::_nil ())
-{}
-
-ACE_INLINE
-CORBA_PolicyCurrent_var::CORBA_PolicyCurrent_var (CORBA_PolicyCurrent_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA_PolicyCurrent_ptr
-CORBA_PolicyCurrent_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_PolicyCurrent_var::CORBA_PolicyCurrent_var (const CORBA_PolicyCurrent_var &p) // copy constructor
-  : ptr_ (CORBA_PolicyCurrent::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_PolicyCurrent_var::~CORBA_PolicyCurrent_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_PolicyCurrent_var &
-CORBA_PolicyCurrent_var::operator= (CORBA_PolicyCurrent_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_PolicyCurrent_var &
-CORBA_PolicyCurrent_var::operator= (const CORBA_PolicyCurrent_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_PolicyCurrent::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_PolicyCurrent_var::operator const CORBA_PolicyCurrent_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_PolicyCurrent_var::operator CORBA_PolicyCurrent_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyCurrent_ptr
-CORBA_PolicyCurrent_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyCurrent_ptr
-CORBA_PolicyCurrent_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyCurrent_ptr &
-CORBA_PolicyCurrent_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyCurrent_ptr &
-CORBA_PolicyCurrent_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_PolicyCurrent::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyCurrent_ptr
-CORBA_PolicyCurrent_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_PolicyCurrent_ptr val = this->ptr_;
-  this->ptr_ = CORBA_PolicyCurrent::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_PolicyCurrent_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_PolicyCurrent_out::CORBA_PolicyCurrent_out (CORBA_PolicyCurrent_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA_PolicyCurrent::_nil ();
-}
-
-ACE_INLINE
-CORBA_PolicyCurrent_out::CORBA_PolicyCurrent_out (CORBA_PolicyCurrent_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_PolicyCurrent::_nil ();
-}
-
-ACE_INLINE
-CORBA_PolicyCurrent_out::CORBA_PolicyCurrent_out (const CORBA_PolicyCurrent_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_PolicyCurrent_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_PolicyCurrent_out &
-CORBA_PolicyCurrent_out::operator= (const CORBA_PolicyCurrent_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_PolicyCurrent_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_PolicyCurrent_out &
-CORBA_PolicyCurrent_out::operator= (const CORBA_PolicyCurrent_var &p)
-{
-  this->ptr_ = CORBA_PolicyCurrent::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_PolicyCurrent_out &
-CORBA_PolicyCurrent_out::operator= (CORBA_PolicyCurrent_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_PolicyCurrent_out::operator CORBA_PolicyCurrent_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyCurrent_ptr &
-CORBA_PolicyCurrent_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyCurrent_ptr
-CORBA_PolicyCurrent_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// ****************************************************************
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_PolicyError &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-  {
-    // now marshal the members (if any)
-    if (
-      (strm << _tao_aggregate.reason)
-    )
-      return 1;
-    else
-      return 0;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_PolicyError &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    // now marshal the members
-    if (
-      (strm >> _tao_aggregate.reason)
-    )
-      return 1;
-    else
-      return 0;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA_InvalidPolicies::_tao_seq_UShort &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    return strm.write_ushort_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  }
-  return 0; // error
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_InvalidPolicies::_tao_seq_UShort &_tao_sequence)
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    return strm.read_ushort_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  }
-  return 0; // error
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_InvalidPolicies &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-  {
-    // now marshal the members (if any)
-    if (
-      (strm << _tao_aggregate.indices)
-    )
-      return 1;
-    else
-      return 0;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_InvalidPolicies &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    // now marshal the members
-    if (
-      (strm >> _tao_aggregate.indices)
-    )
-      return 1;
-    else
-      return 0;
-  }
-  else
-    return 0;
-}
-
-CORBA::Boolean TAO_Export
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA_Policy_ptr
-  );
-CORBA::Boolean TAO_Export
-operator>> (
-    TAO_InputCDR &,
-    CORBA_Policy_ptr &
-  );
-
-
-ACE_INLINE CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA_PolicyList &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_PolicyList &_tao_sequence)
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-ACE_INLINE CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA_PolicyTypeSeq &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  }
-  return 0; // error
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_PolicyTypeSeq &_tao_sequence)
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  }
-  return 0; // error
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::SetOverrideType &_tao_enumval)
-{
-  return strm.write_ulong ((CORBA::ULong) _tao_enumval);
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::SetOverrideType &_tao_enumval)
-{
-  CORBA::ULong _tao_temp;
-  if (strm.read_ulong (_tao_temp))
-  {
-    ACE_OS::memcpy (&_tao_enumval, &_tao_temp, sizeof (CORBA::ULong));
-    return 1;
-  }
-  else
-    return 0;
-}
diff --git a/TAO/tao/PolicyS.cpp b/TAO/tao/PolicyS.cpp
deleted file mode 100644
index 752c1395803..00000000000
--- a/TAO/tao/PolicyS.cpp
+++ /dev/null
@@ -1,528 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "tao/PolicyC.h"
-#include "tao/Operation_Table.h"
-#include "tao/Server_Request.h"
-#include "tao/POA_CORBA.h"
-#include "tao/Environment.h"
-#include "tao/Typecode.h"
-#include "tao/ORB.h"
-
-ACE_RCSID(tao, PolicyS, "$Id$")
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-class TAO_CORBA_Policy_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-{
-private:
-  unsigned int hash (const char *str, unsigned int len);
-public:
- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-};
-/* starting time is 17:16:21 */
-/* C++ code produced by gperf version 2.7 (GNU C++ version) */
-/* Command-line: /project/macarena/coryan/head/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Policy_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_CORBA_Policy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17,  0, 17,  0, 17,  0,
-      0,  0, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17,  0, 17, 17, 17,
-     17,  0, 17, 17, 17, 17, 17, 17,
-    };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
-}
-
-const class TAO_operation_db_entry *
-TAO_CORBA_Policy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 5,
-      MIN_WORD_LENGTH = 4,
-      MAX_WORD_LENGTH = 16,
-      MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 16,
-      HASH_VALUE_RANGE = 13,
-      DUPLICATES = 0
-    };
-
-  static const class TAO_operation_db_entry  wordlist[] =
-    {
-      {"",0}, {"",0}, {"",0}, {"",0},
-      {"copy",  &POA_CORBA::Policy::copy_skel},
-      {"_is_a",  &POA_CORBA::Policy::_is_a_skel},
-      {"",0},
-      {"destroy",       &POA_CORBA::Policy::destroy_skel},
-      {"",0}, {"",0}, {"",0}, {"",0}, {"",0},
-      {"_non_existent",  &POA_CORBA::Policy::_non_existent_skel},
-      {"",0}, {"",0},
-      {"_get_policy_type",      &POA_CORBA::Policy::_get_policy_type_skel},
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      unsigned int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-        {
-          const char *s = wordlist[key].opname_;
-
-          if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
-/* ending time is 17:16:21 */
-TAO_CORBA_Policy_Perfect_Hash_OpTable tao_CORBA_Policy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-// skeleton constructor
-POA_CORBA::Policy::Policy (void)
-{
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-  this->optable_ = &tao_CORBA_Policy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-}
-
-// copy ctor
-POA_CORBA::Policy::Policy (const Policy& rhs)
-  :   TAO_ServantBase (rhs)
-{}
-// skeleton destructor
-POA_CORBA::Policy::~Policy (void)
-{
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-void POA_CORBA::Policy::_get_policy_type_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-)
-{
-  POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *)_tao_object_reference;
-  CORBA::PolicyType _tao_retval = 0;
-  _tao_retval = _tao_impl->policy_type (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval)
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_CORBA::Policy::copy_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-)
-{
-  POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *)_tao_object_reference;
-  CORBA::Policy_var _tao_retval;
-  _tao_retval = _tao_impl->copy (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval.in ())
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_CORBA::Policy::destroy_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-)
-{
-  POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *)_tao_object_reference;
-  _tao_impl->destroy (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-}
-
-void POA_CORBA::Policy::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel CORBA_Policy_is_a_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0},
-    {CORBA::_tc_string, CORBA::ARG_IN, 0}
-  };
-  static const TAO_Call_Data_Skel CORBA_Policy_is_a_calldata =
-  {"_is_a", 1, 2, CORBA_Policy_is_a_paramdata};
-  POA_CORBA::Policy_ptr  _tao_impl = (POA_CORBA::Policy_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  CORBA::String_var _tao_value;
-  _tao_server_request.demarshal (
-    ACE_TRY_ENV,
-    &CORBA_Policy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-  ACE_CHECK;
-  _tao_retval = _tao_impl->_is_a (_tao_value.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &CORBA_Policy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-}
-
-void POA_CORBA::Policy::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * /* _tao_object_reference */ ,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel CORBA_Policy_non_existent_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0}
-  };
-  static const TAO_Call_Data_Skel CORBA_Policy_non_existent_calldata =
-  {"_non_existent", 1, 1, CORBA_Policy_non_existent_paramdata};
-  CORBA::Boolean _tao_retval = 0;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &CORBA_Policy_non_existent_calldata,
-    &_tao_retval
-  );
-}
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-CORBA::Boolean POA_CORBA::Policy::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_CORBA::Policy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-void POA_CORBA::Policy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-else
-    skel (req, this, context, ACE_TRY_ENV);
-}
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-const char* POA_CORBA::Policy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/Policy:1.0";
-}
-
-// ****************************************************************
-
-POA_CORBA::_tao_collocated_Policy::_tao_collocated_Policy (
-    POA_CORBA::Policy_ptr  servant,
-    TAO_Stub *stub
-  )
-  : CORBA_Policy (stub, servant, 1),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_CORBA::Policy_ptr POA_CORBA::_tao_collocated_Policy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_CORBA::_tao_collocated_Policy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &_tao_orb_environment
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      _tao_orb_environment
-    );
-}
-
-CORBA::PolicyType POA_CORBA::_tao_collocated_Policy::policy_type  (
-    CORBA::Environment &_tao_orb_environment
-   )
-{
-  return this->servant_->policy_type (
-    _tao_orb_environment
-  );
-}
-
-CORBA::Policy_ptr POA_CORBA::_tao_collocated_Policy::copy  (
-    CORBA::Environment &_tao_orb_environment
-   )
-{
-  return this->servant_->copy (
-    _tao_orb_environment
-  );
-}
-
-void POA_CORBA::_tao_collocated_Policy::destroy  (
-    CORBA::Environment &_tao_orb_environment
-   )
-{
-  this->servant_->destroy (
-    _tao_orb_environment
-  );
-}
-
-CORBA::Policy*
-POA_CORBA::Policy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_CORBA::_tao_collocated_Policy (this, stub);
-}
-
-// ****************************************************************
-
-POA_CORBA::PolicyManager::PolicyManager (void)
-{
-}
-
-POA_CORBA::PolicyManager::PolicyManager (const PolicyManager& rhs)
-  :   TAO_ServantBase (rhs)
-{}
-
-POA_CORBA::PolicyManager::~PolicyManager (void)
-{
-}
-
-CORBA::Boolean POA_CORBA::PolicyManager::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PolicyManager:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_CORBA::PolicyManager::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/PolicyManager:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::PolicyManager_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-const char* POA_CORBA::PolicyManager::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/PolicyManager:1.0";
-}
-
-CORBA::PolicyManager*
-POA_CORBA::PolicyManager::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_CORBA::_tao_collocated_PolicyManager (this, stub);
-}
-
-POA_CORBA::_tao_collocated_PolicyManager::_tao_collocated_PolicyManager (
-    POA_CORBA::PolicyManager_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_CORBA_1 (PolicyManager) (),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_CORBA::PolicyManager_ptr POA_CORBA::_tao_collocated_PolicyManager::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_CORBA::_tao_collocated_PolicyManager::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-CORBA::PolicyList * POA_CORBA::_tao_collocated_PolicyManager::get_policy_overrides  (
-    const CORBA::PolicyTypeSeq & ts,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->get_policy_overrides (
-    ts,
-    ACE_TRY_ENV
-  );
-}
-
-void POA_CORBA::_tao_collocated_PolicyManager::set_policy_overrides  (
-    const CORBA::PolicyList & policies,
-    CORBA::SetOverrideType set_add,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->servant_->set_policy_overrides (
-    policies,
-    set_add,
-    ACE_TRY_ENV
-  );
-}
-
-// ****************************************************************
-
-POA_CORBA::PolicyCurrent::PolicyCurrent (void)
-{
-}
-
-// copy ctor
-POA_CORBA::PolicyCurrent::PolicyCurrent (const PolicyCurrent& rhs)
-  : ACE_NESTED_CLASS (POA_CORBA,PolicyManager) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,Current) (rhs),
-    TAO_ServantBase (rhs)
-{}
-// skeleton destructor
-POA_CORBA::PolicyCurrent::~PolicyCurrent (void)
-{
-}
-
-CORBA::Boolean POA_CORBA::PolicyCurrent::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PolicyCurrent:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PolicyManager:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Current:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_CORBA::PolicyCurrent::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/PolicyCurrent:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::PolicyCurrent_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/PolicyManager:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::PolicyManager_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Current:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Current_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-const char* POA_CORBA::PolicyCurrent::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/PolicyCurrent:1.0";
-}
-
-CORBA::PolicyCurrent*
-POA_CORBA::PolicyCurrent::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_CORBA::_tao_collocated_PolicyCurrent (this, stub);
-}
-
-POA_CORBA::_tao_collocated_PolicyCurrent::_tao_collocated_PolicyCurrent (
-    POA_CORBA::PolicyCurrent_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_CORBA_1 (PolicyCurrent) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_PolicyManager) (servant, stub),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Current) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_CORBA::PolicyCurrent_ptr POA_CORBA::_tao_collocated_PolicyCurrent::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_CORBA::_tao_collocated_PolicyCurrent::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp
deleted file mode 100644
index d693805fd4d..00000000000
--- a/TAO/tao/Policy_Manager.cpp
+++ /dev/null
@@ -1,289 +0,0 @@
-// $Id$
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-
-#include "tao/Policy_Manager.h"
-#include "tao/Environment.h"
-#include "tao/ORB_Core.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Policy_Manager.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, Policy_Manager, "$Id$")
-
-void
-TAO_Policy_Manager_Impl::set_policy_overrides (
-    const CORBA::PolicyList & policies,
-    CORBA::SetOverrideType set_add,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  // @@ The spec does not say what to do on this case.
-  if (set_add != CORBA::SET_OVERRIDE
-      && set_add != CORBA::ADD_OVERRIDE)
-    ACE_THROW (CORBA::BAD_PARAM (TAO_DEFAULT_MINOR_CODE,
-                                 CORBA::COMPLETED_NO));
-
-  if (set_add == CORBA::SET_OVERRIDE)
-    {
-      for (CORBA::ULong i = 0; i < this->other_policies_.length (); ++i)
-        {
-          this->other_policies_[i]->destroy (ACE_TRY_ENV);
-          ACE_CHECK;
-          this->other_policies_[i] = CORBA::Policy::_nil ();
-        }
-      this->other_policies_.length (0);
-      if (this->relative_roundtrip_timeout_ != 0)
-        {
-          this->relative_roundtrip_timeout_->destroy (ACE_TRY_ENV);
-          ACE_CHECK;
-          this->relative_roundtrip_timeout_->_remove_ref (ACE_TRY_ENV);
-          ACE_CHECK;
-          this->relative_roundtrip_timeout_ = 0;
-        }
-      this->count_ = 0;
-    }
-
-  for (CORBA::ULong i = 0; i < policies.length ();  ++i)
-    {
-      CORBA::Policy_ptr policy = policies[i];
-      if (CORBA::is_nil (policy))
-        continue;
-
-      CORBA::ULong slot = policy->policy_type (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      switch (slot)
-        {
-        case TAO_MESSAGING_RELATIVE_RT_TIMEOUT_POLICY_TYPE:
-          {
-            CORBA::Policy_var copy = policy->copy (ACE_TRY_ENV);
-            ACE_CHECK;
-
-            TAO_ServantBase* servant = copy->_servant ();
-            if (servant == 0)
-              ACE_THROW (CORBA::INTERNAL ());
-
-            POA_Messaging::RelativeRoundtripTimeoutPolicy *tmp =
-              ACE_static_cast(POA_Messaging::RelativeRoundtripTimeoutPolicy*,
-                              servant->_downcast ("IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0"));
-            if (tmp == 0)
-              ACE_THROW (CORBA::INTERNAL ());
-
-            if (this->relative_roundtrip_timeout_ != 0)
-              {
-                this->relative_roundtrip_timeout_->destroy (ACE_TRY_ENV);
-                ACE_CHECK;
-                this->relative_roundtrip_timeout_->_remove_ref (ACE_TRY_ENV);
-                ACE_CHECK;
-              }
-            this->relative_roundtrip_timeout_ = tmp;
-            this->relative_roundtrip_timeout_->_add_ref (ACE_TRY_ENV);
-            ACE_CHECK;
-            this->count_++;
-          }
-          break;
-
-        case TAO_MESSAGING_REBIND_POLICY_TYPE:
-        case TAO_MESSAGING_SYNC_SCOPE_POLICY_TYPE:
-        case TAO_MESSAGING_REQUEST_PRIORITY_POLICY_TYPE:
-        case TAO_MESSAGING_REPLY_PRIORITY_POLICY_TYPE:
-        case TAO_MESSAGING_REQUEST_START_TIME_POLICY_TYPE:
-        case TAO_MESSAGING_REQUEST_END_TIME_POLICY_TYPE:
-        case TAO_MESSAGING_REPLY_START_TIME_POLICY_TYPE:
-        case TAO_MESSAGING_REPLY_END_TIME_POLICY_TYPE:
-        case TAO_MESSAGING_RELATIVE_REQ_TIMEOUT_POLICY_TYPE:
-        case TAO_MESSAGING_ROUTING_POLICY_TYPE:
-        case TAO_MESSAGING_MAX_HOPS_POLICY_TYPE:
-        case TAO_MESSAGING_QUEUE_ORDER_POLICY_TYPE:
-        default:
-          {
-            CORBA::Policy_var copy = policy->copy (ACE_TRY_ENV);
-            ACE_CHECK;
-
-            CORBA::ULong j = 0;
-            CORBA::ULong length = this->other_policies_.length ();
-            while (j != length)
-              {
-                CORBA::ULong current =
-                  this->other_policies_[j]->policy_type (ACE_TRY_ENV);
-                ACE_CHECK;
-
-                if (current == slot)
-                  {
-                    this->other_policies_[j]->destroy (ACE_TRY_ENV);
-                    ACE_CHECK;
-                    this->other_policies_[j] = copy._retn ();
-                    break;
-                  }
-                ++j;
-              }
-            if (j == length)
-              {
-                this->other_policies_.length (length + 1);
-                this->other_policies_[j] = copy._retn ();
-              }
-          }
-          break;
-        }
-    }
-}
-
-CORBA::PolicyList *
-TAO_Policy_Manager_Impl::get_policy_overrides (
-    const CORBA::PolicyTypeSeq & types,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::ULong types_length = types.length ();
-
-  CORBA::ULong slots = types_length;
-  if (slots == 0)
-    slots = this->count_;
-
-  CORBA::PolicyList_var policy_list =
-    new CORBA::PolicyList (slots);
-  policy_list->length (slots);
-
-  CORBA::ULong n = 0;
-  if (types_length == 0)
-    {
-      if (this->relative_roundtrip_timeout_ != 0)
-        {
-          policy_list[n++] =
-            relative_roundtrip_timeout_->_this (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-        }
-      CORBA::ULong length = this->other_policies_.length ();
-      for (CORBA::ULong i = 0; i != length; ++i)
-        {
-          if (CORBA::is_nil (this->other_policies_[i].in ()))
-            continue;
-          policy_list[n++] =
-            CORBA::Policy::_duplicate (this->other_policies_[i].in ());
-        }
-    }
-  else
-    {
-      for (CORBA::ULong j = 0; j < types.length ();  ++j)
-        {
-          CORBA::ULong slot = types[j];
-
-          switch (slot)
-            {
-            case TAO_MESSAGING_RELATIVE_RT_TIMEOUT_POLICY_TYPE:
-              if (this->relative_roundtrip_timeout_ != 0)
-                {
-                  policy_list[n++] =
-                    relative_roundtrip_timeout_->_this (ACE_TRY_ENV);
-                  ACE_CHECK_RETURN (0);
-                }
-              break;
-
-            case TAO_MESSAGING_REBIND_POLICY_TYPE:
-            case TAO_MESSAGING_SYNC_SCOPE_POLICY_TYPE:
-            case TAO_MESSAGING_REQUEST_PRIORITY_POLICY_TYPE:
-            case TAO_MESSAGING_REPLY_PRIORITY_POLICY_TYPE:
-            case TAO_MESSAGING_REQUEST_START_TIME_POLICY_TYPE:
-            case TAO_MESSAGING_REQUEST_END_TIME_POLICY_TYPE:
-            case TAO_MESSAGING_REPLY_START_TIME_POLICY_TYPE:
-            case TAO_MESSAGING_REPLY_END_TIME_POLICY_TYPE:
-            case TAO_MESSAGING_RELATIVE_REQ_TIMEOUT_POLICY_TYPE:
-            case TAO_MESSAGING_ROUTING_POLICY_TYPE:
-            case TAO_MESSAGING_MAX_HOPS_POLICY_TYPE:
-            case TAO_MESSAGING_QUEUE_ORDER_POLICY_TYPE:
-            default:
-              {
-                CORBA::ULong length = this->other_policies_.length ();
-                for (CORBA::ULong i = 0;
-                     i != length;
-                     ++i)
-                  {
-                    CORBA::ULong current =
-                      this->other_policies_[i]->policy_type (ACE_TRY_ENV);
-                    ACE_CHECK_RETURN (0);
-
-                    if (current != slot)
-                      continue;
-
-                    policy_list[n++] =
-                      CORBA::Policy::_duplicate (this->other_policies_[i].in ());
-                    break;
-                  }
-              }
-            }
-        }
-    }
-
-  policy_list->length (n);
-  return policy_list._retn ();
-}
-
-CORBA::Policy_ptr
-TAO_Policy_Manager_Impl::get_policy (
-    CORBA::PolicyType type,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  switch (type)
-    {
-    case TAO_MESSAGING_RELATIVE_RT_TIMEOUT_POLICY_TYPE:
-      if (this->relative_roundtrip_timeout_ != 0)
-        {
-          return this->relative_roundtrip_timeout_->_this (ACE_TRY_ENV);
-        }
-      return CORBA::Policy::_nil ();
-
-    case TAO_MESSAGING_REBIND_POLICY_TYPE:
-    case TAO_MESSAGING_SYNC_SCOPE_POLICY_TYPE:
-    case TAO_MESSAGING_REQUEST_PRIORITY_POLICY_TYPE:
-    case TAO_MESSAGING_REPLY_PRIORITY_POLICY_TYPE:
-    case TAO_MESSAGING_REQUEST_START_TIME_POLICY_TYPE:
-    case TAO_MESSAGING_REQUEST_END_TIME_POLICY_TYPE:
-    case TAO_MESSAGING_REPLY_START_TIME_POLICY_TYPE:
-    case TAO_MESSAGING_REPLY_END_TIME_POLICY_TYPE:
-    case TAO_MESSAGING_RELATIVE_REQ_TIMEOUT_POLICY_TYPE:
-    case TAO_MESSAGING_ROUTING_POLICY_TYPE:
-    case TAO_MESSAGING_MAX_HOPS_POLICY_TYPE:
-    case TAO_MESSAGING_QUEUE_ORDER_POLICY_TYPE:
-    default:
-      {
-        CORBA::ULong length = this->other_policies_.length ();
-        for (CORBA::ULong i = 0;
-             i != length;
-             ++i)
-          {
-            CORBA::ULong current =
-              this->other_policies_[i]->policy_type (ACE_TRY_ENV);
-            ACE_CHECK_RETURN (0);
-
-            if (current != type)
-              continue;
-
-            return CORBA::Policy::_duplicate (this->other_policies_[i].in ());
-          }
-      }
-    }
-  return CORBA::Policy::_nil ();
-}
-
-// ****************************************************************
-
-TAO_Policy_Current_Impl &
-TAO_Policy_Current::implementation (TAO_Policy_Current_Impl &current)
-{
-  TAO_TSS_Resources *tss =
-    TAO_TSS_RESOURCES::instance ();
-
-  TAO_Policy_Current_Impl *old = tss->policy_current_;
-  tss->policy_current_ = &current;
-  return *old;
-}
-
-TAO_Policy_Current_Impl &
-TAO_Policy_Current::implementation (void) const
-{
-  return *TAO_TSS_RESOURCES::instance ()->policy_current_;
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h
deleted file mode 100644
index 400377d7bfe..00000000000
--- a/TAO/tao/Policy_Manager.h
+++ /dev/null
@@ -1,204 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   Policy_Manager.h
-//
-// = DESCRIPTION
-//   An implementation for the CORBA::PolicyManager interface.
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
-
-#ifndef TAO_POLICY_MANAGER_H
-#define TAO_POLICY_MANAGER_H
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-
-#include "tao/POA_CORBA.h"
-#include "tao/MessagingS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_Export TAO_Policy_Manager_Impl
-{
-  //
-  // = TITLE
-  //   The policy manager implementation.
-  //
-  // = DESCRIPTION
-  //   This class is used to implement both the CORBA::PolicyManager
-  //   and the CORBA::PolicyCurrent interfaces.
-  //
-public:
-  TAO_Policy_Manager_Impl (void);
-  // Constructor
-
-  void set_policy_overrides (
-      const CORBA::PolicyList & policies,
-      CORBA::SetOverrideType set_add,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  // Modify the list of policies to include <policies>.
-  // If <set_add> is CORBA::SET_OVERRIDE then we replace all the old
-  // policies. If it is CORBA::ADD_OVERRIDE we simply add the policies
-  // in <policies>.
-  // No attempt is made to validate the policies for consitency.
-
-  CORBA::PolicyList * get_policy_overrides (
-      const CORBA::PolicyTypeSeq & types,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  // Get the values (if any) for the policies in <types>, if <types>
-  // is an empty list the method returns *all* the current policies.
-
-  CORBA::Policy_ptr get_policy (
-      CORBA::PolicyType policy,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  // Obtain a single policy.
-
-  // = Direct accesors to the policy implementations, for speedy
-  //   lookups.
-  POA_Messaging::RelativeRoundtripTimeoutPolicy*
-      relative_roundtrip_timeout (void) const;
-
-private:
-  // The known policies are kept as pointers to the implementation
-  // objects, this allow us to query the supported policies really
-  // fast, without memory allocations.
-  POA_Messaging::RelativeRoundtripTimeoutPolicy *relative_roundtrip_timeout_;
-
-  CORBA::PolicyList other_policies_;
-  // Other policies that are not optimized for fast querying
-
-  CORBA::ULong count_;
-  // The number of non-nil policies
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_Policy_Manager : public POA_CORBA::PolicyManager
-{
-public:
-  TAO_Policy_Manager (void);
-  // constructor
-
-  CORBA::Policy_ptr get_policy (
-      CORBA::PolicyType policy,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  // Obtain a single policy.
-
-  // = The CORBA::PolicyManager operations
-
-  virtual CORBA::PolicyList * get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-  virtual void set_policy_overrides (
-        const CORBA::PolicyList & policies,
-        CORBA::SetOverrideType set_add,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-  POA_Messaging::RelativeRoundtripTimeoutPolicy*
-      relative_roundtrip_timeout (void) const;
-
-private:
-  TAO_Policy_Manager_Impl impl_;
-  // The implementation.
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_Policy_Current_Impl
-{
-public:
-  CORBA::Policy_ptr get_policy (
-      CORBA::PolicyType policy,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  // Obtain a single policy.
-
-  // = The CORBA::PolicyManager operations
-
-  CORBA::PolicyList * get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-  void set_policy_overrides (
-        const CORBA::PolicyList & policies,
-        CORBA::SetOverrideType set_add,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-  POA_Messaging::RelativeRoundtripTimeoutPolicy*
-      relative_roundtrip_timeout (void) const;
-
-private:
-  TAO_Policy_Manager_Impl manager_impl_;
-  // The implementation.
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_Policy_Current : public POA_CORBA::PolicyCurrent
-{
-public:
-  TAO_Policy_Current (void);
-  // Constructor
-
-  CORBA::Policy_ptr get_policy (
-      CORBA::PolicyType policy,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  // Obtain a single policy.
-
-  // = The CORBA::PolicyManager operations
-
-  virtual CORBA::PolicyList * get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-  virtual void set_policy_overrides (
-        const CORBA::PolicyList & policies,
-        CORBA::SetOverrideType set_add,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-  POA_Messaging::RelativeRoundtripTimeoutPolicy*
-      relative_roundtrip_timeout (void) const;
-
-  // = Set and get the implementation.
-  TAO_Policy_Current_Impl &implementation (void) const;
-  TAO_Policy_Current_Impl &implementation (TAO_Policy_Current_Impl &);
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Policy_Manager.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
-#endif /* TAO_POLICY_MANAGER_H */
diff --git a/TAO/tao/Policy_Manager.i b/TAO/tao/Policy_Manager.i
deleted file mode 100644
index 8808dd279ac..00000000000
--- a/TAO/tao/Policy_Manager.i
+++ /dev/null
@@ -1,130 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_Policy_Manager_Impl::TAO_Policy_Manager_Impl (void)
-  :  relative_roundtrip_timeout_ (0),
-     count_ (0)
-{
-}
-
-ACE_INLINE POA_Messaging::RelativeRoundtripTimeoutPolicy*
-TAO_Policy_Manager_Impl::relative_roundtrip_timeout (void) const
-{
-  return this->relative_roundtrip_timeout_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_Policy_Manager::TAO_Policy_Manager (void)
-{
-}
-
-ACE_INLINE CORBA::Policy_ptr
-TAO_Policy_Manager::get_policy (
-      CORBA::PolicyType policy,
-      CORBA::Environment &ACE_TRY_ENV)
-{
-  return this->impl_.get_policy (policy, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::PolicyList *
-TAO_Policy_Manager::get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts,
-        CORBA::Environment &ACE_TRY_ENV)
-{
-  return this->impl_.get_policy_overrides (ts, ACE_TRY_ENV);
-}
-
-ACE_INLINE void
-TAO_Policy_Manager::set_policy_overrides (
-        const CORBA::PolicyList & policies,
-        CORBA::SetOverrideType set_add,
-        CORBA::Environment &ACE_TRY_ENV)
-{
-  this->impl_.set_policy_overrides (policies, set_add, ACE_TRY_ENV);
-}
-
-ACE_INLINE POA_Messaging::RelativeRoundtripTimeoutPolicy*
-TAO_Policy_Manager::relative_roundtrip_timeout (void) const
-{
-  return this->impl_.relative_roundtrip_timeout ();
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_Policy_Current::TAO_Policy_Current (void)
-{
-}
-
-ACE_INLINE CORBA::Policy_ptr
-TAO_Policy_Current_Impl::get_policy (
-      CORBA::PolicyType policy,
-      CORBA::Environment &ACE_TRY_ENV)
-{
-  return this->manager_impl_.get_policy (policy, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::PolicyList *
-TAO_Policy_Current_Impl::get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts,
-        CORBA::Environment &ACE_TRY_ENV)
-{
-  return this->manager_impl_.get_policy_overrides (ts, ACE_TRY_ENV);
-}
-
-ACE_INLINE void
-TAO_Policy_Current_Impl::set_policy_overrides (
-        const CORBA::PolicyList & policies,
-        CORBA::SetOverrideType set_add,
-        CORBA::Environment &ACE_TRY_ENV)
-{
-  this->manager_impl_.set_policy_overrides (policies, set_add, ACE_TRY_ENV);
-}
-
-ACE_INLINE POA_Messaging::RelativeRoundtripTimeoutPolicy*
-TAO_Policy_Current_Impl::relative_roundtrip_timeout (void) const
-{
-  return this->manager_impl_.relative_roundtrip_timeout ();
-}
-// ****************************************************************
-
-ACE_INLINE CORBA::Policy_ptr
-TAO_Policy_Current::get_policy (
-      CORBA::PolicyType policy,
-      CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Policy_Current_Impl &impl = this->implementation ();
-
-  return impl.get_policy (policy, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::PolicyList *
-TAO_Policy_Current::get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts,
-        CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Policy_Current_Impl &impl = this->implementation ();
-
-  return impl.get_policy_overrides (ts, ACE_TRY_ENV);
-}
-
-ACE_INLINE void
-TAO_Policy_Current::set_policy_overrides (
-        const CORBA::PolicyList & policies,
-        CORBA::SetOverrideType set_add,
-        CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Policy_Current_Impl &impl = this->implementation ();
-
-  impl.set_policy_overrides (policies, set_add, ACE_TRY_ENV);
-}
-
-ACE_INLINE POA_Messaging::RelativeRoundtripTimeoutPolicy*
-TAO_Policy_Current::relative_roundtrip_timeout (void) const
-{
-  TAO_Policy_Current_Impl &impl = this->implementation ();
-
-  return impl.relative_roundtrip_timeout ();
-}
diff --git a/TAO/tao/Pollable.pidl b/TAO/tao/Pollable.pidl
deleted file mode 100644
index 347aa4c9dfc..00000000000
--- a/TAO/tao/Pollable.pidl
+++ /dev/null
@@ -1,54 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   Policy.pidl
-//
-// = DESCRIPTION
-//   This file was used to generate the code in Pollable{C,S,S_T}.{h,i,cpp}
-//   The code is then hand-crafted to compile it inside the ORB, avoid
-//   cyclic dependencies and enforce the locality constraints on
-//   certain objects.
-//
-// ================================================================
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  interface PollableSet;
-
-  interface Pollable {
-    boolean is_ready(in unsigned long timeout);
-
-    PollableSet create_pollable_set( );
-  };
-
-  interface DIIPollable : Pollable { };
-
-  interface PollableSet {
-
-    exception NoPossiblePollable { };
-    exception UnknownPollable { };
-
-    DIIPollable create_dii_pollable();
-
-    void add_pollable(in Pollable potential );
-
-    Pollable poll(in unsigned long timeout)
-      raises( NoPossiblePollable );
-
-    void remove(in Pollable potential )
-      raises( UnknownPollable );
-
-    unsigned short number_left( );
-  };
-
-};
-
-#pragma prefix ""
diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp
deleted file mode 100644
index 0a27a5f3bd2..00000000000
--- a/TAO/tao/PollableC.cpp
+++ /dev/null
@@ -1,1111 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   PollableC.cpp
-//
-// = DESCRIPTION
-//   Generated from Pollable.pidl
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#include "tao/PollableC.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_POLLER)
-
-#include "tao/POA_CORBA.h"
-#include "tao/Stub.h"
-#include "tao/Invocation.h"
-#include "tao/Any.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/PollableC.i"
-#endif /* !defined INLINE */
-
-ACE_RCSID(tao, PollableC, "$Id$")
-
-CORBA_Pollable_ptr CORBA_Pollable::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA_Pollable::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Pollable:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_Pollable::_nil ());
-  if (is_a == 0)
-    return CORBA_Pollable::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/Pollable:1.0");
-  if (servant == 0)
-    return new CORBA_Pollable(stub);
-  return new POA_CORBA::_tao_collocated_Pollable(
-      ACE_reinterpret_cast(POA_CORBA::Pollable_ptr, servant),
-      stub
-    );
-}
-
-CORBA_Pollable_ptr CORBA_Pollable::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA_Pollable::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/Pollable:1.0");
-  if (servant == 0)
-    return new CORBA_Pollable(stub);
-  return new POA_CORBA::_tao_collocated_Pollable(
-      ACE_reinterpret_cast(POA_CORBA::Pollable_ptr, servant),
-      stub
-    );
-}
-
-CORBA::Boolean CORBA_Pollable::is_ready (
-    CORBA::ULong timeout,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    CORBA::Boolean _tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "is_ready",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    ACE_TRY_ENV.clear ();
-    _tao_call.start (ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << timeout)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA_PollableSet_ptr CORBA_Pollable::create_pollable_set (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    CORBA_PollableSet_ptr _tao_retval = CORBA_PollableSet::_nil ();
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_pollable_set",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    ACE_TRY_ENV.clear ();
-    _tao_call.start (ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::Boolean CORBA_Pollable::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Pollable:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
-}
-
-const char* CORBA_Pollable::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/Pollable:1.0";
-}
-
-CORBA::DIIPollable_ptr CORBA::DIIPollable::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::DIIPollable::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/DIIPollable:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::DIIPollable::_nil ());
-  if (is_a == 0)
-    return CORBA::DIIPollable::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/DIIPollable:1.0");
-  if (servant == 0)
-    return new CORBA::DIIPollable(stub);
-  return new POA_CORBA::_tao_collocated_DIIPollable(
-      ACE_reinterpret_cast(POA_CORBA::DIIPollable_ptr, servant),
-      stub
-    );
-}
-
-CORBA::DIIPollable_ptr CORBA::DIIPollable::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::DIIPollable::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/DIIPollable:1.0");
-  if (servant == 0)
-    return new CORBA::DIIPollable(stub);
-  return new POA_CORBA::_tao_collocated_DIIPollable(
-      ACE_reinterpret_cast(POA_CORBA::DIIPollable_ptr, servant),
-      stub
-    );
-}
-
-CORBA::Boolean CORBA::DIIPollable::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/DIIPollable:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Pollable:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
-}
-
-const char* CORBA::DIIPollable::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/DIIPollable:1.0";
-}
-
-CORBA_PollableSet_ptr CORBA_PollableSet::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA_PollableSet::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/PollableSet:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_PollableSet::_nil ());
-  if (is_a == 0)
-    return CORBA_PollableSet::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/PollableSet:1.0");
-  if (servant == 0)
-    return new CORBA_PollableSet(stub);
-  return new POA_CORBA::_tao_collocated_PollableSet(
-      ACE_reinterpret_cast(POA_CORBA::PollableSet_ptr, servant),
-      stub
-    );
-}
-
-CORBA_PollableSet_ptr CORBA_PollableSet::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA_PollableSet::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/PollableSet:1.0");
-  if (servant == 0)
-    return new CORBA_PollableSet(stub);
-  return new POA_CORBA::_tao_collocated_PollableSet(
-      ACE_reinterpret_cast(POA_CORBA::PollableSet_ptr, servant),
-      stub
-    );
-}
-
-// default constructor
-CORBA_PollableSet::NoPossiblePollable::NoPossiblePollable (void)
-  : CORBA_UserException (CORBA_PollableSet::_tc_NoPossiblePollable)
-{
-}
-
-// destructor - all members are of self managing types
-CORBA_PollableSet::NoPossiblePollable::~NoPossiblePollable (void)
-{
-}
-
-// copy constructor
-CORBA_PollableSet::NoPossiblePollable::NoPossiblePollable (const CORBA_PollableSet::NoPossiblePollable &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-  }
-
-// assignment operator
-CORBA_PollableSet::NoPossiblePollable&
-CORBA_PollableSet::NoPossiblePollable::operator= (const CORBA_PollableSet::NoPossiblePollable &_tao_excp)
-{
-
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-// narrow
-CORBA_PollableSet::NoPossiblePollable_ptr
-CORBA_PollableSet::NoPossiblePollable::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PollableSet/NoPossiblePollable:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (CORBA_PollableSet::NoPossiblePollable_ptr, exc);
-  else
-    return 0;
-}
-
-
-void CORBA_PollableSet::NoPossiblePollable::_raise ()
-{
-  TAO_RAISE(*this);
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *CORBA_PollableSet::NoPossiblePollable::_alloc (void)
-{
-  return new CORBA_PollableSet::NoPossiblePollable;
-}
-
-static const CORBA::Long _oc_CORBA_PollableSet_NoPossiblePollable[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  53, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f506f), ACE_NTOHL (0x6c6c6162), ACE_NTOHL (0x6c655365), ACE_NTOHL (0x742f4e6f), ACE_NTOHL (0x506f7373), ACE_NTOHL (0x69626c65), ACE_NTOHL (0x506f6c6c), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PollableSet/NoPossiblePollable:1.0
-  19, ACE_NTOHL (0x4e6f506f), ACE_NTOHL (0x73736962), ACE_NTOHL (0x6c65506f), ACE_NTOHL (0x6c6c6162), ACE_NTOHL (0x6c650000),  // name = NoPossiblePollable
-  0, // member count
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_PollableSet_NoPossiblePollable (CORBA::tk_except, sizeof (_oc_CORBA_PollableSet_NoPossiblePollable), (char *) &_oc_CORBA_PollableSet_NoPossiblePollable, 0, sizeof (CORBA_PollableSet::NoPossiblePollable));
-CORBA::TypeCode_ptr CORBA_PollableSet::_tc_NoPossiblePollable = &_tc_TAO_tc_CORBA_PollableSet_NoPossiblePollable;
-
-// default constructor
-CORBA_PollableSet::UnknownPollable::UnknownPollable (void)
-  : CORBA_UserException (CORBA_PollableSet::_tc_UnknownPollable)
-{
-}
-
-// destructor - all members are of self managing types
-CORBA_PollableSet::UnknownPollable::~UnknownPollable (void)
-{
-}
-
-// copy constructor
-CORBA_PollableSet::UnknownPollable::UnknownPollable (const CORBA_PollableSet::UnknownPollable &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-  }
-
-// assignment operator
-CORBA_PollableSet::UnknownPollable&
-CORBA_PollableSet::UnknownPollable::operator= (const CORBA_PollableSet::UnknownPollable &_tao_excp)
-{
-
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-// narrow
-CORBA_PollableSet::UnknownPollable_ptr
-CORBA_PollableSet::UnknownPollable::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PollableSet/UnknownPollable:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (CORBA_PollableSet::UnknownPollable_ptr, exc);
-  else
-    return 0;
-}
-
-
-void CORBA_PollableSet::UnknownPollable::_raise ()
-{
-  TAO_RAISE(*this);
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *CORBA_PollableSet::UnknownPollable::_alloc (void)
-{
-  return new CORBA_PollableSet::UnknownPollable;
-}
-
-static const CORBA::Long _oc_CORBA_PollableSet_UnknownPollable[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  50, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f506f), ACE_NTOHL (0x6c6c6162), ACE_NTOHL (0x6c655365), ACE_NTOHL (0x742f556e), ACE_NTOHL (0x6b6e6f77), ACE_NTOHL (0x6e506f6c), ACE_NTOHL (0x6c61626c), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/PollableSet/UnknownPollable:1.0
-  16, ACE_NTOHL (0x556e6b6e), ACE_NTOHL (0x6f776e50), ACE_NTOHL (0x6f6c6c61), ACE_NTOHL (0x626c6500),  // name = UnknownPollable
-  0, // member count
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_PollableSet_UnknownPollable (CORBA::tk_except, sizeof (_oc_CORBA_PollableSet_UnknownPollable), (char *) &_oc_CORBA_PollableSet_UnknownPollable, 0, sizeof (CORBA_PollableSet::UnknownPollable));
-CORBA::TypeCode_ptr CORBA_PollableSet::_tc_UnknownPollable = &_tc_TAO_tc_CORBA_PollableSet_UnknownPollable;
-
-CORBA::DIIPollable_ptr CORBA_PollableSet::create_dii_pollable (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    CORBA::DIIPollable_ptr _tao_retval = CORBA::DIIPollable::_nil ();
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_dii_pollable",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    ACE_TRY_ENV.clear ();
-    _tao_call.start (ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA_PollableSet::add_pollable (
-    CORBA_Pollable_ptr potential,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "add_pollable",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    ACE_TRY_ENV.clear ();
-    _tao_call.start (ACE_TRY_ENV);
-        ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << potential)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-
-  }
-
-}
-
-CORBA_Pollable_ptr CORBA_PollableSet::poll (
-    CORBA::ULong timeout,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    static TAO_Exception_Data _tao_CORBA_PollableSet_poll_exceptiondata [] =
-  {
-    {CORBA_PollableSet::_tc_NoPossiblePollable, CORBA_PollableSet::NoPossiblePollable::_alloc}
-  };
-
-  CORBA_Pollable_ptr _tao_retval = CORBA_Pollable::_nil ();
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "poll",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    ACE_TRY_ENV.clear ();
-    _tao_call.start (ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << timeout)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (_tao_CORBA_PollableSet_poll_exceptiondata, 1, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-void CORBA_PollableSet::remove (
-    CORBA_Pollable_ptr potential,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    static TAO_Exception_Data _tao_CORBA_PollableSet_remove_exceptiondata [] =
-  {
-    {CORBA_PollableSet::_tc_UnknownPollable, CORBA_PollableSet::UnknownPollable::_alloc}
-  };
-
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "remove",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    ACE_TRY_ENV.clear ();
-    _tao_call.start (ACE_TRY_ENV);
-        ACE_CHECK;
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << potential)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (_tao_CORBA_PollableSet_remove_exceptiondata, 1, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-
-    }
-    break;
-
-  }
-
-}
-
-CORBA::UShort CORBA_PollableSet::number_left (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    CORBA::UShort _tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "number_left",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    ACE_TRY_ENV.clear ();
-    _tao_call.start (ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
-    }
-    break;
-
-  }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
-}
-
-CORBA::Boolean CORBA_PollableSet::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PollableSet:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
-  else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
-}
-
-const char* CORBA_PollableSet::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/PollableSet:1.0";
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA_Pollable_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = CORBA_Pollable::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_Pollable, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_Pollable_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA_Pollable::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_Pollable, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (CORBA::_tc_Pollable, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA_Pollable::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_Pollable, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA_Pollable,CORBA_Pollable_var>;
-  template class TAO_Object_Manager<CORBA_Pollable,CORBA_Pollable_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA_Pollable,CORBA_Pollable_var>
-#  pragma instantiate TAO_Object_Manager<CORBA_Pollable,CORBA_Pollable_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::DIIPollable_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = CORBA::DIIPollable::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_DIIPollable, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::DIIPollable_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::DIIPollable::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_DIIPollable, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (CORBA::_tc_DIIPollable, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA::DIIPollable::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_DIIPollable, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA::DIIPollable,CORBA::DIIPollable_var>;
-  template class TAO_Object_Manager<CORBA::DIIPollable,CORBA::DIIPollable_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA::DIIPollable,CORBA::DIIPollable_var>
-#  pragma instantiate TAO_Object_Manager<CORBA::DIIPollable,CORBA::DIIPollable_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-void operator<<= (CORBA::Any &_tao_any, CORBA_PollableSet_ptr _tao_elem)
-{
-  CORBA::Object_ptr *_tao_obj_ptr = 0;
-  ACE_TRY_NEW_ENV
-  {
-    ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);
-    *_tao_obj_ptr = CORBA_PollableSet::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_PollableSet, _tao_obj_ptr, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_obj_ptr;
-  }
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_PollableSet_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA_PollableSet::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_PollableSet, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    CORBA::Object_var _tao_obj_var;
-    ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
-    if (stream.decode (CORBA::_tc_PollableSet, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA_PollableSet::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      *tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object
-      ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_PollableSet, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Field_T<CORBA_PollableSet,CORBA_PollableSet_var>;
-  template class TAO_Object_Manager<CORBA_PollableSet,CORBA_PollableSet_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA_PollableSet,CORBA_PollableSet_var>
-#  pragma instantiate TAO_Object_Manager<CORBA_PollableSet,CORBA_PollableSet_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA_PollableSet::NoPossiblePollable &_tao_elem) // copying
-{
-  CORBA_PollableSet::NoPossiblePollable *_tao_any_val = new CORBA_PollableSet::NoPossiblePollable (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA_PollableSet::_tc_NoPossiblePollable, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA_PollableSet::NoPossiblePollable *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA_PollableSet::_tc_NoPossiblePollable, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_PollableSet::NoPossiblePollable *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA_PollableSet::_tc_NoPossiblePollable, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA_PollableSet::NoPossiblePollable *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA_PollableSet::NoPossiblePollable, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA_PollableSet::_tc_NoPossiblePollable, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA_PollableSet::_tc_NoPossiblePollable, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA_PollableSet::UnknownPollable &_tao_elem) // copying
-{
-  CORBA_PollableSet::UnknownPollable *_tao_any_val = new CORBA_PollableSet::UnknownPollable (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA_PollableSet::_tc_UnknownPollable, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA_PollableSet::UnknownPollable *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA_PollableSet::_tc_UnknownPollable, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_PollableSet::UnknownPollable *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA_PollableSet::_tc_UnknownPollable, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA_PollableSet::UnknownPollable *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA_PollableSet::UnknownPollable, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA_PollableSet::_tc_UnknownPollable, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA_PollableSet::_tc_UnknownPollable, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-// ****************************************************************
-
-CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA_Pollable_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA_Pollable_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA_Pollable::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA_DIIPollable_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA_DIIPollable_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA_DIIPollable::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA_PollableSet_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA_PollableSet_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA_PollableSet::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_POLLER */
diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h
deleted file mode 100644
index 28562d59e52..00000000000
--- a/TAO/tao/PollableC.h
+++ /dev/null
@@ -1,442 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   PollableC.h
-//
-// = DESCRIPTION
-//   Generated from Pollable.pidl
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#ifndef TAO_IDL_POLLABLEC_H
-#define TAO_IDL_POLLABLEC_H
-
-#include "tao/corbafwd.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_POLLER)
-
-#include "tao/Object.h"
-#include "tao/Exception.h"
-#include "tao/CDR.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class CORBA_PollableSet;
-typedef CORBA_PollableSet *CORBA_PollableSet_ptr;
-
-class TAO_Export CORBA_PollableSet_var
-{
-public:
-  CORBA_PollableSet_var (void); // default constructor
-  CORBA_PollableSet_var (CORBA_PollableSet_ptr);
-  CORBA_PollableSet_var (const CORBA_PollableSet_var &); // copy constructor
-  ~CORBA_PollableSet_var (void); // destructor
-
-  CORBA_PollableSet_var &operator= (CORBA_PollableSet_ptr);
-  CORBA_PollableSet_var &operator= (const CORBA_PollableSet_var &);
-  CORBA_PollableSet_ptr operator-> (void) const;
-
-  operator const CORBA_PollableSet_ptr &() const;
-  operator CORBA_PollableSet_ptr &();
-  // in, inout, out, _retn
-  CORBA_PollableSet_ptr in (void) const;
-  CORBA_PollableSet_ptr &inout (void);
-  CORBA_PollableSet_ptr &out (void);
-  CORBA_PollableSet_ptr _retn (void);
-  CORBA_PollableSet_ptr ptr (void) const;
-
-private:
-  CORBA_PollableSet_ptr ptr_;
-};
-
-class TAO_Export CORBA_PollableSet_out
-{
-public:
-  CORBA_PollableSet_out (CORBA_PollableSet_ptr &);
-  CORBA_PollableSet_out (CORBA_PollableSet_var &);
-  CORBA_PollableSet_out (const CORBA_PollableSet_out &);
-  CORBA_PollableSet_out &operator= (const CORBA_PollableSet_out &);
-  CORBA_PollableSet_out &operator= (const CORBA_PollableSet_var &);
-  CORBA_PollableSet_out &operator= (CORBA_PollableSet_ptr);
-  operator CORBA_PollableSet_ptr &();
-  CORBA_PollableSet_ptr &ptr (void);
-  CORBA_PollableSet_ptr operator-> (void);
-
-private:
-  CORBA_PollableSet_ptr &ptr_;
-};
-
-class CORBA_Pollable;
-typedef CORBA_Pollable *CORBA_Pollable_ptr;
-
-class TAO_Export CORBA_Pollable_var
-{
-public:
-  CORBA_Pollable_var (void); // default constructor
-  CORBA_Pollable_var (CORBA_Pollable_ptr);
-  CORBA_Pollable_var (const CORBA_Pollable_var &); // copy constructor
-  ~CORBA_Pollable_var (void); // destructor
-
-  CORBA_Pollable_var &operator= (CORBA_Pollable_ptr);
-  CORBA_Pollable_var &operator= (const CORBA_Pollable_var &);
-  CORBA_Pollable_ptr operator-> (void) const;
-
-  operator const CORBA_Pollable_ptr &() const;
-  operator CORBA_Pollable_ptr &();
-  // in, inout, out, _retn
-  CORBA_Pollable_ptr in (void) const;
-  CORBA_Pollable_ptr &inout (void);
-  CORBA_Pollable_ptr &out (void);
-  CORBA_Pollable_ptr _retn (void);
-  CORBA_Pollable_ptr ptr (void) const;
-
-private:
-  CORBA_Pollable_ptr ptr_;
-};
-
-class TAO_Export CORBA_Pollable_out
-{
-public:
-  CORBA_Pollable_out (CORBA_Pollable_ptr &);
-  CORBA_Pollable_out (CORBA_Pollable_var &);
-  CORBA_Pollable_out (const CORBA_Pollable_out &);
-  CORBA_Pollable_out &operator= (const CORBA_Pollable_out &);
-  CORBA_Pollable_out &operator= (const CORBA_Pollable_var &);
-  CORBA_Pollable_out &operator= (CORBA_Pollable_ptr);
-  operator CORBA_Pollable_ptr &();
-  CORBA_Pollable_ptr &ptr (void);
-  CORBA_Pollable_ptr operator-> (void);
-
-private:
-  CORBA_Pollable_ptr &ptr_;
-};
-
-class TAO_Export CORBA_Pollable : public virtual CORBA_Object
-{
- public:
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_Pollable_ptr _ptr_type;
-  typedef CORBA_Pollable_var _var_type;
-#endif /* __GNUC__ */
-
-  // the static operations
-  static CORBA_Pollable_ptr _duplicate (CORBA_Pollable_ptr obj);
-  static CORBA_Pollable_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static CORBA_Pollable_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static CORBA_Pollable_ptr _nil (void);
-
-  virtual CORBA::Boolean is_ready (
-      CORBA::ULong timeout,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  virtual CORBA_PollableSet_ptr create_pollable_set (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  virtual const char* _interface_repository_id (void) const;
-protected:
-  CORBA_Pollable (void); // default constructor
-  CORBA_Pollable (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
-      CORBA::Boolean _tao_collocated = 0
-    );
-  virtual ~CORBA_Pollable (void);
-private:
-  CORBA_Pollable (const CORBA_Pollable &);
-  void operator= (const CORBA_Pollable &);
-};
-
-class CORBA_DIIPollable;
-typedef CORBA_DIIPollable *CORBA_DIIPollable_ptr;
-
-class TAO_Export CORBA_DIIPollable_var
-{
-public:
-  CORBA_DIIPollable_var (void); // default constructor
-  CORBA_DIIPollable_var (CORBA_DIIPollable_ptr);
-  CORBA_DIIPollable_var (const CORBA_DIIPollable_var &); // copy constructor
-  ~CORBA_DIIPollable_var (void); // destructor
-
-  CORBA_DIIPollable_var &operator= (CORBA_DIIPollable_ptr);
-  CORBA_DIIPollable_var &operator= (const CORBA_DIIPollable_var &);
-  CORBA_DIIPollable_ptr operator-> (void) const;
-
-  operator const CORBA_DIIPollable_ptr &() const;
-  operator CORBA_DIIPollable_ptr &();
-  // in, inout, out, _retn
-  CORBA_DIIPollable_ptr in (void) const;
-  CORBA_DIIPollable_ptr &inout (void);
-  CORBA_DIIPollable_ptr &out (void);
-  CORBA_DIIPollable_ptr _retn (void);
-  CORBA_DIIPollable_ptr ptr (void) const;
-
-private:
-  CORBA_DIIPollable_ptr ptr_;
-};
-
-class TAO_Export CORBA_DIIPollable_out
-{
-public:
-  CORBA_DIIPollable_out (CORBA_DIIPollable_ptr &);
-  CORBA_DIIPollable_out (CORBA_DIIPollable_var &);
-  CORBA_DIIPollable_out (const CORBA_DIIPollable_out &);
-  CORBA_DIIPollable_out &operator= (const CORBA_DIIPollable_out &);
-  CORBA_DIIPollable_out &operator= (const CORBA_DIIPollable_var &);
-  CORBA_DIIPollable_out &operator= (CORBA_DIIPollable_ptr);
-  operator CORBA_DIIPollable_ptr &();
-  CORBA_DIIPollable_ptr &ptr (void);
-  CORBA_DIIPollable_ptr operator-> (void);
-
-private:
-  CORBA_DIIPollable_ptr &ptr_;
-};
-
-class TAO_Export CORBA_DIIPollable: public virtual CORBA_Pollable
-{
-public:
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_DIIPollable_ptr _ptr_type;
-  typedef CORBA_DIIPollable_var _var_type;
-#endif /* __GNUC__ */
-
-  // the static operations
-  static CORBA_DIIPollable_ptr _duplicate (CORBA_DIIPollable_ptr obj);
-  static CORBA_DIIPollable_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static CORBA_DIIPollable_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static CORBA_DIIPollable_ptr _nil (void);
-
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  virtual const char* _interface_repository_id (void) const;
-protected:
-  CORBA_DIIPollable (void); // default constructor
-  CORBA_DIIPollable (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
-      CORBA::Boolean _tao_collocated = 0
-    );
-  virtual ~CORBA_DIIPollable (void);
-private:
-  CORBA_DIIPollable (const CORBA_DIIPollable &);
-  void operator= (const CORBA_DIIPollable &);
-};
-
-class TAO_Export CORBA_PollableSet : public virtual ACE_CORBA_1 (Object)
-{
-public:
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_PollableSet_ptr _ptr_type;
-  typedef CORBA_PollableSet_var _var_type;
-#endif /* __GNUC__ */
-
-  // the static operations
-  static CORBA_PollableSet_ptr _duplicate (CORBA_PollableSet_ptr obj);
-  static CORBA_PollableSet_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static CORBA_PollableSet_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static CORBA_PollableSet_ptr _nil (void);
-
-  class NoPossiblePollable;
-  typedef NoPossiblePollable *NoPossiblePollable_ptr;
-
-  class TAO_Export NoPossiblePollable : public CORBA::UserException
-  {
-  public:
-    // ****************
-    // The fields (and their helper classes)
-
-
-    // End of implicit types for the fields
-    // ****************
-
-    NoPossiblePollable (void); // default ctor
-    NoPossiblePollable (const NoPossiblePollable &); // copy ctor
-    ~NoPossiblePollable (void); // dtor
-          NoPossiblePollable &operator= (const NoPossiblePollable &);
-
-
-    virtual void _raise (void);
-
-    static NoPossiblePollable *_narrow (CORBA::Exception *);
-
-
-    // = TAO extension
-    static CORBA::Exception *_alloc (void);
-
-  }; // exception CORBA::PollableSet::NoPossiblePollable
-
-  static CORBA::TypeCode_ptr _tc_NoPossiblePollable;
-
-  class UnknownPollable;
-  typedef UnknownPollable *UnknownPollable_ptr;
-
-  class TAO_Export UnknownPollable : public CORBA::UserException
-  {
-  public:
-    // ****************
-    // The fields (and their helper classes)
-
-
-    // End of implicit types for the fields
-    // ****************
-
-    UnknownPollable (void); // default ctor
-    UnknownPollable (const UnknownPollable &); // copy ctor
-    ~UnknownPollable (void); // dtor
-          UnknownPollable &operator= (const UnknownPollable &);
-
-
-    virtual void _raise (void);
-
-    static UnknownPollable *_narrow (CORBA::Exception *);
-
-
-    // = TAO extension
-    static CORBA::Exception *_alloc (void);
-
-  }; // exception CORBA::PollableSet::UnknownPollable
-
-  static CORBA::TypeCode_ptr _tc_UnknownPollable;
-
-
-  virtual CORBA_DIIPollable_ptr create_dii_pollable (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  virtual void add_pollable (
-      CORBA_Pollable_ptr potential,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  virtual CORBA_Pollable_ptr poll (
-      CORBA::ULong timeout,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  virtual void remove (
-      CORBA_Pollable_ptr potential,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  virtual CORBA::UShort number_left (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  virtual const char* _interface_repository_id (void) const;
-protected:
-  CORBA_PollableSet (void); // default constructor
-  CORBA_PollableSet (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
-      CORBA::Boolean _tao_collocated = 0
-    );
-  virtual ~CORBA_PollableSet (void);
-private:
-  CORBA_PollableSet (const CORBA_PollableSet &);
-  void operator= (const CORBA_PollableSet &);
-};
-
-// Any operators for interface CORBA_Pollable
-void TAO_Export operator<<= (CORBA::Any &, CORBA_Pollable_ptr);
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, CORBA_Pollable *&);
-// Any operators for interface CORBA::DIIPollable
-void TAO_Export operator<<= (CORBA::Any &, CORBA::DIIPollable_ptr);
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, CORBA::DIIPollable *&);
-// Any operators for interface CORBA_PollableSet
-void TAO_Export operator<<= (CORBA::Any &, CORBA_PollableSet_ptr);
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, CORBA_PollableSet *&);
-void TAO_Export operator<<= (CORBA::Any &, const CORBA_PollableSet::NoPossiblePollable &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, CORBA_PollableSet::NoPossiblePollable*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, CORBA_PollableSet::NoPossiblePollable *&);
-void TAO_Export operator<<= (CORBA::Any &, const CORBA_PollableSet::UnknownPollable &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, CORBA_PollableSet::UnknownPollable*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, CORBA_PollableSet::UnknownPollable *&);
-
-#ifndef __ACE_INLINE__
-
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const CORBA_Pollable_ptr );
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, CORBA_Pollable_ptr &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const CORBA::DIIPollable_ptr );
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, CORBA::DIIPollable_ptr &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const CORBA_PollableSet_ptr );
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, CORBA_PollableSet_ptr &);
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const CORBA_PollableSet::NoPossiblePollable &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, CORBA_PollableSet::NoPossiblePollable &);
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const CORBA_PollableSet::UnknownPollable &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, CORBA_PollableSet::UnknownPollable &);
-
-#endif /* __ACE_INLINE__ */
-
-
-#if defined (__ACE_INLINE__)
-#include "PollableC.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_POLLER */
-
-#endif /* TAO_IDL_POLLABLEC_H */
diff --git a/TAO/tao/PollableC.i b/TAO/tao/PollableC.i
deleted file mode 100644
index 5b365ad2053..00000000000
--- a/TAO/tao/PollableC.i
+++ /dev/null
@@ -1,648 +0,0 @@
-// $Id$
-
-ACE_INLINE
-CORBA_Pollable::CORBA_Pollable (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA_Pollable::CORBA_Pollable (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA_Pollable::~CORBA_Pollable (void) // destructor
-{}
-
-ACE_INLINE CORBA_Pollable_ptr
-CORBA_Pollable::_duplicate (CORBA_Pollable_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE CORBA_Pollable_ptr
-CORBA_Pollable::_nil (void)
-{
-  return (CORBA_Pollable_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_Pollable_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_Pollable_var::CORBA_Pollable_var (void) // default constructor
-  : ptr_ (CORBA_Pollable::_nil ())
-{}
-
-ACE_INLINE
-CORBA_Pollable_var::CORBA_Pollable_var (CORBA_Pollable_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA_Pollable_ptr
-CORBA_Pollable_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Pollable_var::CORBA_Pollable_var (const CORBA_Pollable_var &p) // copy constructor
-  : ptr_ (CORBA_Pollable::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_Pollable_var::~CORBA_Pollable_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_Pollable_var &
-CORBA_Pollable_var::operator= (CORBA_Pollable_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_Pollable_var &
-CORBA_Pollable_var::operator= (const CORBA_Pollable_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_Pollable::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_Pollable_var::operator const CORBA_Pollable_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Pollable_var::operator CORBA_Pollable_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Pollable_ptr
-CORBA_Pollable_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Pollable_ptr
-CORBA_Pollable_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Pollable_ptr &
-CORBA_Pollable_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Pollable_ptr &
-CORBA_Pollable_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_Pollable::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Pollable_ptr
-CORBA_Pollable_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_Pollable_ptr val = this->ptr_;
-  this->ptr_ = CORBA_Pollable::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_Pollable_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_Pollable_out::CORBA_Pollable_out (CORBA_Pollable_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA_Pollable::_nil ();
-}
-
-ACE_INLINE
-CORBA_Pollable_out::CORBA_Pollable_out (CORBA_Pollable_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_Pollable::_nil ();
-}
-
-ACE_INLINE
-CORBA_Pollable_out::CORBA_Pollable_out (const CORBA_Pollable_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_Pollable_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_Pollable_out &
-CORBA_Pollable_out::operator= (const CORBA_Pollable_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_Pollable_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_Pollable_out &
-CORBA_Pollable_out::operator= (const CORBA_Pollable_var &p)
-{
-  this->ptr_ = CORBA_Pollable::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_Pollable_out &
-CORBA_Pollable_out::operator= (CORBA_Pollable_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_Pollable_out::operator CORBA_Pollable_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Pollable_ptr &
-CORBA_Pollable_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Pollable_ptr
-CORBA_Pollable_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_DIIPollable::CORBA_DIIPollable (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA_DIIPollable::CORBA_DIIPollable (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA_DIIPollable::~CORBA_DIIPollable (void) // destructor
-{}
-
-ACE_INLINE CORBA_DIIPollable_ptr
-CORBA_DIIPollable::_duplicate (CORBA_DIIPollable_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE CORBA_DIIPollable_ptr
-CORBA_DIIPollable::_nil (void)
-{
-  return (CORBA_DIIPollable_ptr)0;
-}
-
-
-// *************************************************************
-// Inline operations for class CORBA_DIIPollable_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_DIIPollable_var::CORBA_DIIPollable_var (void) // default constructor
-  : ptr_ (CORBA_DIIPollable::_nil ())
-{}
-
-ACE_INLINE
-CORBA_DIIPollable_var::CORBA_DIIPollable_var (CORBA_DIIPollable_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA_DIIPollable_ptr
-CORBA_DIIPollable_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_DIIPollable_var::CORBA_DIIPollable_var (const CORBA_DIIPollable_var &p) // copy constructor
-  : ptr_ (CORBA_DIIPollable::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_DIIPollable_var::~CORBA_DIIPollable_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_DIIPollable_var &
-CORBA_DIIPollable_var::operator= (CORBA_DIIPollable_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_DIIPollable_var &
-CORBA_DIIPollable_var::operator= (const CORBA_DIIPollable_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_DIIPollable::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_DIIPollable_var::operator const CORBA_DIIPollable_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_DIIPollable_var::operator CORBA_DIIPollable_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DIIPollable_ptr
-CORBA_DIIPollable_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DIIPollable_ptr
-CORBA_DIIPollable_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DIIPollable_ptr &
-CORBA_DIIPollable_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DIIPollable_ptr &
-CORBA_DIIPollable_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_DIIPollable::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DIIPollable_ptr
-CORBA_DIIPollable_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_DIIPollable_ptr val = this->ptr_;
-  this->ptr_ = CORBA_DIIPollable::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_DIIPollable_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_DIIPollable_out::CORBA_DIIPollable_out (CORBA_DIIPollable_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA_DIIPollable::_nil ();
-}
-
-ACE_INLINE
-CORBA_DIIPollable_out::CORBA_DIIPollable_out (CORBA_DIIPollable_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_DIIPollable::_nil ();
-}
-
-ACE_INLINE
-CORBA_DIIPollable_out::CORBA_DIIPollable_out (const CORBA_DIIPollable_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_DIIPollable_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_DIIPollable_out &
-CORBA_DIIPollable_out::operator= (const CORBA_DIIPollable_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_DIIPollable_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_DIIPollable_out &
-CORBA_DIIPollable_out::operator= (const CORBA_DIIPollable_var &p)
-{
-  this->ptr_ = CORBA_DIIPollable::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_DIIPollable_out &
-CORBA_DIIPollable_out::operator= (CORBA_DIIPollable_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_DIIPollable_out::operator CORBA_DIIPollable_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DIIPollable_ptr &
-CORBA_DIIPollable_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DIIPollable_ptr
-CORBA_DIIPollable_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_PollableSet::CORBA_PollableSet (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA_PollableSet::CORBA_PollableSet (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA_PollableSet::~CORBA_PollableSet (void) // destructor
-{}
-
-ACE_INLINE CORBA_PollableSet_ptr
-CORBA_PollableSet::_duplicate (CORBA_PollableSet_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE CORBA_PollableSet_ptr
-CORBA_PollableSet::_nil (void)
-{
-  return (CORBA_PollableSet_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_PollableSet_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_PollableSet_var::CORBA_PollableSet_var (void) // default constructor
-  : ptr_ (CORBA_PollableSet::_nil ())
-{}
-
-ACE_INLINE
-CORBA_PollableSet_var::CORBA_PollableSet_var (CORBA_PollableSet_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA_PollableSet_ptr
-CORBA_PollableSet_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_PollableSet_var::CORBA_PollableSet_var (const CORBA_PollableSet_var &p) // copy constructor
-  : ptr_ (CORBA_PollableSet::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_PollableSet_var::~CORBA_PollableSet_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_PollableSet_var &
-CORBA_PollableSet_var::operator= (CORBA_PollableSet_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_PollableSet_var &
-CORBA_PollableSet_var::operator= (const CORBA_PollableSet_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_PollableSet::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_PollableSet_var::operator const CORBA_PollableSet_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_PollableSet_var::operator CORBA_PollableSet_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PollableSet_ptr
-CORBA_PollableSet_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PollableSet_ptr
-CORBA_PollableSet_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PollableSet_ptr &
-CORBA_PollableSet_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PollableSet_ptr &
-CORBA_PollableSet_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_PollableSet::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PollableSet_ptr
-CORBA_PollableSet_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_PollableSet_ptr val = this->ptr_;
-  this->ptr_ = CORBA_PollableSet::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_PollableSet_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_PollableSet_out::CORBA_PollableSet_out (CORBA_PollableSet_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA_PollableSet::_nil ();
-}
-
-ACE_INLINE
-CORBA_PollableSet_out::CORBA_PollableSet_out (CORBA_PollableSet_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_PollableSet::_nil ();
-}
-
-ACE_INLINE
-CORBA_PollableSet_out::CORBA_PollableSet_out (const CORBA_PollableSet_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_PollableSet_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_PollableSet_out &
-CORBA_PollableSet_out::operator= (const CORBA_PollableSet_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_PollableSet_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_PollableSet_out &
-CORBA_PollableSet_out::operator= (const CORBA_PollableSet_var &p)
-{
-  this->ptr_ = CORBA_PollableSet::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_PollableSet_out &
-CORBA_PollableSet_out::operator= (CORBA_PollableSet_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_PollableSet_out::operator CORBA_PollableSet_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PollableSet_ptr &
-CORBA_PollableSet_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PollableSet_ptr
-CORBA_PollableSet_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for exception CORBA_PollableSet::NoPossiblePollable
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception CORBA_PollableSet::UnknownPollable
-// *************************************************************
-
-CORBA::Boolean TAO_Export
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA_PollableSet_ptr
-  );
-CORBA::Boolean TAO_Export
-operator>> (
-    TAO_InputCDR &,
-    CORBA_PollableSet_ptr &
-  );
-
-CORBA::Boolean TAO_Export
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA_Pollable_ptr
-  );
-CORBA::Boolean TAO_Export
-operator>> (
-    TAO_InputCDR &,
-    CORBA_Pollable_ptr &
-  );
-
-CORBA::Boolean TAO_Export
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA_DIIPollable_ptr
-  );
-CORBA::Boolean TAO_Export
-operator>> (
-    TAO_InputCDR &,
-    CORBA_DIIPollable_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_PollableSet::NoPossiblePollable &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_PollableSet::NoPossiblePollable &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_PollableSet::UnknownPollable &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_PollableSet::UnknownPollable &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
diff --git a/TAO/tao/PollableS.cpp b/TAO/tao/PollableS.cpp
deleted file mode 100644
index 7471731932d..00000000000
--- a/TAO/tao/PollableS.cpp
+++ /dev/null
@@ -1,950 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   PollableS.cpp
-//
-// = DESCRIPTION
-//   Generated from Pollable.pidl
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#include "tao/PollableS.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_POLLER)
-
-#include "tao/Operation_Table.h"
-#include "tao/Server_Request.h"
-
-#if !defined (__ACE_INLINE__)
-#include "PollableS.i"
-#endif /* !defined INLINE */
-
-ACE_RCSID(tao, PollableS, "$Id$")
-
-class TAO_CORBA_Pollable_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-{
-private:
-  unsigned int hash (const char *str, unsigned int len);
-public:
- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-};
-/* starting time is 15:37:47 */
-/* C++ code produced by gperf version 2.7 (GNU C++ version) */
-/* Command-line: /project/macarena/coryan/head/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Pollable_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_CORBA_Pollable_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20,  0, 20,  0, 20,  0,
-     20, 20, 20, 20, 20,  0, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20,  0, 20, 20, 20,
-     20,  0, 20, 20, 20, 20, 20, 20,
-    };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
-}
-
-const class TAO_operation_db_entry *
-TAO_CORBA_Pollable_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 4,
-      MIN_WORD_LENGTH = 5,
-      MAX_WORD_LENGTH = 19,
-      MIN_HASH_VALUE = 5,
-      MAX_HASH_VALUE = 19,
-      HASH_VALUE_RANGE = 15,
-      DUPLICATES = 0
-    };
-
-  static const class TAO_operation_db_entry  wordlist[] =
-    {
-      {"",0}, {"",0}, {"",0}, {"",0}, {"",0},
-      {"_is_a",  &POA_CORBA::Pollable::_is_a_skel},
-      {"",0}, {"",0},
-      {"is_ready",      &POA_CORBA::Pollable::is_ready_skel},
-      {"",0}, {"",0}, {"",0}, {"",0},
-      {"_non_existent",  &POA_CORBA::Pollable::_non_existent_skel},
-      {"",0}, {"",0}, {"",0}, {"",0}, {"",0},
-      {"create_pollable_set",   &POA_CORBA::Pollable::create_pollable_set_skel},
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      unsigned int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-        {
-          const char *s = wordlist[key].opname_;
-
-          if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
-/* ending time is 15:37:47 */
-TAO_CORBA_Pollable_Perfect_Hash_OpTable tao_CORBA_Pollable_optable;
-// skeleton constructor
-POA_CORBA::Pollable::Pollable (void)
-{
-  this->optable_ = &tao_CORBA_Pollable_optable;
-}
-
-// copy ctor
-POA_CORBA::Pollable::Pollable (const Pollable& rhs)
-  :   TAO_ServantBase (rhs)
-{}
-// skeleton destructor
-POA_CORBA::Pollable::~Pollable (void)
-{
-}
-void POA_CORBA::Pollable::is_ready_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-)
-{
-  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Pollable *_tao_impl = (POA_CORBA::Pollable *)_tao_object_reference;
-  CORBA::Boolean _tao_retval = 0;
-  CORBA::ULong timeout;
-  if (!(
-    (_tao_in >> timeout)
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-  _tao_retval = _tao_impl->is_ready (
-    timeout,
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_CORBA::Pollable::create_pollable_set_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-)
-{
-  POA_CORBA::Pollable *_tao_impl = (POA_CORBA::Pollable *)_tao_object_reference;
-  CORBA::PollableSet_var _tao_retval;
-  _tao_retval = _tao_impl->create_pollable_set (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval.in ())
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_CORBA::Pollable::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel CORBA_Pollable_is_a_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0},
-    {CORBA::_tc_string, CORBA::ARG_IN, 0}
-  };
-  static const TAO_Call_Data_Skel CORBA_Pollable_is_a_calldata =
-  {"_is_a", 1, 2, CORBA_Pollable_is_a_paramdata};
-  POA_CORBA::Pollable_ptr  _tao_impl = (POA_CORBA::Pollable_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  CORBA::String_var _tao_value;
-  _tao_server_request.demarshal (
-    ACE_TRY_ENV,
-    &CORBA_Pollable_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-  ACE_CHECK;
-  _tao_retval = _tao_impl->_is_a (_tao_value.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &CORBA_Pollable_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-}
-
-CORBA::Boolean POA_CORBA::Pollable::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Pollable:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void POA_CORBA::Pollable::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * /* _tao_object_reference */ ,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel CORBA_Pollable_non_existent_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0}
-  };
-  static const TAO_Call_Data_Skel CORBA_Pollable_non_existent_calldata =
-  {"_non_existent", 1, 1, CORBA_Pollable_non_existent_paramdata};
-  CORBA::Boolean _tao_retval = 0;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &CORBA_Pollable_non_existent_calldata,
-    &_tao_retval
-  );
-}
-
-void* POA_CORBA::Pollable::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Pollable:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Pollable_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_CORBA::Pollable::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
-}
-
-const char* POA_CORBA::Pollable::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/Pollable:1.0";
-}
-
-POA_CORBA::_tao_collocated_Pollable::_tao_collocated_Pollable (
-    POA_CORBA::Pollable_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_CORBA_1 (Pollable) (),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_CORBA::Pollable_ptr POA_CORBA::_tao_collocated_Pollable::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_CORBA::_tao_collocated_Pollable::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-CORBA::Boolean POA_CORBA::_tao_collocated_Pollable::is_ready  (
-    CORBA::ULong timeout,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->is_ready (
-    timeout,
-    ACE_TRY_ENV
-  );
-}
-
-CORBA::PollableSet_ptr POA_CORBA::_tao_collocated_Pollable::create_pollable_set  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->create_pollable_set (
-    ACE_TRY_ENV
-  );
-}
-
-
-CORBA::Pollable*
-POA_CORBA::Pollable::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_CORBA::_tao_collocated_Pollable (this, stub);
-}
-
-class TAO_CORBA_DIIPollable_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-{
-private:
-  unsigned int hash (const char *str, unsigned int len);
-public:
- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-};
-/* starting time is 15:37:47 */
-/* C++ code produced by gperf version 2.7 (GNU C++ version) */
-/* Command-line: /project/macarena/coryan/head/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_DIIPollable_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_CORBA_DIIPollable_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20,  0, 20,  0, 20,  0,
-     20, 20, 20, 20, 20,  0, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20,  0, 20, 20, 20,
-     20,  0, 20, 20, 20, 20, 20, 20,
-    };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
-}
-
-const class TAO_operation_db_entry *
-TAO_CORBA_DIIPollable_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 4,
-      MIN_WORD_LENGTH = 5,
-      MAX_WORD_LENGTH = 19,
-      MIN_HASH_VALUE = 5,
-      MAX_HASH_VALUE = 19,
-      HASH_VALUE_RANGE = 15,
-      DUPLICATES = 0
-    };
-
-  static const class TAO_operation_db_entry  wordlist[] =
-    {
-      {"",0}, {"",0}, {"",0}, {"",0}, {"",0},
-      {"_is_a",  &POA_CORBA::DIIPollable::_is_a_skel},
-      {"",0}, {"",0},
-      {"is_ready",      &POA_CORBA::DIIPollable::is_ready_skel},
-      {"",0}, {"",0}, {"",0}, {"",0},
-      {"_non_existent",  &POA_CORBA::DIIPollable::_non_existent_skel},
-      {"",0}, {"",0}, {"",0}, {"",0}, {"",0},
-      {"create_pollable_set",   &POA_CORBA::DIIPollable::create_pollable_set_skel},
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      unsigned int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-        {
-          const char *s = wordlist[key].opname_;
-
-          if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
-/* ending time is 15:37:47 */
-TAO_CORBA_DIIPollable_Perfect_Hash_OpTable tao_CORBA_DIIPollable_optable;
-// skeleton constructor
-POA_CORBA::DIIPollable::DIIPollable (void)
-{
-  this->optable_ = &tao_CORBA_DIIPollable_optable;
-}
-
-// copy ctor
-POA_CORBA::DIIPollable::DIIPollable (const DIIPollable& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Pollable) (rhs),
-    TAO_ServantBase (rhs)
-{}
-// skeleton destructor
-POA_CORBA::DIIPollable::~DIIPollable (void)
-{
-}
-void POA_CORBA::DIIPollable::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel CORBA_DIIPollable_is_a_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0},
-    {CORBA::_tc_string, CORBA::ARG_IN, 0}
-  };
-  static const TAO_Call_Data_Skel CORBA_DIIPollable_is_a_calldata =
-  {"_is_a", 1, 2, CORBA_DIIPollable_is_a_paramdata};
-  POA_CORBA::DIIPollable_ptr  _tao_impl = (POA_CORBA::DIIPollable_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  CORBA::String_var _tao_value;
-  _tao_server_request.demarshal (
-    ACE_TRY_ENV,
-    &CORBA_DIIPollable_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-  ACE_CHECK;
-  _tao_retval = _tao_impl->_is_a (_tao_value.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &CORBA_DIIPollable_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-}
-
-CORBA::Boolean POA_CORBA::DIIPollable::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/DIIPollable:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Pollable:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void POA_CORBA::DIIPollable::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * /* _tao_object_reference */ ,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel CORBA_DIIPollable_non_existent_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0}
-  };
-  static const TAO_Call_Data_Skel CORBA_DIIPollable_non_existent_calldata =
-  {"_non_existent", 1, 1, CORBA_DIIPollable_non_existent_paramdata};
-  CORBA::Boolean _tao_retval = 0;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &CORBA_DIIPollable_non_existent_calldata,
-    &_tao_retval
-  );
-}
-
-void* POA_CORBA::DIIPollable::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/DIIPollable:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::DIIPollable_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Pollable:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Pollable_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_CORBA::DIIPollable::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
-}
-
-const char* POA_CORBA::DIIPollable::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/DIIPollable:1.0";
-}
-
-POA_CORBA::_tao_collocated_DIIPollable::_tao_collocated_DIIPollable (
-    POA_CORBA::DIIPollable_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_CORBA_1 (DIIPollable) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Pollable) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_CORBA::DIIPollable_ptr POA_CORBA::_tao_collocated_DIIPollable::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_CORBA::_tao_collocated_DIIPollable::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-
-CORBA::DIIPollable*
-POA_CORBA::DIIPollable::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_CORBA::_tao_collocated_DIIPollable (this, stub);
-}
-
-class TAO_CORBA_PollableSet_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-{
-private:
-  unsigned int hash (const char *str, unsigned int len);
-public:
- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-};
-/* starting time is 15:37:47 */
-/* C++ code produced by gperf version 2.7 (GNU C++ version) */
-/* Command-line: /project/macarena/coryan/head/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_PollableSet_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_CORBA_PollableSet_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20,  0, 20,  0, 20,  0,
-     20,  0, 20, 20, 20, 20, 20, 20,  0, 20,
-      0, 20,  0, 20,  0, 20,  0, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20,
-    };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
-}
-
-const class TAO_operation_db_entry *
-TAO_CORBA_PollableSet_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 7,
-      MIN_WORD_LENGTH = 4,
-      MAX_WORD_LENGTH = 19,
-      MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 19,
-      HASH_VALUE_RANGE = 16,
-      DUPLICATES = 0
-    };
-
-  static const class TAO_operation_db_entry  wordlist[] =
-    {
-      {"",0}, {"",0}, {"",0}, {"",0},
-      {"poll",  &POA_CORBA::PollableSet::poll_skel},
-      {"_is_a",  &POA_CORBA::PollableSet::_is_a_skel},
-      {"remove",        &POA_CORBA::PollableSet::remove_skel},
-      {"",0}, {"",0}, {"",0}, {"",0},
-      {"number_left",   &POA_CORBA::PollableSet::number_left_skel},
-      {"add_pollable",  &POA_CORBA::PollableSet::add_pollable_skel},
-      {"_non_existent",  &POA_CORBA::PollableSet::_non_existent_skel},
-      {"",0}, {"",0}, {"",0}, {"",0}, {"",0},
-      {"create_dii_pollable",   &POA_CORBA::PollableSet::create_dii_pollable_skel},
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      unsigned int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-        {
-          const char *s = wordlist[key].opname_;
-
-          if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
-/* ending time is 15:37:47 */
-TAO_CORBA_PollableSet_Perfect_Hash_OpTable tao_CORBA_PollableSet_optable;
-// skeleton constructor
-POA_CORBA::PollableSet::PollableSet (void)
-{
-  this->optable_ = &tao_CORBA_PollableSet_optable;
-}
-
-// copy ctor
-POA_CORBA::PollableSet::PollableSet (const PollableSet& rhs)
-  :   TAO_ServantBase (rhs)
-{}
-// skeleton destructor
-POA_CORBA::PollableSet::~PollableSet (void)
-{
-}
-void POA_CORBA::PollableSet::create_dii_pollable_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-)
-{
-  POA_CORBA::PollableSet *_tao_impl = (POA_CORBA::PollableSet *)_tao_object_reference;
-  CORBA::DIIPollable_var _tao_retval;
-  _tao_retval = _tao_impl->create_dii_pollable (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval.in ())
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_CORBA::PollableSet::add_pollable_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-)
-{
-  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::PollableSet *_tao_impl = (POA_CORBA::PollableSet *)_tao_object_reference;
-  CORBA::Pollable_var potential;
-  if (!(
-    (_tao_in >> potential.out ())
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-  _tao_impl->add_pollable (
-    potential.in (),
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-}
-
-void POA_CORBA::PollableSet::poll_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-)
-{
-  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::PollableSet *_tao_impl = (POA_CORBA::PollableSet *)_tao_object_reference;
-  CORBA::Pollable_var _tao_retval;
-  CORBA::ULong timeout;
-  if (!(
-    (_tao_in >> timeout)
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-  _tao_retval = _tao_impl->poll (
-    timeout,
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval.in ())
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_CORBA::PollableSet::remove_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-)
-{
-  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::PollableSet *_tao_impl = (POA_CORBA::PollableSet *)_tao_object_reference;
-  CORBA::Pollable_var potential;
-  if (!(
-    (_tao_in >> potential.out ())
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-  _tao_impl->remove (
-    potential.in (),
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-}
-
-void POA_CORBA::PollableSet::number_left_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-)
-{
-  POA_CORBA::PollableSet *_tao_impl = (POA_CORBA::PollableSet *)_tao_object_reference;
-  CORBA::UShort _tao_retval = 0;
-  _tao_retval = _tao_impl->number_left (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval)
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_CORBA::PollableSet::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel CORBA_PollableSet_is_a_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0},
-    {CORBA::_tc_string, CORBA::ARG_IN, 0}
-  };
-  static const TAO_Call_Data_Skel CORBA_PollableSet_is_a_calldata =
-  {"_is_a", 1, 2, CORBA_PollableSet_is_a_paramdata};
-  POA_CORBA::PollableSet_ptr  _tao_impl = (POA_CORBA::PollableSet_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  CORBA::String_var _tao_value;
-  _tao_server_request.demarshal (
-    ACE_TRY_ENV,
-    &CORBA_PollableSet_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-  ACE_CHECK;
-  _tao_retval = _tao_impl->_is_a (_tao_value.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &CORBA_PollableSet_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-}
-
-CORBA::Boolean POA_CORBA::PollableSet::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PollableSet:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void POA_CORBA::PollableSet::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * /* _tao_object_reference */ ,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel CORBA_PollableSet_non_existent_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0}
-  };
-  static const TAO_Call_Data_Skel CORBA_PollableSet_non_existent_calldata =
-  {"_non_existent", 1, 1, CORBA_PollableSet_non_existent_paramdata};
-  CORBA::Boolean _tao_retval = 0;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &CORBA_PollableSet_non_existent_calldata,
-    &_tao_retval
-  );
-}
-
-void* POA_CORBA::PollableSet::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/PollableSet:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::PollableSet_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_CORBA::PollableSet::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
-}
-
-const char* POA_CORBA::PollableSet::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/PollableSet:1.0";
-}
-
-POA_CORBA::_tao_collocated_PollableSet::_tao_collocated_PollableSet (
-    POA_CORBA::PollableSet_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_CORBA_1 (PollableSet) (),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_CORBA::PollableSet_ptr POA_CORBA::_tao_collocated_PollableSet::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_CORBA::_tao_collocated_PollableSet::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-CORBA::DIIPollable_ptr POA_CORBA::_tao_collocated_PollableSet::create_dii_pollable  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->create_dii_pollable (
-    ACE_TRY_ENV
-  );
-}
-
-void POA_CORBA::_tao_collocated_PollableSet::add_pollable  (
-    CORBA::Pollable_ptr potential,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->servant_->add_pollable (
-    potential,
-    ACE_TRY_ENV
-  );
-}
-
-CORBA::Pollable_ptr POA_CORBA::_tao_collocated_PollableSet::poll  (
-    CORBA::ULong timeout,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->poll (
-    timeout,
-    ACE_TRY_ENV
-  );
-}
-
-void POA_CORBA::_tao_collocated_PollableSet::remove  (
-    CORBA::Pollable_ptr potential,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->servant_->remove (
-    potential,
-    ACE_TRY_ENV
-  );
-}
-
-CORBA::UShort POA_CORBA::_tao_collocated_PollableSet::number_left  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->number_left (
-    ACE_TRY_ENV
-  );
-}
-
-
-CORBA::PollableSet*
-POA_CORBA::PollableSet::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_CORBA::_tao_collocated_PollableSet (this, stub);
-}
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_POLLER */
diff --git a/TAO/tao/PollableS.h b/TAO/tao/PollableS.h
deleted file mode 100644
index 6c977edd778..00000000000
--- a/TAO/tao/PollableS.h
+++ /dev/null
@@ -1,237 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   PollableC.h
-//
-// = DESCRIPTION
-//   Generated from Pollable.pidl
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#ifndef TAO_IDL_POLLABLES_H
-#define TAO_IDL_POLLABLES_H
-
-#include "tao/PollableC.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_POLLER)
-
-#include "tao/POA_CORBA.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if 0
-TAO_NAMESPACE  POA_CORBA
-{
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export Pollable_tie : public Pollable
-  {
-  public:
-    Pollable_tie (T &t);
-    // the T& ctor
-    Pollable_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    Pollable_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    Pollable_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~Pollable_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Boolean is_ready (
-        CORBA::ULong timeout,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::PollableSet_ptr create_pollable_set (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    Pollable_tie (const Pollable_tie &);
-    void operator= (const Pollable_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export DIIPollable_tie : public DIIPollable
-  {
-  public:
-    DIIPollable_tie (T &t);
-    // the T& ctor
-    DIIPollable_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    DIIPollable_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    DIIPollable_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~DIIPollable_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Boolean is_ready (
-        CORBA::ULong timeout,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::PollableSet_ptr create_pollable_set (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    DIIPollable_tie (const DIIPollable_tie &);
-    void operator= (const DIIPollable_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export PollableSet_tie : public PollableSet
-  {
-  public:
-    PollableSet_tie (T &t);
-    // the T& ctor
-    PollableSet_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    PollableSet_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    PollableSet_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~PollableSet_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::DIIPollable_ptr create_dii_pollable (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    void add_pollable (
-        CORBA::Pollable_ptr potential,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Pollable_ptr poll (
-        CORBA::ULong timeout,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    void remove (
-        CORBA::Pollable_ptr potential,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::UShort number_left (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    PollableSet_tie (const PollableSet_tie &);
-    void operator= (const PollableSet_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-};
-
-#include "PollableS_T.h"
-#endif /* 0 */
-
-#if defined (__ACE_INLINE__)
-#include "PollableS.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_POLLER */
-
-#endif /* ifndef */
diff --git a/TAO/tao/PollableS.i b/TAO/tao/PollableS.i
deleted file mode 100644
index 4356126e508..00000000000
--- a/TAO/tao/PollableS.i
+++ /dev/null
@@ -1,33 +0,0 @@
-// $Id$
-
-ACE_INLINE void POA_CORBA::DIIPollable::is_ready_skel (
-    CORBA::ServerRequest &req,
-    void *obj,
-    void *context,
-    CORBA::Environment &env
-  )
-{
-  POA_CORBA::Pollable_ptr impl = (POA_CORBA::DIIPollable_ptr) obj;
-  POA_CORBA::Pollable::is_ready_skel (
-      req,
-      (POA_CORBA::Pollable_ptr) impl,
-      context,
-       env
-    );
-}
-
-ACE_INLINE void POA_CORBA::DIIPollable::create_pollable_set_skel (
-    CORBA::ServerRequest &req,
-    void *obj,
-    void *context,
-    CORBA::Environment &env
-  )
-{
-  POA_CORBA::Pollable_ptr impl = (POA_CORBA::DIIPollable_ptr) obj;
-  POA_CORBA::Pollable::create_pollable_set_skel (
-      req,
-      (POA_CORBA::Pollable_ptr) impl,
-      context,
-       env
-    );
-}
diff --git a/TAO/tao/PollableS_T.cpp b/TAO/tao/PollableS_T.cpp
deleted file mode 100644
index b220702989c..00000000000
--- a/TAO/tao/PollableS_T.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#ifndef _TAO_IDL_POLLABLES_T_CPP_
-#define _TAO_IDL_POLLABLES_T_CPP_
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#include "PollableS_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "PollableS_T.i"
-#endif /* !defined INLINE */
-
-
-#endif /* ifndef */
diff --git a/TAO/tao/PollableS_T.h b/TAO/tao/PollableS_T.h
deleted file mode 100644
index 6f5211ec1e9..00000000000
--- a/TAO/tao/PollableS_T.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#ifndef _TAO_IDL_POLLABLES_T_H_
-#define _TAO_IDL_POLLABLES_T_H_
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-#if defined (__ACE_INLINE__)
-#include "PollableS_T.i"
-#endif /* defined INLINE */
-
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "PollableS_T.cpp"
-#endif /* defined REQUIRED SOURCE */
-
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("PollableS_T.cpp")
-#endif /* defined REQUIRED PRAGMA */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* ifndef */
diff --git a/TAO/tao/PollableS_T.i b/TAO/tao/PollableS_T.i
deleted file mode 100644
index dc79b5284eb..00000000000
--- a/TAO/tao/PollableS_T.i
+++ /dev/null
@@ -1,350 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_CORBA::Pollable_tie<T>::Pollable_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::Pollable_tie<T>::Pollable_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::Pollable_tie<T>::Pollable_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::Pollable_tie<T>::Pollable_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::Pollable_tie<T>::~Pollable_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::Pollable_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::Pollable_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::Pollable_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::Pollable_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::Pollable_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::Pollable_tie<T>::_default_POA (CORBA::Environment &env)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-
-  return this->Pollabe::_default_POA (env);
-}
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::Pollable_tie<T>::is_ready  (
-    CORBA::ULong timeout,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->is_ready (
-    timeout,
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::PollableSet_ptr POA_CORBA::Pollable_tie<T>::create_pollable_set  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->create_pollable_set (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_CORBA::DIIPollable_tie<T>::DIIPollable_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::DIIPollable_tie<T>::DIIPollable_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::DIIPollable_tie<T>::DIIPollable_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::DIIPollable_tie<T>::DIIPollable_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::DIIPollable_tie<T>::~DIIPollable_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::DIIPollable_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::DIIPollable_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::DIIPollable_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::DIIPollable_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::DIIPollable_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::DIIPollable_tie<T>::_default_POA (CORBA::Environment &env)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-
-  return this->DIIPollabe::_default_POA (env);
-}
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::DIIPollable_tie<T>::is_ready  (
-    CORBA::ULong timeout,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->is_ready (
-    timeout,
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::PollableSet_ptr POA_CORBA::DIIPollable_tie<T>::create_pollable_set  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->create_pollable_set (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_CORBA::PollableSet_tie<T>::PollableSet_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::PollableSet_tie<T>::PollableSet_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::PollableSet_tie<T>::PollableSet_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::PollableSet_tie<T>::PollableSet_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::PollableSet_tie<T>::~PollableSet_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::PollableSet_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::PollableSet_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::PollableSet_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::PollableSet_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::PollableSet_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::PollableSet_tie<T>::_default_POA (CORBA::Environment &env)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-
-  return this->PollabeSet::_default_POA (env);
-}
-
-template <class T> ACE_INLINE
-CORBA::DIIPollable_ptr POA_CORBA::PollableSet_tie<T>::create_dii_pollable  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->create_dii_pollable (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-void POA_CORBA::PollableSet_tie<T>::add_pollable  (
-    CORBA::Pollable_ptr potential,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->add_pollable (
-    potential,
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Pollable_ptr POA_CORBA::PollableSet_tie<T>::poll  (
-    CORBA::ULong timeout,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->poll (
-    timeout,
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-void POA_CORBA::PollableSet_tie<T>::remove  (
-    CORBA::Pollable_ptr potential,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->remove (
-    potential,
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::UShort POA_CORBA::PollableSet_tie<T>::number_left  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->number_left (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
diff --git a/TAO/tao/Principal.cpp b/TAO/tao/Principal.cpp
deleted file mode 100644
index ce7cf946db0..00000000000
--- a/TAO/tao/Principal.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-// $Id$
-
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-// ORB:		Principal identifier pseudo-objref
-
-#include "tao/Principal.h"
-#include "tao/CDR.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/Principal.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(tao, Principal, "$Id$")
-
-CORBA_Principal::CORBA_Principal (void)
-  : refcount_ (1)
-{
-}
-
-CORBA_Principal::~CORBA_Principal (void)
-{
-}
-
-CORBA::Boolean
-operator<< (TAO_OutputCDR& cdr, CORBA_Principal* x)
-{
-  if (x != 0)
-    {
-      CORBA::ULong length  = x->id.length ();
-      cdr.write_long (length);
-      cdr.write_octet_array (x->id.get_buffer (), length);
-    }
-  else
-    {
-      cdr.write_ulong (0);
-    }
-  return cdr.good_bit ();
-}
-
-CORBA::Boolean
-operator>> (TAO_InputCDR& cdr, CORBA_Principal*& x)
-{
-  CORBA::ULong length;
-  cdr.read_ulong (length);
-  if (length == 0 || !cdr.good_bit ())
-    {
-      x = 0;
-    }
-  else
-    {
-      ACE_NEW_RETURN (x, CORBA::Principal, 0);
-      x->id.length (length);
-      cdr.read_octet_array (x->id.get_buffer (), length);
-    }
-  return cdr.good_bit ();
-}
diff --git a/TAO/tao/Principal.h b/TAO/tao/Principal.h
deleted file mode 100644
index af0cfb5c066..00000000000
--- a/TAO/tao/Principal.h
+++ /dev/null
@@ -1,160 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    principal.h
-//
-// = DESCRIPTION
-//    The CORBA_Principal pseudo-object implementation.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//
-// ============================================================================
-
-#ifndef TAO_PRINCIPAL_H
-#define TAO_PRINCIPAL_H
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Sequence.h"
-
-class TAO_Export CORBA_Principal
-{
-  // = TITLE
-  //    A "Principal" identifies an authenticated entity in the
-  //    network administration framework.  Identities are used to
-  //    control acccess (authorization) as well as in audit trails
-  //    (accountability).
-public:
-  // To applications, the identifier is an opaque ID.
-
-  //  CORBA::SEQUENCE <CORBA::Octet> id;
-  CORBA::OctetSeq id;
-
-  // @@ add "==", "<", ">" operators
-
-  // The pseudo object operations.
-  static CORBA_Principal* _duplicate (CORBA_Principal*);
-  static CORBA_Principal* _nil (void);
-
-  // = Stuff required for memory management.
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
-
-  CORBA_Principal (void);
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_Principal_ptr _ptr_type;
-  typedef CORBA_Principal_var _var_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
-private:
-  ~CORBA_Principal (void);
-
-  // = these are not provided
-  CORBA_Principal &operator = (const CORBA::Principal_ptr &);
-  CORBA_Principal (const CORBA::Principal_ptr &);
-
-private:
-  CORBA::ULong refcount_;
-  // Number of outstanding references to this object.
-
-  ACE_SYNCH_MUTEX refcount_mutex_;
-  // Protect the reference count, this is OK because we do no
-  // duplicates or releases on the critical path.
-
-#if defined (__GNUG__)
-  // G++ (even 2.6.3) stupidly thinks instances can't be created.
-  // This de-warns.
-  friend class everyone_needs_a_friend;
-#endif /* __GNUG__ */
-};
-
-class TAO_Export CORBA_Principal_var
-{
-  // = TITLE
-  //   The T_var class for Principal
-  //
-  // = DESCRIPTION
-  //   As any other pseudo object Principal must have a T_var class,
-  //   the interface an semantics are specified in the CORBA spec.
-  //
-  // = NOTE
-  //   We use CORBA_Principal_ptr as the _ptr type instead of
-  //   CORBA::Principal_ptr, this is an attempt to reduced the cyclic
-  //   dependencies in TAO.
-  //
-public:
-  CORBA_Principal_var (void);
-  CORBA_Principal_var (CORBA_Principal_ptr);
-  CORBA_Principal_var (const CORBA_Principal_var &);
-  ~CORBA_Principal_var (void);
-
-  CORBA_Principal_var &operator= (CORBA_Principal_ptr);
-  CORBA_Principal_var &operator= (const CORBA_Principal_var &);
-  CORBA_Principal_ptr operator-> (void) const;
-
-  operator const CORBA_Principal_ptr &() const;
-  operator CORBA_Principal_ptr &();
-  // in, inout, out, _retn
-  CORBA_Principal_ptr in (void) const;
-  CORBA_Principal_ptr &inout (void);
-  CORBA_Principal_ptr &out (void);
-  CORBA_Principal_ptr _retn (void);
-  CORBA_Principal_ptr ptr (void) const;
-
-private:
-  CORBA_Principal_ptr ptr_;
-};
-
-class TAO_Export CORBA_Principal_out
-{
-  // = TITLE
-  //   The T_out class for Principal
-  //
-  // = DESCRIPTION
-  //   As any other pseudo object Principal must have a T_out class,
-  //   the interface an semantics are specified in the CORBA spec.
-  //
-  // = NOTE
-  //   We use CORBA_Principal_ptr as the _ptr type instead of
-  //   CORBA::Principal_ptr, this is an attempt to reduced the cyclic
-  //   dependencies in TAO.
-  //
-public:
-  CORBA_Principal_out (CORBA_Principal_ptr &);
-  CORBA_Principal_out (CORBA_Principal_var &);
-  CORBA_Principal_out (CORBA_Principal_out &);
-  CORBA_Principal_out &operator= (CORBA_Principal_out &);
-  CORBA_Principal_out &operator= (const CORBA_Principal_var &);
-  CORBA_Principal_out &operator= (CORBA_Principal_ptr);
-  operator CORBA_Principal_ptr &();
-  CORBA_Principal_ptr &ptr (void);
-  CORBA_Principal_ptr operator-> (void);
-
-private:
-  CORBA_Principal_ptr &ptr_;
-};
-
-extern TAO_Export CORBA::Boolean
-operator<< (TAO_OutputCDR&, CORBA_Principal*);
-
-extern TAO_Export CORBA::Boolean
-operator>> (TAO_InputCDR&, CORBA_Principal*&);
-
-#if defined (__ACE_INLINE__)
-# include "tao/Principal.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_PRINCIPAL_H */
diff --git a/TAO/tao/Principal.i b/TAO/tao/Principal.i
deleted file mode 100644
index 03979d2bbb2..00000000000
--- a/TAO/tao/Principal.i
+++ /dev/null
@@ -1,210 +0,0 @@
-// $Id$
-
-ACE_INLINE CORBA::Boolean
-CORBA::is_nil (CORBA::Principal_ptr principal)
-{
-  return (CORBA::Boolean) (principal == 0);
-}
-
-ACE_INLINE CORBA::ULong
-CORBA_Principal::_decr_refcnt (void)
-{
-  {
-    this->refcount_--;
-    if (this->refcount_ != 0)
-      return this->refcount_;
-  }
-
-  delete this;
-  return 0;
-}
-
-ACE_INLINE void
-CORBA::release (CORBA::Principal_ptr principal)
-{
-  if (principal)
-    principal->_decr_refcnt ();
-}
-
-ACE_INLINE CORBA::ULong
-CORBA_Principal::_incr_refcnt (void)
-{
-  return this->refcount_++;
-}
-
-
-ACE_INLINE CORBA_Principal*
-CORBA_Principal::_duplicate (CORBA_Principal* x)
-{
-  if (x != 0)
-    x->_incr_refcnt ();
-  return x;
-}
-
-
-ACE_INLINE CORBA_Principal*
-CORBA_Principal::_nil (void)
-{
-  return 0;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_Principal_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_Principal_var::CORBA_Principal_var (void)
-  : ptr_ (CORBA_Principal::_nil ())
-{
-}
-
-ACE_INLINE
-CORBA_Principal_var::CORBA_Principal_var (CORBA_Principal_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_Principal_var::~CORBA_Principal_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_Principal_ptr
-CORBA_Principal_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Principal_var::CORBA_Principal_var (const CORBA_Principal_var &p)
-  : ptr_ (CORBA_Principal::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE CORBA_Principal_var &
-CORBA_Principal_var::operator= (CORBA_Principal_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_Principal_var &
-CORBA_Principal_var::operator= (const CORBA_Principal_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_Principal::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_Principal_var::operator const CORBA_Principal_ptr &() const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Principal_var::operator CORBA_Principal_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Principal_ptr
-CORBA_Principal_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Principal_ptr
-CORBA_Principal_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Principal_ptr &
-CORBA_Principal_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Principal_ptr &
-CORBA_Principal_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_Principal::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Principal_ptr
-CORBA_Principal_var::_retn (void)
-{
-  // yield ownership
-  CORBA_Principal_ptr val = this->ptr_;
-  this->ptr_ = CORBA_Principal::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_Principal_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_Principal_out::CORBA_Principal_out (CORBA_Principal_ptr &p)
-        : ptr_ (p)
-{
-  this->ptr_ = CORBA_Principal::_nil ();
-}
-
-ACE_INLINE
-CORBA_Principal_out::CORBA_Principal_out (CORBA_Principal_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_Principal::_nil ();
-}
-
-ACE_INLINE
-CORBA_Principal_out::CORBA_Principal_out (CORBA_Principal_out &p)
-  : ptr_ (p.ptr_)
-{}
-
-ACE_INLINE CORBA_Principal_out &
-CORBA_Principal_out::operator= (CORBA_Principal_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_Principal_out &
-CORBA_Principal_out::operator= (const CORBA_Principal_var &p)
-{
-  this->ptr_ = CORBA_Principal::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_Principal_out &
-CORBA_Principal_out::operator= (CORBA_Principal_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_Principal_out::operator CORBA_Principal_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Principal_ptr &
-CORBA_Principal_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Principal_ptr
-CORBA_Principal_out::operator-> (void)
-{
-  return this->ptr_;
-}
diff --git a/TAO/tao/Protocol_Factory.cpp b/TAO/tao/Protocol_Factory.cpp
deleted file mode 100644
index 364f6605918..00000000000
--- a/TAO/tao/Protocol_Factory.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-// $Id$
-
-#include "tao/Protocol_Factory.h"
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID(tao, Protocol_Factory, "$Id$")
-
-static const char prefix_[] = "\0";
-
-TAO_Protocol_Factory::TAO_Protocol_Factory (void)
-{
-}
-
-TAO_Protocol_Factory::~TAO_Protocol_Factory (void)
-{
-}
-
-int
-TAO_Protocol_Factory::init (int /* argc */,
-                            char * /* argv */ [])
-{
- return -1;
-}
-
-TAO_Acceptor *
-TAO_Protocol_Factory::make_acceptor (void)
-{
-  return 0;
-}
-
-TAO_Connector *
-TAO_Protocol_Factory::make_connector (void)
-{
-  return 0;
-}
-
-int
-TAO_Protocol_Factory::match_prefix (const ACE_CString & /* prefix */)
-{
-  return 0;
-}
-
-const char *
-TAO_Protocol_Factory::prefix (void) const
-{
-  return ::prefix_;
-}
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<TAO_Protocol_Factory>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<TAO_Protocol_Factory>
-
-#endif
diff --git a/TAO/tao/Protocol_Factory.h b/TAO/tao/Protocol_Factory.h
deleted file mode 100644
index 29afa4a1c2e..00000000000
--- a/TAO/tao/Protocol_Factory.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   Protocol_Factory.h
-//
-// = AUTHOR
-//   Fred Kuhns <fredk@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_PROTOCOL_FACTORY_H
-#define TAO_PROTOCOL_FACTORY_H
-
-#include "ace/Service_Object.h"
-#include "ace/Strategies_T.h"
-#include "ace/SString.h"
-#include "tao/Pluggable.h"
-#include "tao/GIOP.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-class TAO_Export TAO_Protocol_Factory : public ACE_Service_Object
-{
-public:
-  TAO_Protocol_Factory (void);
-  virtual ~TAO_Protocol_Factory (void);
-
-  virtual int init (int argc, char *argv[]);
-  // Initialization hook.
-
-  virtual int match_prefix (const ACE_CString &prefix);
-  // Verify prefix is a match
-
-  virtual const char *prefix (void) const;
-  // Returns the prefix used by the protocol.
-
-  // Factory methods
-  virtual TAO_Acceptor  *make_acceptor (void);
-  // Create an acceptor
-
-  virtual TAO_Connector *make_connector  (void);
-  // Create a connector
-
-  virtual int requires_explicit_endpoint (void) const = 0;
-  // Some protocols should not create a default endpoint unless the
-  // user specifies a -ORBendpoint option. For example, local IPC
-  // (aka UNIX domain sockets) is unable to remove the rendesvouz
-  // point if the server crashes.  For those protocols is better to
-  // create the endpoint only if the user requests one.
-};
-
-#endif /* TAO_PROTOCOL_FACTORY_H */
diff --git a/TAO/tao/Reply_Dispatcher.cpp b/TAO/tao/Reply_Dispatcher.cpp
deleted file mode 100644
index 54de0dc3963..00000000000
--- a/TAO/tao/Reply_Dispatcher.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-// $Id$
-
-#include "tao/Reply_Dispatcher.h"
-#include "tao/debug.h"
-#include "tao/ORB_Core.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/Reply_Dispatcher.i"
-#endif /* __ACE_INLINE__ */
-
-// Constructor.
-TAO_Reply_Dispatcher::TAO_Reply_Dispatcher (void)
-  //  : reply_received_ (0)
-{
-}
-
-// Destructor.
-TAO_Reply_Dispatcher::~TAO_Reply_Dispatcher (void)
-{
-}
-
-TAO_GIOP_Message_State *
-TAO_Reply_Dispatcher::message_state (void) const
-{
-  return 0;
-}
-
-// int
-// TAO_Reply_Dispatcher::reply_received (void) const
-// {
-//   return reply_received_;
-// }
-
-// *********************************************************************
-
-// Constructor.
-TAO_Synch_Reply_Dispatcher::TAO_Synch_Reply_Dispatcher (TAO_ORB_Core *orb_core)
-  : message_state_ (0),
-    reply_cdr_ (orb_core->create_input_cdr_data_block (ACE_CDR::DEFAULT_BUFSIZE),
-                TAO_ENCAP_BYTE_ORDER,
-                orb_core)
-{
-}
-
-// Destructor.
-TAO_Synch_Reply_Dispatcher::~TAO_Synch_Reply_Dispatcher (void)
-{
-}
-
-// Dispatch the reply.
-int
-TAO_Synch_Reply_Dispatcher::dispatch_reply (CORBA::ULong reply_status,
-                                            const TAO_GIOP_Version &version,
-                                            TAO_GIOP_ServiceContextList &reply_ctx,
-                                            TAO_GIOP_Message_State *message_state)
-{
-  // this->reply_received_ = 1;
-
-  this->reply_status_ = reply_status;
-  this->version_ = version;
-  this->message_state_ = message_state;
-
-  // Steal the buffer, that way we don't do any unnecesary copies of
-  // this data.
-  CORBA::ULong max = reply_ctx.maximum ();
-  CORBA::ULong len = reply_ctx.length ();
-  TAO_GIOP_ServiceContext* context_list = reply_ctx.get_buffer (1);
-  this->reply_ctx_.replace (max, len, context_list, 1);
-
-  // Steal the buffer so that no copying is done.
-  this->reply_cdr_.steal_from (message_state->cdr);
-  return 1;
-}
-
-TAO_GIOP_Message_State *
-TAO_Synch_Reply_Dispatcher::message_state (void) const
-{
-  return this->message_state_;
-}
-
-TAO_InputCDR &
-TAO_Synch_Reply_Dispatcher::reply_cdr (void)
-{
-  return this->reply_cdr_;
-}
-
-
-// *********************************************************************
-#if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_POLLER)
-// Constructor.
-TAO_Asynch_Reply_Dispatcher::TAO_Asynch_Reply_Dispatcher (const TAO_Reply_Handler_Skeleton &reply_handler_skel,
-                                                          Messaging::ReplyHandler_ptr reply_handler_ptr)
-  : reply_handler_skel_ (reply_handler_skel),
-    reply_handler_ (reply_handler_ptr)
-{
-}
-
-// Destructor.
-TAO_Asynch_Reply_Dispatcher::~TAO_Asynch_Reply_Dispatcher (void)
-{
-}
-
-// Dispatch the reply.
-int
-TAO_Asynch_Reply_Dispatcher::dispatch_reply (CORBA::ULong reply_status,
-                                             const TAO_GIOP_Version &version,
-                                             TAO_GIOP_ServiceContextList &reply_ctx,
-                                             TAO_GIOP_Message_State *message_state)
-{
-  // this->reply_received_ = 1;
-
-  this->reply_status_ = reply_status;
-  this->version_ = version;
-  this->message_state_ = message_state;
-
-  // Steal the buffer, that way we don't do any unnecesary copies of
-  // this data.
-  CORBA::ULong max = reply_ctx.maximum ();
-  CORBA::ULong len = reply_ctx.length ();
-  TAO_GIOP_ServiceContext* context_list = reply_ctx.get_buffer (1);
-  this->reply_ctx_.replace (max, len, context_list, 1);
-
-  if (TAO_debug_level >= 4)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P | %t):TAO_Asynch_Reply_Dispatcher::dispatch_reply:\n"));
-    }
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  // Call the Reply Handler's skeleton.
-  reply_handler_skel_ (message_state_->cdr,
-                       reply_handler_,
-                       ACE_TRY_ENV);
-
-  // This was dynamically allocated. Now the job is done. Commit
-  // suicide here.
-  delete this;
-
-  return 1;
-}
-
-TAO_GIOP_Message_State *
-TAO_Asynch_Reply_Dispatcher::message_state (void) const
-{
-  return this->message_state_;
-}
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_POLLER */
diff --git a/TAO/tao/Reply_Dispatcher.h b/TAO/tao/Reply_Dispatcher.h
deleted file mode 100644
index 5066ef0845f..00000000000
--- a/TAO/tao/Reply_Dispatcher.h
+++ /dev/null
@@ -1,196 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     Reply_Dispatcher.h
-//
-// = DESCRIPTION
-//     Dispatch the reply appropriately.
-//
-// = AUTHOR
-//     Alexander Babu Arulanthu <alex@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_REPLY_DISPATCHER_H
-#define TAO_REPLY_DISPATCHER_H
-
-#include "tao/GIOP.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/MessagingC.h"
-
-// Forward Declarations.
-
-class TAO_Stub;
-class TAO_InputCDR;
-
-class TAO_Export TAO_Reply_Dispatcher
-{
-  // = TITLE
-  //
-  // = DESCRIPTION
-  //
-
-public:
-  TAO_Reply_Dispatcher (void);
-  // Constructor.
-
-  virtual ~TAO_Reply_Dispatcher (void);
-  // Destructor.
-
-  virtual int dispatch_reply (CORBA::ULong reply_status,
-                              const TAO_GIOP_Version& version,
-                              TAO_GIOP_ServiceContextList& reply_ctx,
-                              TAO_GIOP_Message_State* message_state) = 0;
-  // Dispatch the reply. Return 1 on sucess, -1 on error.
-
-  virtual TAO_GIOP_Message_State *message_state (void) const;
-  // Get the Message State into which the reply has been read.
-
-  // virtual int reply_received (void) const;
-  // Return the reply received flag.
-
-  // protected:
-  // int reply_received_;
-  // Reply received flag.
-};
-
-// *********************************************************************
-
-class TAO_Export TAO_Synch_Reply_Dispatcher : public TAO_Reply_Dispatcher
-{
-  // = TITLE
-  //
-  //     Reply dispatcher for Synchoronous Method Invocation (SMI)s.
-  //
-  // = DESCRIPTION
-  //
-
-public:
-  TAO_Synch_Reply_Dispatcher (TAO_ORB_Core *orb_core);
-  // Constructor.
-
-  virtual ~TAO_Synch_Reply_Dispatcher (void);
-  // Destructor.
-
-  CORBA::ULong reply_status (void) const;
-  // Get the reply status.
-
-  const TAO_GIOP_Version& version (void) const;
-  // Get the GIOP version.
-
-  TAO_GIOP_ServiceContextList& reply_ctx (void);
-  // Get the reply context
-
-  virtual int dispatch_reply (CORBA::ULong reply_status,
-                              const TAO_GIOP_Version& version,
-                              TAO_GIOP_ServiceContextList& reply_ctx,
-                              TAO_GIOP_Message_State* message_state);
-  // Dispatch the reply. Copy the buffers and return. Since the
-  // invocation is synchronous demarshalling will take place on the
-  // stack.
-  // Return 1 on sucess, -1 on error.
-
-  virtual TAO_GIOP_Message_State *message_state (void) const;
-  // Return the message state of this invocation.
-
-  virtual TAO_InputCDR &reply_cdr (void);
-  // Return the reply CDR.
-
-private:
-  CORBA::ULong reply_status_;
-  // Reply or LocateReply status.
-
-  TAO_GIOP_Version version_;
-  // The version
-
-  TAO_GIOP_ServiceContextList reply_ctx_;
-  // The service context list
-
-  TAO_GIOP_Message_State *message_state_;
-  // CDR stream for reading the input.
-  // @@ Carlos : message_state should go away. All we need is the reply
-  //    cdr. Is that rite? (Alex).
-
-  TAO_InputCDR reply_cdr_;
-  // CDR where the reply message is placed.
-};
-
-// *********************************************************************
-#if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_POLLER)
-class TAO_Export TAO_Asynch_Reply_Dispatcher : public TAO_Reply_Dispatcher
-{
-  // = TITLE
-  //
-  //     Reply dispatcher for Asynchoronous Method Invocation (AMI)s.
-  //
-  // = DESCRIPTION
-  //
-
-public:
-  TAO_Asynch_Reply_Dispatcher (const TAO_Reply_Handler_Skeleton &reply_handler_skel,
-                               Messaging::ReplyHandler_ptr reply_handler_ptr);
-  // Constructor.
-
-  virtual ~TAO_Asynch_Reply_Dispatcher (void);
-  // Destructor.
-
-  CORBA::ULong reply_status (void) const;
-  // Get the reply status.
-
-  const TAO_GIOP_Version& version (void) const;
-  // Get the GIOP version
-
-  TAO_GIOP_ServiceContextList& reply_ctx (void);
-  // Get the reply context
-
-  virtual int dispatch_reply (CORBA::ULong reply_status,
-                              const TAO_GIOP_Version& version,
-                              TAO_GIOP_ServiceContextList& reply_ctx,
-                              TAO_GIOP_Message_State* message_state);
-  // Dispatch the reply. This involves demarshalling the reply and
-  // calling the appropriate call back hook method on the reply
-  // handler.
-  // Return 1 on sucess, -1 on error.
-
-  virtual TAO_GIOP_Message_State *message_state (void) const;
-  // Return the message state.
-
-private:
-  CORBA::ULong reply_status_;
-  // Reply or LocateReply status.
-
-  TAO_GIOP_Version version_;
-  // The version
-
-  TAO_GIOP_ServiceContextList reply_ctx_;
-  // The service context list
-
-  TAO_GIOP_Message_State *message_state_;
-  // CDR stream for reading the input.
-  // @@ Carlos : message_state should go away. All we need is the reply
-  //    cdr. Is that rite? (Alex).
-
-  const TAO_Reply_Handler_Skeleton reply_handler_skel_;
-  // Skeleton for the call back method in the Reply Handler.
-
-  Messaging::ReplyHandler_ptr reply_handler_;
-  // Reply Handler passed in the Asynchronous Invocation.
-};
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_POLLER */
-// *********************************************************************
-
-#if defined (__ACE_INLINE__)
-#include "tao/Reply_Dispatcher.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_REPLY_DISPATCHER_H */
diff --git a/TAO/tao/Reply_Dispatcher.i b/TAO/tao/Reply_Dispatcher.i
deleted file mode 100644
index 826563e3eb5..00000000000
--- a/TAO/tao/Reply_Dispatcher.i
+++ /dev/null
@@ -1,19 +0,0 @@
-// $Id$
-
-ACE_INLINE CORBA::ULong
-TAO_Synch_Reply_Dispatcher::reply_status (void) const
-{
-  return this->reply_status_;
-}
-
-ACE_INLINE const TAO_GIOP_Version&
-TAO_Synch_Reply_Dispatcher::version (void) const
-{
-  return this->version_;
-}
-
-ACE_INLINE TAO_GIOP_ServiceContextList&
-TAO_Synch_Reply_Dispatcher::reply_ctx (void)
-{
-  return this->reply_ctx_;
-}
diff --git a/TAO/tao/Request.cpp b/TAO/tao/Request.cpp
deleted file mode 100644
index 2156451d29f..00000000000
--- a/TAO/tao/Request.cpp
+++ /dev/null
@@ -1,403 +0,0 @@
-// $Id$
-
-#include "tao/Request.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#include "tao/Object.h"
-#include "tao/Stub.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Request.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, Request, "$Id$")
-
-CORBA::ULong
-CORBA_Request::_incr_refcnt (void)
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0);
-  return refcount_++;
-}
-
-CORBA::ULong
-CORBA_Request::_decr_refcnt (void)
-{
-  {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0);
-    this->refcount_--;
-    if (this->refcount_ != 0)
-      return this->refcount_;
-  }
-
-  delete this;
-  return 0;
-}
-
-CORBA_Request*
-CORBA_Request::_nil (void)
-{
-  return 0;
-}
-
-// Reference counting for DII Request object
-
-// DII Request class implementation
-
-CORBA_Request::CORBA_Request (CORBA::Object_ptr obj,
-                              const CORBA::Char *op,
-                              CORBA::NVList_ptr args,
-                              CORBA::NamedValue_ptr result,
-                              CORBA::Flags flags,
-                              CORBA::Environment &ACE_TRY_ENV)
-  : args_ (args),
-    result_ (result),
-    flags_ (flags),
-    env_ (ACE_TRY_ENV),
-    contexts_ (0),
-    ctx_ (0),
-    refcount_ (1)
-{
-  target_ = CORBA::Object::_duplicate (obj);
-  opname_ = CORBA::string_dup (op);
-}
-
-CORBA_Request::CORBA_Request (CORBA::Object_ptr obj,
-                              const CORBA::Char *op,
-                              CORBA::Environment &ACE_TRY_ENV)
-  : flags_ (0),
-    env_ (ACE_TRY_ENV),
-    contexts_ (0),
-    ctx_ (0),
-    refcount_ (1)
-{
-  target_ = CORBA::Object::_duplicate (obj);
-  opname_ = CORBA::string_dup (op);
-
-  ACE_NEW (args_, CORBA::NVList);
-  ACE_NEW (result_, CORBA::NamedValue);
-}
-
-CORBA_Request::~CORBA_Request (void)
-{
-  assert (refcount_ == 0);
-
-  CORBA::release (this->target_);
-  CORBA::string_free ((CORBA::String) this->opname_);
-  this->opname_ = 0;
-  CORBA::release (this->args_);
-  CORBA::release (this->result_);
-}
-
-// The public DII interfaces:  normal and oneway calls.
-//
-// NOTE that using DII, programmers can get the special behaviour of
-// discarding the response for normal calls.  This doesn't change the
-// semantics of any OMG-IDL interface, it just streamlines control
-// flow in some exotic situations.
-
-void
-CORBA_Request::invoke (CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->target_->_stubobj ();
-
-  stub->do_dynamic_call ((char *) opname_,
-                         1,
-                         args_,
-                         result_,
-                         flags_,
-                         exceptions_,
-                         ACE_TRY_ENV);
-}
-
-void
-CORBA_Request::send_oneway (CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->target_->_stubobj ();
-
-  stub->do_dynamic_call ((char *) opname_,
-                         0,
-                         args_,
-                         result_,
-                         flags_,
-                         exceptions_,
-                         ACE_TRY_ENV);
-}
-
-void
-CORBA_Request::send_deferred (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                  CORBA::COMPLETED_NO));
-}
-
-void
-CORBA_Request::get_response (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                  CORBA::COMPLETED_NO));
-}
-
-CORBA::Boolean
-CORBA_Request::poll_response (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                         CORBA::COMPLETED_NO),
-                    0);
-}
-
-
-//  constructor.
-CORBA_ORB_RequestSeq::CORBA_ORB_RequestSeq (CORBA::ULong max)
-  : TAO_Unbounded_Pseudo_Sequence <CORBA_Request,CORBA_Request_var> (max)
-{
-  // no-op
-}
-
-CORBA_ORB_RequestSeq::CORBA_ORB_RequestSeq (const CORBA_ORB_RequestSeq &rhs)
-  : TAO_Unbounded_Pseudo_Sequence <CORBA_Request,CORBA_Request_var> (rhs)
-{
-  // no-op
-}
-
-CORBA_ORB_RequestSeq::CORBA_ORB_RequestSeq (CORBA::ULong max,
-                                            CORBA::ULong length,
-                                            CORBA_Request **data,
-                                            CORBA::Boolean release)
-  : TAO_Unbounded_Pseudo_Sequence <CORBA_Request,CORBA_Request_var> (max,
-                                                   length,
-                                                   data,
-                                                   release)
-{
-  // no-op
-}
-
-
-CORBA_ORB_RequestSeq::CORBA_ORB_RequestSeq (void)
-{
-  // no-op
-}
-
-/*
-// Constructor using a maximum length value.
-CORBA_ORB_RequestSeq::CORBA_ORB_RequestSeq (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum, allocbuf (maximum))
-{
-}
-
-CORBA_ORB_RequestSeq::CORBA_ORB_RequestSeq (CORBA::ULong maximum,
-                                            CORBA::ULong length,
-                                            CORBA::Request_ptr *data,
-                                            CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-CORBA_ORB_RequestSeq::CORBA_ORB_RequestSeq (const CORBA_ORB_RequestSeq &rhs)
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  CORBA::Request_ptr *tmp1 = allocbuf (this->maximum_);
-  CORBA::Request_ptr * const tmp2 =
-    ACE_reinterpret_cast (CORBA::Request_ptr * ACE_CAST_CONST,
-                          rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    tmp1[i] = tmp2[i];
-
-  this->buffer_ = tmp1;
-}
-
-CORBA_ORB_RequestSeq &
-CORBA_ORB_RequestSeq::operator= (const CORBA_ORB_RequestSeq &rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // free the old buffer
-          CORBA::Request_ptr *tmp =
-            ACE_reinterpret_cast (CORBA::Request_ptr *,
-                                  this->buffer_);
-          freebuf (tmp);
-          this->buffer_ = allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    this->buffer_ = allocbuf (rhs.maximum_);
-
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-
-  CORBA::Request_ptr *tmp1 =
-    ACE_reinterpret_cast (CORBA::Request_ptr *,
-                          this->buffer_);
-  CORBA::Request_ptr * const tmp2 =
-    ACE_reinterpret_cast (CORBA::Request_ptr * ACE_CAST_CONST,
-                          rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    tmp1[i] = tmp2[i];
-
-  return *this;
-}
-
-CORBA_ORB_RequestSeq::~CORBA_ORB_RequestSeq (void)
-{
-  this->_deallocate_buffer ();
-}
-
-CORBA::Request_ptr
-CORBA_ORB_RequestSeq::operator[] (CORBA::ULong i)
-{
-  if (i >= this->maximum_)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) CORBA_ORB_RequestSeq %p\n",
-                       "operator[] - subscript out of range"),
-                      0);
-
-  CORBA::Request_ptr *tmp =
-    ACE_reinterpret_cast (CORBA::Request_ptr *,
-                          this->buffer_);
-  return tmp[i];
-}
-
-const CORBA::Request*
-CORBA_ORB_RequestSeq::operator[] (CORBA::ULong i) const
-{
-  if (i >= this->maximum_)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) CORBA_ORB_RequestSeq %p\n",
-                       "operator[] - subscript out of range"),
-                      0);
-
-  CORBA::Request_ptr * const tmp =
-    ACE_reinterpret_cast (CORBA::Request_ptr * ACE_CAST_CONST,
-                          this->buffer_);
-
-  return tmp[i];
-}
-
-CORBA::Request_ptr *
-CORBA_ORB_RequestSeq::allocbuf (CORBA::ULong size)
-{
-  return new CORBA::Request_ptr[size];
-}
-
-void
-CORBA_ORB_RequestSeq::freebuf (CORBA::Request_ptr *buffer)
-{
-  delete [] buffer;
-}
-
-void
-CORBA_ORB_RequestSeq::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::Request_ptr * tmp = allocbuf (length);
-
-  if (this->buffer_ != 0)
-    {
-      CORBA::Request_ptr *old =
-        ACE_reinterpret_cast (CORBA::Request_ptr *,
-                              this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-
-      if (this->release_)
-        freebuf (old);
-    }
-
-  this->buffer_ = tmp;
-}
-
-void
-CORBA_ORB_RequestSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    return;
-
-  CORBA::Request_ptr *tmp =
-    ACE_reinterpret_cast (CORBA::Request_ptr *,
-                          this->buffer_);
-
-  freebuf (tmp);
-
-  this->buffer_ = 0;
-}
-
-CORBA::Request_ptr *
-CORBA_ORB_RequestSeq::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::Request_ptr *result = 0;
-
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result = allocbuf (this->length_);
-          this->buffer_ = result;
-        }
-      else
-        {
-          result = ACE_reinterpret_cast (CORBA::Request_ptr *,
-                                         this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish
-          // ownership.
-          result = ACE_reinterpret_cast(CORBA::Request_ptr *,
-                                        this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  return result;
-}
-
-const CORBA::Request_ptr *
-CORBA_ORB_RequestSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::Request_ptr * ACE_CAST_CONST,
-                               this->buffer_);
-}
-
-void
-CORBA_ORB_RequestSeq::replace (CORBA::ULong max,
-                               CORBA::ULong length,
-                               CORBA::Request_ptr *data,
-                               CORBA::Boolean release)
-{
-  this->maximum_ = max;
-  this->length_ = length;
-
-  if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::Request_ptr *tmp =
-        ACE_reinterpret_cast(CORBA::Request_ptr *,
-                             this->buffer_);
-      freebuf (tmp);
-    }
-
-  this->buffer_ = data;
-  this->release_ = release;
-}
-*/
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class TAO_Unbounded_Pseudo_Sequence<CORBA_Request,CORBA_Request_var>;
-template class TAO_Pseudo_Object_Manager<CORBA_Request,CORBA_Request_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Unbounded_Pseudo_Sequence<CORBA_Request,CORBA_Request_var>
-#pragma instantiate TAO_Pseudo_Object_Manager<CORBA_Request,CORBA_Request_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/Request.h b/TAO/tao/Request.h
deleted file mode 100644
index ddf66b63447..00000000000
--- a/TAO/tao/Request.h
+++ /dev/null
@@ -1,398 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Request.h
-//
-// = DESCRIPTION
-//    Header file for CORBA's Dynamic Invocation Interface "Request"
-//    type.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems, Inc.
-//     Additions and RequestSeq by Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_REQUEST_H
-#define TAO_REQUEST_H
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#include "tao/corbafwd.h"
-#include "tao/NVList.h"
-#include "tao/Environment.h"
-#include "tao/Context.h"
-#include "tao/Sequence.h"
-
-class TAO_Export CORBA_Request
-{
-  // = TITLE
-  //   CORBA_Request
-  //
-  // = DESCRIPTION
-  //   Provides a way to create requests and populate it with parameters for
-  //   use in the Dynamic Invocation Interface
-  //
-public:
-  CORBA::Object_ptr target (void) const;
-  // Return the target of this request.
-
-  const CORBA::Char *operation (void) const;
-  // Return the operation name for the request.
-
-  CORBA::NVList_ptr arguments (void);
-  // Return the arguments for the request.
-
-  CORBA::NamedValue_ptr result (void);
-  // Return the result for the request.
-
-  CORBA::ExceptionList_ptr exceptions (void);
-  // Return the exceptions resulting from this request.
-
-  CORBA::Context_ptr ctx (void) const;
-  // Accessor for the Context member.
-
-  void ctx (CORBA::Context_ptr);
-  // Mutator for the Context member.
-
-  CORBA::ContextList_ptr contexts (void);
-  // Return a list of the request's result's contexts. Since
-  // TAO does not implement Contexts, this will always be 0.
-
-  CORBA::Environment_ptr env (void);
-  // Return the <Environment> for this request.
-
-  // Argument manipulation helper functions.
-
-  // Arg adders, one for each type of parameter,
-  // with and without optional name. Returns
-  // reference to Any for insertion using <<=.
-  CORBA_Any &add_in_arg (void);
-  CORBA_Any &add_in_arg (const char* name);
-  CORBA_Any &add_inout_arg (void);
-  CORBA_Any &add_inout_arg (const char* name);
-  CORBA_Any &add_out_arg (void);
-  CORBA_Any &add_out_arg (const char* name);
-  // Initialize the return type.
-  void set_return_type (CORBA::TypeCode_ptr tc);
-  // Returns reference to Any for extraction using >>=.
-  CORBA_Any &return_value (void);
-
-  void invoke (CORBA::Environment &ACE_TRY_ENV =
-                 CORBA::Environment::default_environment ());
-  // Perform method resolution and invoke an appropriate method. If
-  // the method returns successfully, its result is placed in the
-  // result argument specified on <create_request>. The behavior is
-  // undefined if this <Request> has already been used with a previous
-  // call to <invoke>, <send>, or <send_multiple_requests>.
-
-  // A default argument is set, but please note that this not recommended
-  // as the user may not be able to propagate the exceptions
-
-  void send_oneway (CORBA::Environment &ACE_TRY_ENV =
-                      CORBA::Environment::default_environment ());
-  // Send a oneway request.
-  // A default argument is set, but please note that this not recommended
-  // as the user may not be able to propagate the exceptions.
-
-  // NOT IMPLEMENTED - these next 3 will just throw CORBA::NO_IMPLEMENT.
-  void send_deferred (CORBA::Environment &ACE_TRY_ENV =
-                        CORBA::Environment::default_environment ());
-  void get_response (CORBA::Environment &ACE_TRY_ENV =
-                      CORBA::Environment::default_environment ());
-  CORBA::Boolean poll_response (CORBA::Environment &ACE_TRY_ENV =
-                                  CORBA::Environment::default_environment ());
-
-  // Pseudo object methods
-  static CORBA_Request* _duplicate (CORBA_Request*);
-  static CORBA_Request* _nil (void);
-
-  // = Reference counting.
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_Request_ptr _ptr_type;
-  typedef CORBA_Request_var _var_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
-private:
-  friend class CORBA_Object;
-
-  // following are not allowed
-
-  CORBA_Request (CORBA::Object_ptr obj,
-                 const CORBA::Char *op,
-                 CORBA::NVList_ptr args,
-                 CORBA::NamedValue_ptr result,
-                 CORBA::Flags flags,
-                 CORBA::Environment &ACE_TRY_ENV =
-                   TAO_default_environment ());
-
-  CORBA_Request (CORBA::Object_ptr obj,
-                 const CORBA::Char *op,
-                 CORBA::Environment &ACE_TRY_ENV =
-                   TAO_default_environment ());
-
-  ~CORBA_Request (void);
-
-  CORBA::Object_ptr target_;
-  // target object
-
-  const CORBA::Char *opname_;
-  // operation name
-
-  CORBA::NVList_ptr args_;
-  // parameter list
-
-  CORBA::NamedValue_ptr result_;
-  // result of the operation
-
-  CORBA::Flags flags_;
-  // invocation flags
-
-  CORBA::Environment env_;
-  // holds exceptions
-
-  CORBA::ExceptionList exceptions_;
-  // list of exceptions raised by the operation
-
-  CORBA::ContextList_ptr contexts_;
-  // List of the request's result's contexts.
-
-  CORBA::Context_ptr ctx_;
-  // Context associated with this request.
-
-  CORBA::ULong refcount_;
-  // reference counting
-
-  ACE_SYNCH_MUTEX refcount_lock_;
-  // protect the reference count
-};
-
-typedef CORBA_Request* CORBA_Request_ptr;
-
-class TAO_Export CORBA_Request_var
-{
-  // = TITLE
-  //   The T_var class for Request
-  //
-  // = DESCRIPTION
-  //   As any other pseudo object Request must have a T_var class,
-  //   the interface an semantics are specified in the CORBA spec.
-  //
-  // = NOTE
-  //   We use CORBA_Request_ptr as the _ptr type instead of
-  //   CORBA::Request_ptr, this is an attempt to reduced the cyclic
-  //   dependencies in TAO.
-  //
-public:
-  CORBA_Request_var (void);
-  CORBA_Request_var (CORBA_Request_ptr);
-  CORBA_Request_var (const CORBA_Request_var &);
-  ~CORBA_Request_var (void);
-
-  CORBA_Request_var &operator= (CORBA_Request_ptr);
-  CORBA_Request_var &operator= (const CORBA_Request_var &);
-  CORBA_Request_ptr operator-> (void) const;
-
-  operator const CORBA_Request_ptr &() const;
-  operator CORBA_Request_ptr &();
-  // in, inout, out, _retn
-  CORBA_Request_ptr in (void) const;
-  CORBA_Request_ptr &inout (void);
-  CORBA_Request_ptr &out (void);
-  CORBA_Request_ptr _retn (void);
-  CORBA_Request_ptr ptr (void) const;
-
-private:
-  CORBA_Request_ptr ptr_;
-};
-
-class TAO_Export CORBA_Request_out
-{
-  // = TITLE
-  //   The T_out class for Request
-  //
-  // = DESCRIPTION
-  //   As any other pseudo object Request must have a T_out class,
-  //   the interface an semantics are specified in the CORBA spec.
-  //
-  // = NOTE
-  //   We use CORBA_Request_ptr as the _ptr type instead of
-  //   CORBA::Request_ptr, this is an attempt to reduced the cyclic
-  //   dependencies in TAO.
-  //
-public:
-  CORBA_Request_out (CORBA_Request_ptr &);
-  CORBA_Request_out (CORBA_Request_var &);
-  CORBA_Request_out (CORBA_Request_out &);
-  CORBA_Request_out &operator= (CORBA_Request_out &);
-  CORBA_Request_out &operator= (const CORBA_Request_var &);
-  CORBA_Request_out &operator= (CORBA_Request_ptr);
-  operator CORBA_Request_ptr &();
-  CORBA_Request_ptr &ptr (void);
-  CORBA_Request_ptr operator-> (void);
-
-private:
-  CORBA_Request_ptr &ptr_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Request.i"
-#endif /* __ACE_INLINE__ */
-
-// Make sure you instantiate this in Request.cpp
-class CORBA_ORB_RequestSeq : public TAO_Unbounded_Pseudo_Sequence<CORBA_Request,CORBA_Request_var>
-{
-public:
-// Helpful with template programming.
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_ORB_RequestSeq_ptr _ptr_type;
-  typedef CORBA_ORB_RequestSeq_var _var_type;
-#endif /* __GNUC__ */
-
-  // Implement the same constructors provided by the template here,
-  // check Sequence_T.h for ideas.
-  // Simply delegate on the template for the implementation...
-
-  CORBA_ORB_RequestSeq (void);
-  // default ctor
-
-  CORBA_ORB_RequestSeq (CORBA::ULong max);
-  // Constructor with a "hint" for the maximum capacity.
-
-  CORBA_ORB_RequestSeq (CORBA::ULong maximum,
-                        CORBA::ULong length,
-                        CORBA_Request* * data,
-                        CORBA::Boolean release=0);
-  // Constructor with a given buffer.
-
-  CORBA_ORB_RequestSeq (const CORBA_ORB_RequestSeq &);
-  // Copy ctor, deep copies.
-
-  //~CORBA_ORB_RequestSeq (void);
-  // dtor releases all the contained elements.
-};
-
-// This class definition should be removed.. But need to
-// check with all the compiler guys before we have this removed
-
-/*class CORBA_ORB_RequestSeq : public TAO_Unbounded_Base_Sequence
-{
-public:
-
-
-  // Default constructor.
-  CORBA_ORB_RequestSeq (void);
-
-  // Constructor using a maximum length value.
-  CORBA_ORB_RequestSeq (CORBA::ULong maximum);
-
-  // Constructor with all the sequence parameters.
-  CORBA_ORB_RequestSeq (CORBA::ULong maximum,
-                        CORBA::ULong length,
-                        CORBA::Request_ptr *data,
-                        CORBA::Boolean release = 0);
-
-  // Copy constructor.
-  CORBA_ORB_RequestSeq (const CORBA_ORB_RequestSeq &rhs);
-
-  // Assignment operator.
-  CORBA_ORB_RequestSeq &operator= (const CORBA_ORB_RequestSeq &rhs);
-
-  // Dtor.
-  ~CORBA_ORB_RequestSeq (void);
-
-  // = Accessors.
-  CORBA::Request_ptr operator[] (CORBA::ULong i);
-
-  const CORBA::Request* operator[] (CORBA::ULong i) const;
-
-  // = Static operations.
-
-  // Allocate storage for the sequence.
-  static CORBA::Request_ptr *allocbuf (CORBA::ULong size);
-
-  // Free the sequence.
-  static void freebuf (CORBA::Request_ptr *buffer);
-
-  virtual void _allocate_buffer (CORBA::ULong length);
-
-  virtual void _deallocate_buffer (void);
-
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-  CORBA::Request_ptr *get_buffer (CORBA::Boolean orphan = 0);
-
-  const CORBA::Request_ptr *get_buffer (void) const;
-
-  void replace (CORBA::ULong max,
-                CORBA::ULong length,
-                CORBA::Request_ptr *data,
-                CORBA::Boolean release);
-};
-*/
-class CORBA_ORB_RequestSeq_var
-{
-public:
-  CORBA_ORB_RequestSeq_var (void); // default constructor
-  CORBA_ORB_RequestSeq_var (CORBA_ORB_RequestSeq *);
-  CORBA_ORB_RequestSeq_var (const CORBA_ORB_RequestSeq_var &); // copy constructor
-  ~CORBA_ORB_RequestSeq_var (void); // destructor
-
-  CORBA_ORB_RequestSeq_var &operator= (CORBA_ORB_RequestSeq *);
-  CORBA_ORB_RequestSeq_var &operator= (const CORBA_ORB_RequestSeq_var &);
-  CORBA_ORB_RequestSeq *operator-> (void);
-  const CORBA_ORB_RequestSeq *operator-> (void) const;
-
-  operator const CORBA_ORB_RequestSeq &() const;
-  operator CORBA_ORB_RequestSeq &();
-  operator CORBA_ORB_RequestSeq &() const;
-  CORBA::Octet &operator[] (CORBA::ULong slot);
-  // in, inout, out, _retn
-  const CORBA_ORB_RequestSeq &in (void) const;
-  CORBA_ORB_RequestSeq &inout (void);
-  CORBA_ORB_RequestSeq *&out (void);
-  CORBA_ORB_RequestSeq *_retn (void);
-  CORBA_ORB_RequestSeq *ptr (void) const;
-
-private:
-  CORBA_ORB_RequestSeq *ptr_;
-};
-
-class CORBA_ORB_RequestSeq_out
-{
-public:
-  CORBA_ORB_RequestSeq_out (CORBA_ORB_RequestSeq *&);
-  CORBA_ORB_RequestSeq_out (CORBA_ORB_RequestSeq_var &);
-  CORBA_ORB_RequestSeq_out (CORBA_ORB_RequestSeq_out &);
-  CORBA_ORB_RequestSeq_out &operator= (CORBA_ORB_RequestSeq_out &);
-  CORBA_ORB_RequestSeq_out &operator= (CORBA_ORB_RequestSeq *);
-  operator CORBA_ORB_RequestSeq *&();
-  CORBA_ORB_RequestSeq *&ptr (void);
-  CORBA_ORB_RequestSeq *operator-> (void);
-  CORBA::Octet &operator[] (CORBA::ULong slot);
-
-private:
-  CORBA_ORB_RequestSeq *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_ORB_RequestSeq_var &);
-};
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#endif /* TAO_REQUEST_H */
diff --git a/TAO/tao/Request.i b/TAO/tao/Request.i
deleted file mode 100644
index 2e9c42c7a70..00000000000
--- a/TAO/tao/Request.i
+++ /dev/null
@@ -1,304 +0,0 @@
-// $Id$
-
-// This may look like C, but it's really -*- C++ -*-
-
-ACE_INLINE CORBA::Boolean
-CORBA::is_nil (CORBA::Request_ptr req)
-{
-  return (CORBA::Boolean) (req == 0);
-}
-
-ACE_INLINE void
-CORBA::release (CORBA::Request_ptr req)
-{
-  if (req)
-    req->_decr_refcnt ();
-}
-
-// Return the target of this request.
-ACE_INLINE CORBA_Request*
-CORBA_Request::_duplicate (CORBA_Request* x)
-{
-  if (x != 0)
-    x->_incr_refcnt ();
-  return x;
-}
-
-
-ACE_INLINE CORBA::Object_ptr
-CORBA_Request::target (void) const
-{
-  return this->target_;
-}
-
-// Return the operation name for the request.
-ACE_INLINE const CORBA::Char *
-CORBA_Request::operation (void) const
-{
-  return this->opname_;
-}
-
-// Return the arguments for the request.
-ACE_INLINE CORBA::NVList_ptr
-CORBA_Request::arguments (void)
-{
-  return this->args_;
-}
-
-// Return the result for the request.
-ACE_INLINE CORBA::NamedValue_ptr
-CORBA_Request::result (void)
-{
-  return this->result_;
-}
-
-// Return the exceptions resulting from this request.
-ACE_INLINE CORBA::ExceptionList_ptr
-CORBA_Request::exceptions (void)
-{
-  return &this->exceptions_;
-}
-
-// Return the request's contexts
-ACE_INLINE CORBA::ContextList_ptr
-CORBA_Request::contexts (void)
-{
-  return this->contexts_;
-}
-
-// Return the <Environment> for this request.
-ACE_INLINE CORBA::Environment *
-CORBA_Request::env (void)
-{
-  return &this->env_;
-}
-
-// The argument manipulation helper functions
-
-ACE_INLINE CORBA_Any &
-CORBA_Request::add_in_arg (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_element (CORBA::ARG_IN, ACE_TRY_ENV)->any_;
-}
-
-ACE_INLINE CORBA_Any &
-CORBA_Request::add_in_arg (const CORBA::Char *name)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_item (name, CORBA::ARG_IN, ACE_TRY_ENV)->any_;
-}
-
-ACE_INLINE CORBA_Any &
-CORBA_Request::add_inout_arg (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_element (CORBA::ARG_INOUT, ACE_TRY_ENV)->any_;
-}
-
-ACE_INLINE CORBA_Any &
-CORBA_Request::add_inout_arg (const CORBA::Char *name)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_item (name, CORBA::ARG_INOUT, ACE_TRY_ENV)->any_;
-}
-
-ACE_INLINE CORBA_Any &
-CORBA_Request::add_out_arg (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_element (CORBA::ARG_OUT, ACE_TRY_ENV)->any_;
-}
-
-ACE_INLINE CORBA_Any &
-CORBA_Request::add_out_arg (const CORBA::Char *name)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_item (name, CORBA::ARG_OUT, ACE_TRY_ENV)->any_;
-}
-
-ACE_INLINE void
-CORBA_Request::set_return_type (CORBA::TypeCode_ptr tc)
-{
-  CORBA::Any newtype (tc);
-  this->result_->any_ = newtype;
-}
-
-ACE_INLINE CORBA_Any &
-CORBA_Request::return_value (void )
-{
-  return this->result_->any_;
-}
-
-ACE_INLINE CORBA::Context_ptr
-CORBA_Request::ctx (void) const
-{
-  return this->ctx_;
-}
-
-ACE_INLINE void
-CORBA_Request::ctx (CORBA::Context_ptr ctx)
-{
-  ACE_UNUSED_ARG (ctx);
-}
-
-// *************************************************************
-// Inline operations for class CORBA_Request_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_Request_var::CORBA_Request_var (void)
-  : ptr_ (CORBA_Request::_nil ())
-{
-}
-
-ACE_INLINE
-CORBA_Request_var::CORBA_Request_var (CORBA_Request_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_Request_var::~CORBA_Request_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_Request_ptr
-CORBA_Request_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Request_var::CORBA_Request_var (const CORBA_Request_var &p)
-  : ptr_ (CORBA_Request::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE CORBA_Request_var &
-CORBA_Request_var::operator= (CORBA_Request_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_Request_var &
-CORBA_Request_var::operator= (const CORBA_Request_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_Request::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_Request_var::operator const CORBA_Request_ptr &() const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Request_var::operator CORBA_Request_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Request_ptr
-CORBA_Request_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Request_ptr
-CORBA_Request_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Request_ptr &
-CORBA_Request_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Request_ptr &
-CORBA_Request_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_Request::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Request_ptr
-CORBA_Request_var::_retn (void)
-{
-  // yield ownership
-  CORBA_Request_ptr val = this->ptr_;
-  this->ptr_ = CORBA_Request::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_Request_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_Request_out::CORBA_Request_out (CORBA_Request_ptr &p)
-        : ptr_ (p)
-{
-  this->ptr_ = CORBA_Request::_nil ();
-}
-
-ACE_INLINE
-CORBA_Request_out::CORBA_Request_out (CORBA_Request_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_Request::_nil ();
-}
-
-ACE_INLINE
-CORBA_Request_out::CORBA_Request_out (CORBA_Request_out &p)
-  : ptr_ (p.ptr_)
-{}
-
-ACE_INLINE CORBA_Request_out &
-CORBA_Request_out::operator= (CORBA_Request_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_Request_out &
-CORBA_Request_out::operator= (const CORBA_Request_var &p)
-{
-  this->ptr_ = CORBA_Request::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_Request_out &
-CORBA_Request_out::operator= (CORBA_Request_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_Request_out::operator CORBA_Request_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Request_ptr &
-CORBA_Request_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Request_ptr
-CORBA_Request_out::operator-> (void)
-{
-  return this->ptr_;
-}
diff --git a/TAO/tao/Resource_Factory.cpp b/TAO/tao/Resource_Factory.cpp
deleted file mode 100644
index 61cfb10e8c0..00000000000
--- a/TAO/tao/Resource_Factory.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-// $Id$
-
-#include "tao/Resource_Factory.h"
-#include "ace/Dynamic_Service.h"
-#include "tao/ORB_Core.h"
-#include "tao/Client_Strategy_Factory.h"
-
-ACE_RCSID(tao, Resource_Factory, "$Id$")
-
-// ****************************************************************
-
-TAO_Cached_Connector_Lock::TAO_Cached_Connector_Lock (TAO_ORB_Core *orb_core)
-{
-  this->lock_ = orb_core->client_factory ()->create_cached_connector_lock ();
-}
-
-TAO_Cached_Connector_Lock::~TAO_Cached_Connector_Lock (void)
-{
-  delete this->lock_;
-  this->lock_ = 0;
-}
-
-// ****************************************************************
-
-TAO_Protocol_Item::TAO_Protocol_Item (const ACE_CString &name)
-  :   name_ (name),
-      factory_ (0)
-{
-}
-
-const ACE_CString &
-TAO_Protocol_Item::protocol_name (void)
-{
-  return this->name_;
-}
-
-TAO_Protocol_Factory *
-TAO_Protocol_Item::factory (void)
-{
-  return this->factory_;
-}
-
-void
-TAO_Protocol_Item::factory (TAO_Protocol_Factory *factory)
-{
-  this->factory_ = factory;
-}
-
-
-TAO_Resource_Factory::TAO_Resource_Factory (void)
-{
-}
-
-TAO_Resource_Factory::~TAO_Resource_Factory (void)
-{
-}
-
-int
-TAO_Resource_Factory::use_tss_resources (void) const
-{
-  return 0;
-}
-
-int
-TAO_Resource_Factory::use_locked_data_blocks (void) const
-{
-  return 0;
-}
-
-ACE_Reactor *
-TAO_Resource_Factory::get_reactor (void)
-{
-  return 0;
-}
-
-TAO_Connector_Registry *
-TAO_Resource_Factory::get_connector_registry (void)
-{
-  return 0;
-}
-
-TAO_Acceptor_Registry *
-TAO_Resource_Factory::get_acceptor_registry (void)
-{
-  return 0;
-}
-
-ACE_Allocator *
-TAO_Resource_Factory::input_cdr_dblock_allocator (void)
-{
-  return 0;
-}
-
-ACE_Allocator *
-TAO_Resource_Factory::input_cdr_buffer_allocator (void)
-{
-  return 0;
-}
-
-ACE_Allocator *
-TAO_Resource_Factory::output_cdr_dblock_allocator (void)
-{
-  return 0;
-}
-
-ACE_Allocator *
-TAO_Resource_Factory::output_cdr_buffer_allocator (void)
-{
-  return 0;
-}
-
-TAO_ProtocolFactorySet *
-TAO_Resource_Factory::get_protocol_factories (void)
-{
-  return 0;
-}
-
-int
-TAO_Resource_Factory::init_protocol_factories (void)
-{
-  return -1;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<TAO_Resource_Factory>;
-template class ACE_Node<TAO_Protocol_Item*>;
-template class ACE_Unbounded_Set<TAO_Protocol_Item*>;
-template class ACE_Unbounded_Set_Iterator<TAO_Protocol_Item*>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<TAO_Resource_Factory>
-#pragma instantiate ACE_Node<TAO_Protocol_Item*>
-#pragma instantiate ACE_Unbounded_Set<TAO_Protocol_Item*>
-#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_Protocol_Item*>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Resource_Factory.h b/TAO/tao/Resource_Factory.h
deleted file mode 100644
index 6280b6efad9..00000000000
--- a/TAO/tao/Resource_Factory.h
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   Resource_Factory.h
-//
-// = AUTHOR
-//   Chris Cleeland
-//   Carlos O'Ryan
-//
-// ============================================================================
-
-#ifndef TAO_RESOURCE_FACTORY_H
-#define TAO_RESOURCE_FACTORY_H
-
-#include "ace/Service_Object.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Hash_Map_Manager.h"
-#include "tao/Pluggable.h"
-#include "tao/Protocol_Factory.h"
-#include "tao/corbafwd.h"
-#include "tao/orbconf.h"
-#include "ace/Containers_T.h"
-
-class TAO_Acceptor_Registry;
-class TAO_Connector_Registry;
-
-// ****************************************************************
-
-class TAO_Export TAO_Cached_Connector_Lock : public ACE_Adaptive_Lock
-{
-  // TITLE
-  //   This lock class determines the type underlying lock
-  //   when it gets constructed.
-public:
-  TAO_Cached_Connector_Lock (TAO_ORB_Core *orb_core = 0);
-  ~TAO_Cached_Connector_Lock (void);
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_Protocol_Item
-{
-public:
-  TAO_Protocol_Item (const ACE_CString &name);
-  // creator method, the protocol name can only be set when the
-  // object is created.
-
-  const ACE_CString &protocol_name (void);
-  // return a reference to the character representation of the protocol
-  // factories name.
-
-  TAO_Protocol_Factory *factory (void);
-  // return a pointer to the protocol factory.
-
-  void factory (TAO_Protocol_Factory *factory);
-  // set the factory pointer's value.
-
-private:
-  ACE_CString name_;
-  // protocol factory name.
-
-  TAO_Protocol_Factory *factory_;
-  // pointer to factory object.
-};
-
-// typedefs for containers containing the list of loaded protocol
-// factories.
-typedef ACE_Unbounded_Set<TAO_Protocol_Item*>
-        TAO_ProtocolFactorySet;
-
-typedef ACE_Unbounded_Set_Iterator<TAO_Protocol_Item*>
-        TAO_ProtocolFactorySetItor;
-
-// ****************************************************************
-
-class TAO_Export TAO_Resource_Factory : public ACE_Service_Object
-{
-  // = TITLE
-  //   Factory which manufacturers resources for use by the ORB Core.
-  //
-  // = DESCRIPTION
-  //   This class is a factory/repository for critical ORB Core
-  //   resources.
-  //
-public:
-  // = Initialization and termination methods.
-  TAO_Resource_Factory (void);
-  virtual ~TAO_Resource_Factory (void);
-
-  // = Resource Retrieval
-
-  virtual int use_tss_resources (void) const;
-  // @@ Backwards compatibility, return 1 if the ORB core should use
-  //    TSS resources
-
-  virtual int use_locked_data_blocks (void) const;
-  // @@ Backwards compatibility, return 1 if the ORB core should use
-  //    Locked_Data_Blocks
-
-  virtual ACE_Reactor *get_reactor (void);
-  // Return an <ACE_Reactor> to be utilized.
-
-  virtual TAO_Acceptor_Registry *get_acceptor_registry (void);
-  // return a reference to the acceptor registry.
-
-  virtual TAO_Connector_Registry *get_connector_registry (void);
-  // Return an Connector to be utilized.
-
-  virtual ACE_Allocator* input_cdr_dblock_allocator (void);
-  virtual ACE_Allocator* input_cdr_buffer_allocator (void);
-  // Access the input CDR allocators.
-
-  virtual ACE_Allocator* output_cdr_dblock_allocator (void);
-  virtual ACE_Allocator* output_cdr_buffer_allocator (void);
-  // Access the output CDR allocators.
-
-  virtual TAO_ProtocolFactorySet *get_protocol_factories (void);
-  // The protocol factory list is implemented in this class since
-  // a) it will be a global resource and
-  // b) it is initialized at start up and then not altered.
-  // Returns a container holding the list of loaded protocols.
-
-  virtual int init_protocol_factories (void);
-  // this method will loop through the protocol list and
-  // using the protocol name field this method will
-  // retrieve a pointer to the associated protocol factory
-  // from the service configurator.  It is assumed
-  // that only one thread will call this method at ORB initialization.
-  // NON-THREAD-SAFE
-};
-
-#endif /* TAO_RESOURCE_FACTORY_H */
diff --git a/TAO/tao/Sequence.cpp b/TAO/tao/Sequence.cpp
deleted file mode 100644
index 359b0228d31..00000000000
--- a/TAO/tao/Sequence.cpp
+++ /dev/null
@@ -1,429 +0,0 @@
-// $Id$
-
-#include "tao/Sequence.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/Sequence.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(tao, Sequence, "$Id$")
-
-// *************************************************************
-// Operations for class TAO_Base_Sequence
-// *************************************************************
-
-TAO_Base_Sequence::~TAO_Base_Sequence (void)
-{
-}
-
-void TAO_Base_Sequence::_shrink_buffer (CORBA::ULong, CORBA::ULong)
-{
-  // default is no op.
-}
-
-void
-TAO_Base_Sequence::_downcast (void*,
-                              CORBA_Object*,
-                              CORBA_Environment &)
-{
-  // default is no op.
-  // @@ TODO Maybe throw an exception?
-}
-
-CORBA_Object*
-TAO_Base_Sequence::_upcast (void*) const
-{
-  return 0;
-}
-
-// *************************************************************
-// Operations for class TAO_Unbounded_Base_Sequence
-// *************************************************************
-
-TAO_Unbounded_Base_Sequence::~TAO_Unbounded_Base_Sequence (void)
-{
-}
-
-// *************************************************************
-// Operations for class TAO_Bounded_Base_Sequence
-// *************************************************************
-
-TAO_Bounded_Base_Sequence::~TAO_Bounded_Base_Sequence (void)
-{
-}
-
-// *************************************************************
-
-// constructor for unbounded seq
-TAO_Unbounded_String_Sequence::
-TAO_Unbounded_String_Sequence (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum,
-                                 TAO_Unbounded_String_Sequence::allocbuf (maximum))
-{
-}
-
-TAO_Unbounded_String_Sequence::
-TAO_Unbounded_String_Sequence (const TAO_Unbounded_String_Sequence &rhs)
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  char* *tmp1 = TAO_Unbounded_String_Sequence::allocbuf (this->maximum_);
-  char ** const tmp2 =
-    ACE_reinterpret_cast (char ** ACE_CAST_CONST, rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    tmp1[i] = CORBA::string_dup (tmp2[i]);
-
-  this->buffer_ = tmp1;
-}
-
-TAO_Unbounded_String_Sequence::~TAO_Unbounded_String_Sequence (void)
-{
-  this->_deallocate_buffer ();
-}
-
-TAO_Unbounded_String_Sequence&
-TAO_Unbounded_String_Sequence::
-operator= (const TAO_Unbounded_String_Sequence &rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  if (this->release_)
-    {
-      char **tmp = ACE_reinterpret_cast (char **, this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::string_free (tmp[i]);
-          tmp[i] = 0;
-        }
-
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // free the older buffer
-          TAO_Unbounded_String_Sequence::freebuf (tmp);
-          this->buffer_ =
-            TAO_Unbounded_String_Sequence::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    this->buffer_ =
-      TAO_Unbounded_String_Sequence::allocbuf (rhs.maximum_);
-
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-
-  char **tmp1 = ACE_reinterpret_cast (char **, this->buffer_);
-  char ** const tmp2 = ACE_reinterpret_cast (char ** ACE_CAST_CONST,
-                                             rhs.buffer_);
-  for (CORBA::ULong i=0; i < rhs.length_; ++i)
-    tmp1[i] = CORBA::string_dup (tmp2[i]);
-
-  return *this;
-}
-
-TAO_SeqElem_String_Manager
-TAO_Unbounded_String_Sequence::operator[] (CORBA::ULong slot) const
-{
-  ACE_ASSERT (slot < this->maximum_);
-  char **const tmp =
-    ACE_reinterpret_cast (char **ACE_CAST_CONST,
-                          this->buffer_);
-  return TAO_SeqElem_String_Manager (tmp + slot,
-                                     this->release_);
-}
-
-char* *
-TAO_Unbounded_String_Sequence::allocbuf (CORBA::ULong nelems)
-{
-  char* *buf = new char*[nelems];
-  for (CORBA::ULong i=0; i < nelems; i++)
-    buf[i] = 0;
-  return buf;
-}
-
-void
-TAO_Unbounded_String_Sequence::freebuf (char* *buffer)
-{
-  if (buffer == 0)
-    return;
-
-  // {orbos/97-05-15:16.11}
-  // The freebuf function ensures that the destructor for each element
-  // is called before the buffer is destroyed, except for string
-  // elements, which are freed using string_free(), and object
-  // reference elements, which are freed using release(). The freebuf
-  // function will ignore null pointers passed to it.
-
-  // @@ How are we supposed to implement that! We don't know the
-  // length of the buffer here.
-  //  Mark the length in the first four bytes? For the moment we let
-  //  that be.
-
-  delete[] buffer;
-}
-
-char**
-TAO_Unbounded_String_Sequence::get_buffer (CORBA::Boolean orphan)
-{
-  char* *result = 0;
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result = allocbuf (this->length_);
-          this->buffer_ = result;
-        }
-      else
-        {
-          result = ACE_reinterpret_cast (char**, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish
-          // ownership.
-          result = ACE_reinterpret_cast (char**, this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  return result;
-}
-
-const char**
-TAO_Unbounded_String_Sequence::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const char** ACE_CAST_CONST, this->buffer_);
-}
-
-void
-TAO_Unbounded_String_Sequence::_allocate_buffer (CORBA::ULong length)
-{
-  char* *tmp = TAO_Unbounded_String_Sequence::allocbuf (length);
-
-  if (this->buffer_ != 0)
-    {
-      char* *old = ACE_reinterpret_cast (char **, this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        // Only call duplicate when we did not own the previous
-        // buffer, since after this method we own it we must also
-        // own the objects.  If we already own the objects there is
-        // no need to copy them, if we did we would also have to
-        // remove the old instances.
-        if (!this->release_)
-          tmp [i] = CORBA::string_dup (old[i]);
-        else
-          tmp [i] = old[i];
-
-      if (this->release_)
-        delete[] old;
-    }
-  this->buffer_ = tmp;
-}
-
-void
-TAO_Unbounded_String_Sequence::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    return;
-
-  char **tmp = ACE_reinterpret_cast (char **, this->buffer_);
-
-  for (CORBA::ULong i = 0;
-       i < this->length_;
-       ++i)
-    {
-      CORBA::string_free (tmp[i]);
-      tmp[i] = 0;
-    }
-
-  TAO_Unbounded_String_Sequence::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-void
-TAO_Unbounded_String_Sequence::_shrink_buffer (CORBA::ULong nl,
-                                               CORBA::ULong ol)
-{
-  char **tmp = ACE_reinterpret_cast (char **, this->buffer_);
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::string_free (tmp[i]);
-      tmp[i] = 0;
-    }
-}
-
-// ****************************************************************
-
-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-TAO_Unbounded_Sequence<CORBA::Octet>::
-TAO_Unbounded_Sequence (const TAO_Unbounded_Sequence<CORBA::Octet> &rhs)
-  : TAO_Unbounded_Base_Sequence (rhs),
-    mb_ (0)
-{
-  CORBA::Octet *tmp1 = TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (this->maximum_);
-  CORBA::Octet * const tmp2 = ACE_reinterpret_cast (CORBA::Octet * ACE_CAST_CONST, rhs.buffer_);
-
-  // for (CORBA::ULong i = 0; i < this->length_; ++i)
-  // tmp1[i] = tmp2[i];
-  if (rhs.mb_ == 0)
-    ACE_OS::memcpy (tmp1, tmp2, this->length_);
-  else
-    {
-      size_t offset = 0;
-      for (const ACE_Message_Block *i = rhs.mb_;
-           i != 0;
-           i = i->cont ())
-        {
-          ACE_OS::memcpy (tmp1 + offset, i->rd_ptr (), i->length ());
-          offset += i->length ();
-        }
-    }
-
-  this->buffer_ = tmp1;
-}
-
-TAO_Unbounded_Sequence<CORBA::Octet> &
-TAO_Unbounded_Sequence<CORBA::Octet>::operator= (const TAO_Unbounded_Sequence<CORBA::Octet> &rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  if (this->mb_ != 0)
-    {
-      ACE_Message_Block::release (this->mb_);
-      this->mb_ = 0;
-      this->buffer_ =
-        TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (rhs.length_);
-    }
-  else if (this->release_)
-    {
-      if (this->maximum_ < rhs.length_)
-        {
-          // free the old buffer
-          CORBA::Octet *tmp = ACE_reinterpret_cast (CORBA::Octet *,
-                                                    this->buffer_);
-          TAO_Unbounded_Sequence<CORBA::Octet>::freebuf (tmp);
-          this->buffer_ =
-            TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (rhs.length_);
-        }
-    }
-  else
-    this->buffer_ =
-      TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (rhs.length_);
-
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-
-  CORBA::Octet *tmp1 = ACE_reinterpret_cast (CORBA::Octet *, this->buffer_);
-  CORBA::Octet * const tmp2 = ACE_reinterpret_cast (CORBA::Octet * ACE_CAST_CONST, rhs.buffer_);
-
-  // for (CORBA::ULong i = 0; i < this->length_; ++i)
-  // tmp1[i] = tmp2[i];
-  if (rhs.mb_ == 0)
-    ACE_OS::memcpy (tmp1, tmp2, this->length_);
-  else
-    {
-      size_t offset = 0;
-      for (const ACE_Message_Block *i = rhs.mb_;
-           i != 0;
-           i = i->cont ())
-        {
-          ACE_OS::memcpy (tmp1 + offset, i->rd_ptr (), i->length ());
-          offset += i->length ();
-        }
-    }
-
-  return *this;
-}
-
-TAO_Unbounded_Sequence<CORBA::Octet>::
-TAO_Unbounded_Sequence (CORBA::ULong length,
-                        const ACE_Message_Block *mb)
-  :  TAO_Unbounded_Base_Sequence (length,
-                                  length,
-                                  mb->rd_ptr (),
-                                  0),
-     mb_ (ACE_Message_Block::duplicate (mb))
-{
-}
-
-TAO_Unbounded_Sequence<CORBA::Octet>::~TAO_Unbounded_Sequence (void)
-{
-  this->_deallocate_buffer ();
-}
-
-void
-TAO_Unbounded_Sequence<CORBA::Octet>::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::Octet *tmp = TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (length);
-
-  if (this->buffer_ != 0)
-    {
-      CORBA::Octet *old = ACE_reinterpret_cast (CORBA::Octet *, this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-
-      if (this->mb_ != 0)
-        {
-          ACE_Message_Block::release (this->mb_);
-          this->mb_ = 0;
-        }
-      else if (this->release_)
-        {
-          TAO_Unbounded_Sequence<CORBA::Octet>::freebuf (old);
-        }
-    }
-
-  this->buffer_ = tmp;
-}
-
-void TAO_Unbounded_Sequence<CORBA::Octet>::_deallocate_buffer (void)
-{
-  if (this->mb_ == 0
-      && this->buffer_ != 0
-      && this->release_ != 0)
-    {
-      CORBA::Octet *tmp = ACE_reinterpret_cast (CORBA::Octet *, this->buffer_);
-      TAO_Unbounded_Sequence<CORBA::Octet>::freebuf (tmp);
-    }
-  else
-    {
-      ACE_Message_Block::release (this->mb_);
-      this->mb_ = 0;
-    }
-  this->buffer_ = 0;
-}
-
-#endif /* defined (TAO_NO_COPY_OCTET_SEQUENCES) */
-
-////////////////////////////////////////////////////////////////////////////////
-
-int
-operator== (const TAO_Unbounded_Sequence<CORBA::Octet> &lhs,
-            const TAO_Unbounded_Sequence<CORBA::Octet> &rhs)
-{
-  if (rhs.length () != lhs.length ())
-    return 0;
-
-  for (CORBA::ULong i = 0;
-       i < rhs.length ();
-       ++i)
-    if (rhs[i] != lhs[i])
-      return 0;
-
-  return 1;
-}
-
-int
-operator!= (const TAO_Unbounded_Sequence<CORBA::Octet> &lhs,
-            const TAO_Unbounded_Sequence<CORBA::Octet> &rhs)
-{
-  return !(lhs == rhs);
-}
diff --git a/TAO/tao/Sequence.h b/TAO/tao/Sequence.h
deleted file mode 100644
index 53fe9b00187..00000000000
--- a/TAO/tao/Sequence.h
+++ /dev/null
@@ -1,457 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    sequence.h
-//
-// = AUTHOR
-//
-//    Carlos O'Ryan and Aniruddha Gokhale
-//
-// ============================================================================
-
-#ifndef TAO_SEQUENCE_H
-#define TAO_SEQUENCE_H
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Managed_Types.h"
-
-class CORBA_Object;
-class CORBA_Environment;
-
-class TAO_Export TAO_Base_Sequence
-{
-  // = TITLE
-  //   Base class for TAO sequences.
-  //
-  // = DESCRIPTION
-  //   This class provides a common interface for all IDL sequences,
-  //   hence the interpreted marshal engine can manipulate them in a
-  //   type safe manner.
-public:
-  friend class TAO_Marshal_Sequence;
-  // We give access to TAO_Marshal_Sequence, this allows a safe yet
-  // small footprint implementation of the marshal engine.
-
-  virtual ~TAO_Base_Sequence (void);
-  // destructor.
-
-  CORBA::ULong maximum (void) const;
-  // return the maximum length of the sequence
-
-  virtual void _allocate_buffer (CORBA::ULong length) = 0;
-  // Ensure that the buffer contains space for at least <length>
-  // elements.  The constructor must be called for any new elements,
-  // the old ones (if any) must be copied into the buffer using
-  // operator= and then their destructors must be called.  Finally the
-  // old buffer must be released.
-
-  virtual void _deallocate_buffer (void) = 0;
-  // Must deallocate the buffer and then set it to zero.
-
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-  // Some sequences (of objects and strings) require some cleanup if
-  // the sequence is shrunk. The spec requires the destructor to
-  // release the objects only from position <0> to <length-1>; so
-  // shrink and then delete could result in a memory leak.
-
-  virtual void _downcast (void *target,
-                          CORBA_Object *src,
-                          CORBA_Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  // Used for sequences of objects to downcast a recently demarshalled
-  // object reference into the right type.
-
-  virtual CORBA_Object *_upcast (void *src) const;
-  // Used for sequences of object to convert from the derived type
-  // into the Object class.
-
-protected:
-  TAO_Base_Sequence (void);
-  // Default constructor.
-
-  TAO_Base_Sequence (CORBA::ULong maximum,
-                     CORBA::ULong length,
-                     void *buffer,
-                     CORBA::Boolean release = 0);
-  // Constructor with control of ownership.
-
-  TAO_Base_Sequence (CORBA::ULong maximum,
-                     void *buffer);
-  // Assume ownership and set length to 0.
-
-  // = orbos/98-01-11 proposed extensions.
-  CORBA::Boolean release (void) const;
-  // Returns the state of the sequence release flag.
-
-public:
-
-  // = The following two functions should be protected but we made it
-  // public because it breaks some compilers.
-
-  TAO_Base_Sequence (const TAO_Base_Sequence &rhs);
-  TAO_Base_Sequence &operator= (const TAO_Base_Sequence &rhs);
-  // Copy constructor and assignment operator are protected, the
-  // derived classes must provided the right semantics for the buffer
-  // copy, only the static fields are actually copy.
-
-protected:
-
-  CORBA::ULong maximum_;
-  // The maximum number of elements the buffer can contain.
-
-  CORBA::ULong length_;
-  // The current number of elements in the buffer.
-
-  void *buffer_;
-  // The buffer with all the elements, casting must be done in derived
-  // classes.
-
-  CORBA::Boolean release_;
-  // If true then the sequence should release the buffer when it is
-  // destroyed.
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_Unbounded_Base_Sequence : public TAO_Base_Sequence
-{
-  // = TITLE
-  //   Base class for all bounded sequences.
-  //
-  // = DESCRIPTION
-  //   This class implements part of the funcionality common to all
-  //   bounded sequences, using this intermediate class instead of
-  //   virtual methods on TAO_Base_Sequence give us a slight
-  //   improvement of performance, but also reduces the amount of
-  //   generated code in the templates.
-public:
-  void length (CORBA::ULong length);
-  // = SPEC {16.11.2}
-  // For an unbounded sequence, setting the length to a larger value
-  // than the current length may reallocate the sequence
-  // data. Reallocation is conceptually equivalent to creating a new
-  // sequence of the desired new length, copying the old sequence
-  // elements zero through length into the new sequence, and then
-  // assigning the old sequence to be the same as the new sequence.
-
-  CORBA::ULong length (void) const;
-  // return the current length, it cannot go into the base class due
-  // to the C++ name lookup rules (if you don't know what I'm talking
-  // about, then try moving it there).
-
-  virtual ~TAO_Unbounded_Base_Sequence (void);
-  // destructor.
-
-protected:
-  TAO_Unbounded_Base_Sequence (void);
-  // Default constructor.
-
-  TAO_Unbounded_Base_Sequence (CORBA::ULong maximum,
-                               CORBA::ULong length,
-                               void *buffer,
-                               CORBA::Boolean release = 0);
-  // Constructor with control of ownership.
-
-  TAO_Unbounded_Base_Sequence (CORBA::ULong maximum,
-                               void *buffer);
-  // Assume ownership and set length to 0.
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_Bounded_Base_Sequence : public TAO_Base_Sequence
-{
-  // = TITLE
-  //   Base class for all bounded sequences.
-  //
-  // = DESCRIPTION
-  //   This class implements part of the funcionality common to all
-  //   bounded sequences, using this intermediate class instead of
-  //   virtual methods on TAO_Base_Sequence give us a slight
-  //   improvement of performance, but also reduces the amount of
-  //   generated code in the templates.
-public:
-  void length (CORBA::ULong length);
-  // set the length, for this sequences this call is ignored if the
-  // new length is greater that the maximum.
-
-  CORBA::ULong length (void) const;
-  // return the current length, it cannot go into the base class due
-  // to the C++ name lookup rules (if you don't know what I'm talking
-  // about, then try moving it there).
-
-  virtual ~TAO_Bounded_Base_Sequence (void);
-  // destructor.
-
-protected:
-  TAO_Bounded_Base_Sequence (void);
-  // Default constructor.
-
-  TAO_Bounded_Base_Sequence (CORBA::ULong maximum,
-                             CORBA::ULong length,
-                             void *buffer,
-                             CORBA::Boolean release = 0);
-  // Constructor with control of ownership.
-
-  TAO_Bounded_Base_Sequence (CORBA::ULong maximum,
-                             void *buffer);
-  // Assume ownership and set length to 0.
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_Unbounded_String_Sequence : public TAO_Unbounded_Base_Sequence
-{
-  // =TITLE
-  //  Unbounded sequence of strings.
-  //
-  // =DESCRIPTION
-  //  IDL sequences of strings must automatically duplicate and
-  //  release their members based on some global <release> flag.
-
-  // = SPEC
-  // 16.8 Mapping for Structured Types
-  // The mapping for struct, union, and sequence (but not array) is a
-  // C++ struct or class with a default constructor, a copy
-  // constructor, an assignment operator, and a destructor.
-  //
-public:
-  // = Operations for the Unbounded_ObjectSequence
-
-  TAO_Unbounded_String_Sequence (void);
-  // {orbos/97-05-15:16.8}
-  // The default constructor initializes object reference members to
-  // appropriately typed nil object references and string members to
-  // NULL; all other members are initialized via their default
-  // constructors.
-  //
-  // {orbos/97-05-15:16.11}
-  // For both bounded and unbounded sequences, the default constructor
-  // (as shown in the example above) sets the sequence length equal to
-  // 0.
-
-  TAO_Unbounded_String_Sequence (CORBA::ULong maximum);
-  // Unbounded sequences provide a constructor that allows only the
-  // initial value of the maximum length to be set (the ``maximum
-  // constructor'' shown in the example above). This allows
-  // applications to control how much buffer space is initially
-  // allocated by the sequence. This constructor also sets the length
-  // to 0 and the release flag to TRUE.
-
-  TAO_Unbounded_String_Sequence (CORBA::ULong maximum,
-                                 CORBA::ULong length,
-                                 char **data,
-                                 CORBA::Boolean release=0);
-  // The ``T *data'' constructor (as shown in the example above)
-  // allows the length and contents of a bounded or unbounded sequence
-  // to be set. For unbounded sequences, it also allows the initial
-  // value of the maximum length to be set. For this constructor,
-  // ownership of the contents vector is determined by the release
-  // parameter---FALSE means the caller owns the storage, while TRUE
-  // means that the sequence assumes ownership of the storage.
-  // If release is TRUE, the contents vector must have been allocated
-  // using the sequence allocbuf function, and the sequence will pass
-  // it to freebuf when finished with it.
-
-  TAO_Unbounded_String_Sequence(const TAO_Unbounded_String_Sequence&);
-  // The copy constructor performs a deep copy from the existing
-  // structure to create a new structure, including calling _duplicate
-  // on all object  reference members and performing the necessary
-  // heap allocations for all string members.
-  //
-  // The copy constructor creates a new sequence with the same maximum
-  // and length as the given sequence, copies each of its current
-  // elements (items zero through length-1), and sets the release
-  // flag to TRUE.
-
-  ~TAO_Unbounded_String_Sequence (void);
-  // The destructor releases all object reference members and frees
-  // all string members.
-
-  TAO_Unbounded_String_Sequence &operator= (const TAO_Unbounded_String_Sequence &);
-  // The assignment operator first releases all object reference
-  // members and frees all string  members, and then performs a
-  // deep­copy to create a new structure.
-  //
-  // The assignment operator deep­copies its parameter, releasing
-  // old storage if necessary. It behaves as if the original sequence
-  // is destroyed via its destructor and then the source sequence
-  // copied using the copy constructor. If release=TRUE, the
-  // destructor destroys each of the current elements (items zero
-  // through length--1).
-  // For an unbounded sequence, if a reallocation is necessary due to
-  // a change in the length and the sequence was created using the
-  // release=TRUE parameter in its constructor, the sequence will
-  // deallocate the old storage. If release is FALSE under these
-  // circumstances, old storage will not be freed before the
-  // reallocation is performed. After reallocation, the release flag
-  // is always set to TRUE.
-
-  TAO_SeqElem_String_Manager operator[] (CORBA::ULong slot) const;
-  // read-write accessor
-
-  static char* *allocbuf (CORBA::ULong);
-  // The allocbuf function allocates a vector of T elements that can
-  // be passed to the T *data constructor. The length of the vector is
-  // given by the nelems function argument.  The allocbuf function
-  // initializes each element using its default constructor, except
-  // for strings, which are initialized to null pointers, and object
-  // references, which are initialized to suitably typed nil object
-  // references. A null pointer is returned if allocbuf for some
-  // reason cannot allocate the requested vector. Vectors allocated by
-  // allocbuf should be freed using the freebuf function.
-
-  static void freebuf (char **);
-  // The freebuf function ensures that the destructor for each element
-  // is called before the buffer is destroyed, except for string
-  // elements, which are freed using string_free(), and object
-  // reference elements, which are freed using release(). The freebuf
-  // function will ignore null pointers passed to it.
-
-  // = Fast buffer accessors.
-  char **get_buffer (CORBA::Boolean orphan = 0);
-  const char **get_buffer (void) const;
-
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-};
-
-// ****************************************************************
-
-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-class ACE_Message_Block;
-template<class T> class TAO_Unbounded_Sequence;
-// forward declaration, we are going to specialize that template
-// here.
-// The template itself requires this file so every user of the
-// template should also see the specialization.
-
-ACE_TEMPLATE_SPECIALIZATION
-class TAO_Export TAO_Unbounded_Sequence<CORBA::Octet> : public TAO_Unbounded_Base_Sequence
-{
-  // = TITLE
-  //   An unbounded sequence of Octets
-  //
-  // = DESCRIPTION
-  //   Marshalling and demarshalling octet sequences can be highly
-  //   optimize, for instance at demarshalling we don't require a copy
-  //   from the CDR buffer to the octet sequence buffer, we can simply
-  //   hold a duplicate of the underlying ACE_Message_Block.
-  //   Specializing the TAO_Unbounded_Sequence<T> parametric
-  //   class, is an excellent way to achieve this optimizations.
-  //
-public:
-  friend class TAO_Marshal_Sequence;
-  // For efficient marshalling and demarshalling.
-
-  TAO_Unbounded_Sequence (void);
-  TAO_Unbounded_Sequence (CORBA::ULong max);
-  TAO_Unbounded_Sequence (CORBA::ULong max,
-                          CORBA::ULong length,
-                          CORBA::Octet *data,
-                          CORBA::Boolean release = 0);
-  virtual ~TAO_Unbounded_Sequence (void);
-  // see TAO_Unbounded_Sequence in "Sequence_T.h"
-
-  TAO_Unbounded_Sequence (const TAO_Unbounded_Sequence<CORBA::Octet> &);
-  TAO_Unbounded_Sequence<CORBA::Octet>& operator= (const TAO_Unbounded_Sequence<CORBA::Octet> &);
-  // The copy constructor and assignment operators *do* copy the data,
-  // though we could simply duplicate the ref count in the
-  // ACE_Message_Block this will change the semantics for this
-  // operations.
-
-  CORBA::Octet &operator[] (CORBA::ULong);
-  const CORBA::Octet &operator[] (CORBA::ULong) const;
-  // See the general description in "Sequence_T.h"
-  // NOTE: This last two methods can be rendered useless in certain
-  // cases, see below.
-
-  // = Static operations.
-
-  static CORBA::Octet *allocbuf (CORBA::ULong);
-  // Allocate storage for the sequence, please note that the storage
-  // is always held in a ACE_Message_Block.
-
-  static void freebuf (CORBA::Octet *);
-  // Free the storage.
-
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  // Implement the methods for all the sequence, please seee
-  // TAO_Base_Sequence.
-
-  // = Fast buffer accessors.
-  CORBA::Octet *get_buffer (CORBA::Boolean orphan = 0);
-  const CORBA::Octet *get_buffer (void) const;
-
-  // NOTE: This last two methods can be rendered useless in certain
-  // cases, see below.
-  void replace (CORBA::ULong max,
-                CORBA::ULong length,
-                CORBA::Octet *data,
-                CORBA::Boolean release = 0);
-  // See the general description of this methods in "Sequence_T.h".
-
-  // = TAO extensions
-
-  ACE_Message_Block* mb (void) const;
-  // Returns the underlying message block, the caller must *not*
-  // release the copy.
-
-  TAO_Unbounded_Sequence (CORBA::ULong length,
-                          const ACE_Message_Block* mb);
-  // Create a sequence of octets from a single message block (i.e. it
-  // ignores any chaining in the meesage block).
-
-  void replace (CORBA::ULong length, const ACE_Message_Block* mb);
-  // Replaces the current buffer with <mb>, using only <length> bytes.
-  // It takes a duplicate of <mb> so the user still owns it.
-
-  //
-  // NOTE:
-  // In the last two methods if the <mb> is the head of a chain then
-  // the following methods are not warranteed to work properly:
-  //    operator[]
-  //    get_buffer ()
-  // the main purpose of this method is to support custom marshaling;
-  // so the complete chain is marshaled when the octet sequence is.
-  //
-
-private:
-  ACE_Message_Block* mb_;
-};
-
-#endif /* defined (TAO_NO_COPY_OCTET_SEQUENCES) */
-
-// ****************************************************************
-
-// Comparison of octet sequence.
-extern TAO_Export int operator== (const TAO_Unbounded_Sequence<CORBA::Octet> &l,
-                                  const TAO_Unbounded_Sequence<CORBA::Octet> &r);
-
-extern TAO_Export int operator!= (const TAO_Unbounded_Sequence<CORBA::Octet> &l,
-                                  const TAO_Unbounded_Sequence<CORBA::Octet> &r);
-
-// ****************************************************************
-
-#if defined (__ACE_INLINE__)
-#include "tao/Sequence.i"
-#endif /* __ACE_INLINE__ */
-
-#include "tao/Sequence_T.h"
-
-#endif /* TAO_SEQUENCE_H */
diff --git a/TAO/tao/Sequence.i b/TAO/tao/Sequence.i
deleted file mode 100644
index d1c262251fd..00000000000
--- a/TAO/tao/Sequence.i
+++ /dev/null
@@ -1,355 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    sequence.i
-//
-// = AUTHOR
-//    Carlos O'Ryan and Aniruddha Gokhale
-//
-// ============================================================================
-
-// Operations on the unbounded sequence class.
-
-ACE_INLINE
-TAO_Base_Sequence::TAO_Base_Sequence (void)
-  : maximum_ (0),
-    length_ (0),
-    buffer_ (0),
-    release_ (0)
-{
-}
-
-ACE_INLINE
-TAO_Base_Sequence::TAO_Base_Sequence (CORBA::ULong maximum,
-                                      CORBA::ULong length,
-                                      void *buffer,
-                                      CORBA::Boolean release)
-  : maximum_ (maximum),
-    length_ (length),
-    buffer_ (buffer),
-    release_ (release)
-{
-}
-
-ACE_INLINE
-TAO_Base_Sequence::TAO_Base_Sequence (CORBA::ULong maximum,
-                                      void *data)
-  : maximum_ (maximum),
-    length_ (0),
-    buffer_ (data),
-    release_ (1)
-{
-}
-
-ACE_INLINE
-TAO_Base_Sequence::TAO_Base_Sequence (const TAO_Base_Sequence &rhs)
-  : maximum_ (rhs.maximum_),
-    length_ (rhs.length_),
-    release_ (1)
-{
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_Base_Sequence::release (void) const
-{
-  return this->release_;
-}
-
-ACE_INLINE TAO_Base_Sequence &
-TAO_Base_Sequence::operator= (const TAO_Base_Sequence &rhs)
-{
-  this->maximum_ = rhs.maximum_;
-  this->length_ = rhs.length_;
-  this->release_ = 1;
-  return *this;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_Base_Sequence::maximum (void) const
-{
-  return this->maximum_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_Unbounded_Base_Sequence::TAO_Unbounded_Base_Sequence (void)
-{
-}
-
-ACE_INLINE
-TAO_Unbounded_Base_Sequence::
-TAO_Unbounded_Base_Sequence (CORBA::ULong maximum,
-                             CORBA::ULong length,
-                             void* buffer,
-                             CORBA::Boolean release)
-  :  TAO_Base_Sequence (maximum, length, buffer, release)
-{
-}
-
-ACE_INLINE
-TAO_Unbounded_Base_Sequence::
-TAO_Unbounded_Base_Sequence (CORBA::ULong maximum,
-                             void* buffer)
-  :  TAO_Base_Sequence (maximum, buffer)
-{
-}
-
-ACE_INLINE CORBA::ULong
-TAO_Unbounded_Base_Sequence::length (void) const
-{
-  return this->length_;
-}
-
-ACE_INLINE void
-TAO_Unbounded_Base_Sequence::length (CORBA::ULong length)
-{
-  if (length > this->maximum_)
-    {
-      this->_allocate_buffer (length);
-      this->maximum_ = length;
-      this->release_ = 1;
-    }
-  else if (length < this->length_)
-    {
-      this->_shrink_buffer (length, this->length_);
-    }
-  this->length_ = length;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_Bounded_Base_Sequence::TAO_Bounded_Base_Sequence (void)
-{
-}
-
-ACE_INLINE
-TAO_Bounded_Base_Sequence::
-TAO_Bounded_Base_Sequence (CORBA::ULong maximum,
-                           CORBA::ULong length,
-                           void* buffer,
-                           CORBA::Boolean release)
-  :  TAO_Base_Sequence (maximum, length, buffer, release)
-{
-}
-
-ACE_INLINE
-TAO_Bounded_Base_Sequence::
-TAO_Bounded_Base_Sequence (CORBA::ULong maximum,
-                           void* buffer)
-  :  TAO_Base_Sequence (maximum, buffer)
-{
-}
-
-ACE_INLINE CORBA::ULong
-TAO_Bounded_Base_Sequence::length (void) const
-{
-  return this->length_;
-}
-
-ACE_INLINE void
-TAO_Bounded_Base_Sequence::length (CORBA::ULong length)
-{
-  if (length > this->maximum_)
-    {
-      return;
-    }
-  else if (length < this->length_)
-    {
-      this->_shrink_buffer (length, this->length_);
-    }
-  this->length_ = length;
-}
-
-// ****************************************************************
-
-//default constructor
-ACE_INLINE
-TAO_Unbounded_String_Sequence::TAO_Unbounded_String_Sequence (void)
-{
-}
-
-ACE_INLINE
-TAO_Unbounded_String_Sequence::
-TAO_Unbounded_String_Sequence (CORBA::ULong maximum,
-                               CORBA::ULong length,
-                               char* *value,
-                               CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-// ****************************************************************
-
-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-
-ACE_TEMPLATE_METHOD_SPECIALIZATION
-ACE_INLINE CORBA::Octet *
-TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (CORBA::ULong size)
-{
-  return new CORBA::Octet[size];
-}
-
-ACE_TEMPLATE_METHOD_SPECIALIZATION
-ACE_INLINE void
-TAO_Unbounded_Sequence<CORBA::Octet>::freebuf (CORBA::Octet *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_TEMPLATE_METHOD_SPECIALIZATION
-ACE_INLINE
-TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (void)
-  :  mb_ (0)
-{
-}
-
-ACE_TEMPLATE_METHOD_SPECIALIZATION
-ACE_INLINE
-TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum,
-                                 TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (maximum)),
-    mb_ (0)
-{
-}
-
-ACE_TEMPLATE_METHOD_SPECIALIZATION
-ACE_INLINE
-TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (CORBA::ULong maximum,
-                                                   CORBA::ULong length,
-                                                   CORBA::Octet *data,
-                                                   CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release),
-    mb_ (0)
-{
-}
-
-ACE_TEMPLATE_METHOD_SPECIALIZATION
-ACE_INLINE const CORBA::Octet *
-TAO_Unbounded_Sequence<CORBA::Octet>::get_buffer (void) const
-{
-  return ACE_reinterpret_cast(const CORBA::Octet * ACE_CAST_CONST, this->buffer_);
-}
-
-// This function is a little too big to be inlined, but some compilers
-// (Sun/CC 4.1?) die if it isn't :-(
-ACE_TEMPLATE_METHOD_SPECIALIZATION
-ACE_INLINE CORBA::Octet *
-TAO_Unbounded_Sequence<CORBA::Octet>::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::Octet *result = 0;
-  if (orphan == 0)
-    {
-      // We retain ownership.
-
-      if (this->buffer_ == 0)
-        {
-          // The buffer was not allocated, we must allocate it now.
-          result = TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (this->length_);
-          this->buffer_ = result;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::Octet*,this->buffer_);
-        }
-    }
-  else if (this->mb_ != 0) // (orphan == 1)
-    {
-      // We must create a copy anyway:
-      //   the user is supposed to call freebuf() to release the
-      //   buffer, but the buffer is inside a Message_Block...
-      //   We thought about storing the pointer to the Message_Block
-      //   somewhere at the beginning of the buffer (before the actual
-      //   data), but that will not work in 64 bit machines when the
-      //   buffer comes from a CDR stream.
-      //
-      result = TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (this->length_);
-      ACE_OS::memcpy (result, this->buffer_, this->length_);
-    }
-  else if (this->release_ != 0)
-    {
-      // We set the state back to default and relinquish
-      // ownership.
-      result = ACE_reinterpret_cast(CORBA::Octet*,this->buffer_);
-      this->maximum_ = 0;
-      this->length_ = 0;
-      this->buffer_ = 0;
-      this->release_ = 0;
-    }
-  /* else
-     // Oops, it's not our buffer to relinquish...
-     return 0;
-  */
-  return result;
-}
-
-ACE_TEMPLATE_METHOD_SPECIALIZATION
-ACE_INLINE CORBA::Octet &
-TAO_Unbounded_Sequence<CORBA::Octet>::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::Octet* tmp = ACE_reinterpret_cast(CORBA::Octet*,this->buffer_);
-  return tmp[i];
-}
-
-ACE_TEMPLATE_METHOD_SPECIALIZATION
-ACE_INLINE const CORBA::Octet &
-TAO_Unbounded_Sequence<CORBA::Octet>::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::Octet * const tmp = ACE_reinterpret_cast (CORBA::Octet* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-ACE_TEMPLATE_METHOD_SPECIALIZATION
-ACE_INLINE ACE_Message_Block*
-TAO_Unbounded_Sequence<CORBA::Octet>::mb (void) const
-{
-  return this->mb_;
-}
-
-ACE_TEMPLATE_METHOD_SPECIALIZATION
-ACE_INLINE void
-TAO_Unbounded_Sequence<CORBA::Octet>::replace (CORBA::ULong length,
-                                               const ACE_Message_Block* mb)
-{
-  this->_deallocate_buffer ();
-  this->mb_ = ACE_Message_Block::duplicate (mb);
-  this->buffer_ = this->mb_->rd_ptr ();
-  this->maximum_ = length;
-  this->length_ = length;
-  this->release_ = 0;
-}
-
-ACE_TEMPLATE_METHOD_SPECIALIZATION
-ACE_INLINE void
-TAO_Unbounded_Sequence<CORBA::Octet>::replace (CORBA::ULong max,
-                                               CORBA::ULong length,
-                                               CORBA::Octet *data,
-                                               CORBA::Boolean release)
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  if (this->mb_ != 0)
-    {
-      ACE_Message_Block::release (this->mb_);
-      this->mb_ = 0;
-    }
-  else if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::Octet* tmp = ACE_reinterpret_cast(CORBA::Octet*,this->buffer_);
-      TAO_Unbounded_Sequence<CORBA::Octet>::freebuf (tmp);
-    }
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-#endif /* defined (TAO_NO_COPY_OCTET_SEQUENCES) */
diff --git a/TAO/tao/Sequence_T.cpp b/TAO/tao/Sequence_T.cpp
deleted file mode 100644
index 291aa27fb9b..00000000000
--- a/TAO/tao/Sequence_T.cpp
+++ /dev/null
@@ -1,1057 +0,0 @@
-// $Id$
-
-#ifndef TAO_SEQUENCE_T_C
-#define TAO_SEQUENCE_T_C
-
-#include "tao/Sequence_T.h"
-#include "tao/varout.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/Sequence_T.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(tao, Sequence_T, "$Id$")
-
-template <class T>
-TAO_Unbounded_Sequence<T>::
-TAO_Unbounded_Sequence (const TAO_Unbounded_Sequence<T> &rhs)
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  T *tmp1 = TAO_Unbounded_Sequence<T>::allocbuf (this->maximum_);
-  T * const tmp2 = ACE_reinterpret_cast (T * ACE_CAST_CONST, rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    tmp1[i] = tmp2[i];
-
-  this->buffer_ = tmp1;
-}
-
-template <class T> TAO_Unbounded_Sequence<T> &
-TAO_Unbounded_Sequence<T>::operator= (const TAO_Unbounded_Sequence<T> &rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // free the old buffer
-          T *tmp = ACE_reinterpret_cast (T *,
-                                         this->buffer_);
-          TAO_Unbounded_Sequence<T>::freebuf (tmp);
-          this->buffer_ =
-            TAO_Unbounded_Sequence<T>::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    this->buffer_ =
-      TAO_Unbounded_Sequence<T>::allocbuf (rhs.maximum_);
-
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-
-  T *tmp1 = ACE_reinterpret_cast (T *, this->buffer_);
-  T * const tmp2 = ACE_reinterpret_cast (T * ACE_CAST_CONST, rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    tmp1[i] = tmp2[i];
-
-  return *this;
-}
-
-template<class T>
-TAO_Unbounded_Sequence<T>::~TAO_Unbounded_Sequence (void)
-{
-  this->_deallocate_buffer ();
-}
-
-template<class T> void
-TAO_Unbounded_Sequence<T>::_allocate_buffer (CORBA::ULong length)
-{
-  T* tmp = TAO_Unbounded_Sequence<T>::allocbuf (length);
-
-  if (this->buffer_ != 0)
-    {
-      T *old = ACE_reinterpret_cast (T *,
-                                     this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-
-      if (this->release_)
-        TAO_Unbounded_Sequence<T>::freebuf (old);
-    }
-
-  this->buffer_ = tmp;
-}
-
-template<class T> void
-TAO_Unbounded_Sequence<T>::_deallocate_buffer (void)
-{
-  if (this->release_ == 0)
-    return;
-
-  T *tmp = ACE_reinterpret_cast (T *,
-                                 this->buffer_);
-
-  TAO_Unbounded_Sequence<T>::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-// The following function is not inline, to avoid build (template
-// instantiation) problems with Sun C++ 4.2 patch 104631-07/SunOS 5.6.
-template <class T> T &
-TAO_Unbounded_Sequence<T>::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  T* tmp = ACE_reinterpret_cast(T*,this->buffer_);
-  return tmp[i];
-}
-
-// The following function is not inline, to avoid build (template
-// instantiation) problems with Sun C++ 4.2 patch 104631-07/SunOS 5.6.
-template <class T> const T &
-TAO_Unbounded_Sequence<T>::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  T * const tmp = ACE_reinterpret_cast (T* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// ****************************************************************
-// Bounded_Sequence
-// ****************************************************************
-
-template <class T, size_t MAX>
-TAO_Bounded_Sequence<T, MAX>::
-TAO_Bounded_Sequence (const TAO_Bounded_Sequence<T, MAX> &rhs)
-  : TAO_Bounded_Base_Sequence (rhs)
-{
-  T *tmp1 = TAO_Bounded_Sequence<T, MAX>::allocbuf (MAX);
-
-  T * const tmp2 = ACE_reinterpret_cast (T * ACE_CAST_CONST, rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    tmp1[i] = tmp2[i];
-
-  this->buffer_ = tmp1;
-}
-
-template <class T, size_t MAX> TAO_Bounded_Sequence<T, MAX> &
-TAO_Bounded_Sequence<T, MAX>::
-operator= (const TAO_Bounded_Sequence<T, MAX> &rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  if (this->release_)
-    {
-      // We never need to reallocate the buffer because they are
-      // always of size MAX.
-    }
-  else
-    this->buffer_ =
-      TAO_Unbounded_Sequence<T>::allocbuf (rhs.maximum_);
-
-  TAO_Bounded_Base_Sequence::operator= (rhs);
-
-  T* tmp1 = ACE_reinterpret_cast (T *, this->buffer_);
-  T* const tmp2 = ACE_reinterpret_cast (T * ACE_CAST_CONST, rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    tmp1[i] = tmp2[i];
-
-  return *this;
-}
-
-template<class T, size_t MAX>
-TAO_Bounded_Sequence<T, MAX>::~TAO_Bounded_Sequence (void)
-{
-  this->_deallocate_buffer ();
-}
-
-template<class T, size_t MAX> void
-TAO_Bounded_Sequence<T, MAX>::_allocate_buffer (CORBA::ULong)
-{
-  // For this class memory is never reallocated so the implementation
-  // is *really* simple.
-  this->buffer_ = TAO_Bounded_Sequence<T, MAX>::allocbuf (MAX);
-}
-
-template<class T, size_t MAX> void
-TAO_Bounded_Sequence<T, MAX>::_deallocate_buffer (void)
-{
-  if (this->release_ == 0)
-    return;
-
-  T *tmp = ACE_reinterpret_cast (T *,
-                                 this->buffer_);
-  TAO_Bounded_Sequence<T, MAX>::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-// *************************************************************
-// class TAO_Object_Manager
-// *************************************************************
-
-template <class T, class T_var> TAO_Object_Manager<T,T_var>&
-TAO_Object_Manager<T,T_var>::
-    operator= (const TAO_Object_Manager<T,T_var> &rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  if (this->release_)
-    {
-      CORBA::release (*this->ptr_);
-      *this->ptr_ = T::_duplicate (*rhs.ptr_);
-    }
-  else
-    *this->ptr_ = *rhs.ptr_;
-
-  return *this;
-}
-
-template <class T, class T_var> TAO_Object_Manager<T,T_var>&
-TAO_Object_Manager<T,T_var>::
-    operator= (const TAO_Object_Field_T<T,T_var> &rhs)
-{
-  if (this->release_)
-    {
-      CORBA::release (*this->ptr_);
-      *this->ptr_ = T::_duplicate (rhs.in ());
-    }
-  else
-    *this->ptr_ = rhs.in ();
-
-  return *this;
-}
-
-template <class T, class T_var>TAO_Object_Manager<T,T_var> &
-TAO_Object_Manager<T,T_var>::operator=(T* p)
-{
-  if (this->release_)
-    {
-      // The semantics of the elements of a sequence are the same as
-      // that of a var variable.  Therefore we will not duplicate the
-      // user provided pointer before assigning it to the internal
-      // variable.  However, we will release it.
-      CORBA::release (*this->ptr_);
-      *this->ptr_ = p;
-    }
-  else
-    *this->ptr_ = p;
-
-  return *this;
-}
-
-template <class T, class T_var>TAO_Object_Manager<T,T_var> &
-TAO_Object_Manager<T,T_var>::operator=(T_var &p)
-{
-  if (this->release_)
-    {
-      // The semantics of the elements of a sequence are the same as
-      // that of a var variable.  Therefore we will not duplicate the
-      // user provided pointer before assigning it to the internal
-      // variable.  However, we will release it.
-      CORBA::release (*this->ptr_);
-      *this->ptr_ = T::_duplicate (p.in ());
-    }
-  else
-    *this->ptr_ = p.in ();
-
-  return *this;
-}
-
-// *************************************************************
-// class TAO_Pseudo_Object_Manager
-// *************************************************************
-
-template <class T, class T_var> TAO_Pseudo_Object_Manager<T,T_var>&
-TAO_Pseudo_Object_Manager<T,T_var>::
-    operator= (const TAO_Pseudo_Object_Manager<T,T_var> &rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  if (this->release_)
-    {
-      CORBA::release (*this->ptr_);
-      *this->ptr_ = T::_duplicate (*rhs.ptr_);
-    }
-  else
-    *this->ptr_ = *rhs.ptr_;
-
-  return *this;
-}
-
-template <class T, class T_var> TAO_Pseudo_Object_Manager<T,T_var> &
-TAO_Pseudo_Object_Manager<T,T_var>::operator=(T* p)
-{
-  if (this->release_)
-    {
-      // The semantics of the elements of a sequence are the same as
-      // that of a var variable.  Therefore we will not duplicate the
-      // user provided pointer before assigning it to the internal
-      // variable.  However, we will release it.
-      CORBA::release (*this->ptr_);
-      *this->ptr_ = p;
-    }
-  else
-    *this->ptr_ = p;
-
-  return *this;
-}
-
-template <class T, class T_var> TAO_Pseudo_Object_Manager<T,T_var> &
-TAO_Pseudo_Object_Manager<T,T_var>::operator=(T_var &p)
-{
-  if (this->release_)
-    {
-      // The semantics of the elements of a sequence are the same as
-      // that of a var variable.  Therefore we will not duplicate the
-      // user provided pointer before assigning it to the internal
-      // variable.  However, we will release it.
-      CORBA::release (*this->ptr_);
-      *this->ptr_ = T::_duplicate (p.in ());
-    }
-  else
-    *this->ptr_ = p.in ();
-
-  return *this;
-}
-
-// *************************************************************
-// Operations for class TAO_Unbounded_Object_Sequence
-// *************************************************************
-
-// constructor for unbounded seq
-template <class T, class T_var>
-TAO_Unbounded_Object_Sequence<T,T_var>::
-TAO_Unbounded_Object_Sequence (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum,
-                                 TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (maximum))
-{
-}
-
-template <class T, class T_var>
-TAO_Unbounded_Object_Sequence<T,T_var>::
-TAO_Unbounded_Object_Sequence (const TAO_Unbounded_Object_Sequence<T,T_var> &rhs)
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  T **tmp1 = TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (this->maximum_);
-  T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    tmp1[i] = T::_duplicate (tmp2[i]);
-
-  this->buffer_ = tmp1;
-}
-
-template<class T, class T_var>
-TAO_Unbounded_Object_Sequence<T,T_var>::~TAO_Unbounded_Object_Sequence (void)
-{
-  this->_deallocate_buffer ();
-}
-
-// assignment operator
-template <class T, class T_var>TAO_Unbounded_Object_Sequence<T,T_var>&
-TAO_Unbounded_Object_Sequence<T,T_var>::
-operator= (const TAO_Unbounded_Object_Sequence<T,T_var> &rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  if (this->release_)
-    {
-      T **tmp = ACE_reinterpret_cast (T **,
-                                      this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::release (tmp[i]);
-          tmp[i] = T::_nil ();
-        }
-      if (this->maximum_ < rhs.maximum_)
-        {
-          TAO_Unbounded_Object_Sequence<T,T_var>::freebuf (tmp);
-          this->buffer_ =
-            TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    this->buffer_ =
-      TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (rhs.maximum_);
-
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-
-  T **tmp1 = ACE_reinterpret_cast (T **, this->buffer_);
-  T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    tmp1[i] = T::_duplicate (tmp2[i]);
-
-  return *this;
-}
-
-template <class T, class T_var> T **
-TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (CORBA::ULong nelems)
-{
-  T **buf = 0;
-
-  ACE_NEW_RETURN (buf, T*[nelems], 0);
-
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    buf[i] = T::_nil ();
-
-  return buf;
-}
-
-template <class T, class T_var> void
-TAO_Unbounded_Object_Sequence<T,T_var>::freebuf (T **buffer)
-{
-  if (buffer == 0)
-    return;
-
-  // {orbos/97-05-15:16.11} The freebuf function ensures that the
-  // destructor for each element is called before the buffer is
-  // destroyed, except for string elements, which are freed using
-  // string_free(), and object reference elements, which are freed
-  // using release(). The freebuf function will ignore null pointers
-  // passed to it.
-
-  // @@ How are we supposed to implement that! We don't know the
-  // length of the buffer here.
-  // Mark the length in the first four bytes? For the moment we let
-  // that be.
-
-  delete[] buffer;
-}
-
-template<class T, class T_var> void
-TAO_Unbounded_Object_Sequence<T,T_var>::_allocate_buffer (CORBA::ULong length)
-{
-  T **tmp = TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (length);
-
-  if (this->buffer_ != 0)
-    {
-      T **old = ACE_reinterpret_cast (T**, this->buffer_);
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        // Only call duplicate when we did not own the previous
-        // buffer, since after this method we own it we must also own
-        // the objects.  If we already own the objects there is no
-        // need to copy them, if we did we would also have to remove
-        // the old instances.
-        if (!this->release_)
-          tmp[i] = T::_duplicate (old[i]);
-        else
-          tmp[i] = old[i];
-
-      if (this->release_)
-        delete[] old;
-    }
-  this->buffer_ = tmp;
-}
-
-template<class T, class T_var> void
-TAO_Unbounded_Object_Sequence<T,T_var>::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    return;
-  T **tmp = ACE_reinterpret_cast (T**, this->buffer_);
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = T::_nil ();
-    }
-  TAO_Unbounded_Object_Sequence<T,T_var>::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-template<class T, class T_var> void
-TAO_Unbounded_Object_Sequence<T,T_var>::_shrink_buffer (CORBA::ULong nl,
-                                                  CORBA::ULong ol)
-{
-  T **tmp = ACE_static_cast (T**, this->buffer_);
-
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = T::_nil ();
-    }
-}
-
-template <class T, class T_var> void
-TAO_Unbounded_Object_Sequence<T,T_var>::_downcast (void* target,
-                                                   CORBA_Object* src,
-                                                   CORBA_Environment &ACE_TRY_ENV)
-{
-  T **tmp = ACE_static_cast (T**, target);
-
-  *tmp = T::_narrow (src, ACE_TRY_ENV);
-
-  ACE_CHECK;
-}
-
-template <class T, class T_var> CORBA_Object*
-TAO_Unbounded_Object_Sequence<T,T_var>::_upcast (void* src) const
-{
-  T **tmp = ACE_static_cast (T**, src);
-
-  return *tmp;
-}
-
-// *************************************************************
-// Operations for class TAO_Bounded_Object_Sequence
-// *************************************************************
-
-template <class T, class T_var, size_t MAX>
-TAO_Bounded_Object_Sequence<T, T_var,MAX>::
-TAO_Bounded_Object_Sequence (void)
-  :  TAO_Bounded_Base_Sequence (MAX,
-                                TAO_Bounded_Object_Sequence<T, T_var,MAX>::allocbuf (MAX))
-{
-}
-
-template <class T, class T_var, size_t MAX>
-TAO_Bounded_Object_Sequence<T, T_var,MAX>::
-TAO_Bounded_Object_Sequence (const TAO_Bounded_Object_Sequence<T, T_var,MAX> &rhs)
-  : TAO_Bounded_Base_Sequence (rhs)
-{
-  T **tmp1 =
-    TAO_Bounded_Object_Sequence<T, T_var,MAX>::allocbuf (MAX);
-  T ** const tmp2 = ACE_reinterpret_cast (T** ACE_CAST_CONST, rhs.buffer_);
-  for (CORBA::ULong i = 0; i < rhs.length_; i++)
-    tmp1[i] = T::_duplicate (tmp2[i]);
-  this->buffer_ = tmp1;
-}
-
-template <class T, class T_var, size_t MAX> TAO_Bounded_Object_Sequence<T, T_var,MAX>&
-TAO_Bounded_Object_Sequence<T, T_var,MAX>::operator=
-(const TAO_Bounded_Object_Sequence<T,T_var, MAX> &rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  if (this->release_)
-    {
-      T **tmp = ACE_reinterpret_cast (T **, this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::release (tmp[i]);
-          tmp[i] = T::_nil ();
-        }
-      // No need to reallocate the buffer since it is always of size
-      // MAX
-    }
-  else
-    this->buffer_ =
-      TAO_Bounded_Object_Sequence<T, T_var,MAX>::allocbuf (rhs.maximum_);
-
-  TAO_Bounded_Base_Sequence::operator= (rhs);
-
-  T **tmp1 = ACE_reinterpret_cast (T **, this->buffer_);
-  T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, rhs.buffer_);
-  for (CORBA::ULong i=0; i < rhs.length_; ++i)
-    tmp1[i] = T::_duplicate (tmp2[i]);
-  return *this;
-}
-
-template <class T, class T_var, size_t MAX> T **
-TAO_Bounded_Object_Sequence<T, T_var,MAX>::allocbuf (CORBA::ULong)
-{
-  T **buf = 0;
-
-  ACE_NEW_RETURN (buf, T*[MAX], 0);
-
-  for (CORBA::ULong i = 0; i < MAX; i++)
-    buf[i] = T::_nil ();
-
-  return buf;
-}
-
-template <class T, class T_var, size_t MAX> void
-TAO_Bounded_Object_Sequence<T, T_var,MAX>::freebuf (T **buffer)
-{
-  // How much do we deallocate? Easy! allocbuf() always creates MAX
-  // elements and initialize them to T::_nil().  So we can be
-  // complaint and call CORBA::release() on each one.
-  for (CORBA::ULong i = 0; i < MAX; ++i)
-    if (buffer[i] != T::_nil ())
-      {
-        CORBA::release (buffer[i]);
-        buffer[i] = T::_nil ();
-      }
-
-  delete[] buffer;
-}
-
-template<class T, class T_var, size_t MAX> void
-TAO_Bounded_Object_Sequence<T, T_var,MAX>::_allocate_buffer (CORBA::ULong length)
-{
-  // For this class memory is never reallocated so the implementation
-  // is *really* simple.
-  this->buffer_ =
-    TAO_Bounded_Object_Sequence<T, T_var,MAX>::allocbuf (length);
-}
-
-template<class T, class T_var, size_t MAX> void
-TAO_Bounded_Object_Sequence<T,T_var,MAX>::_deallocate_buffer (void)
-{
-  if (this->release_ == 0)
-    return;
-  T **tmp = ACE_reinterpret_cast (T **, this->buffer_);
-  TAO_Bounded_Object_Sequence<T,T_var,MAX>::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-template<class T, class T_var, size_t MAX> void
-TAO_Bounded_Object_Sequence<T,T_var, MAX>::_shrink_buffer (CORBA::ULong nl,
-                                                           CORBA::ULong ol)
-{
-  T **tmp = ACE_reinterpret_cast (T **, this->buffer_);
-
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = T::_nil ();
-    }
-}
-
-template <class T, class T_var, size_t MAX> void
-TAO_Bounded_Object_Sequence<T, T_var,MAX>::_downcast (void* target,
-                                                      CORBA_Object* src,
-                                                      CORBA_Environment &ACE_TRY_ENV)
-{
-  T **tmp = ACE_static_cast (T**, target);
-
-  *tmp = T::_narrow (src, ACE_TRY_ENV);
-
-  ACE_CHECK;
-}
-
-template <class T, class T_var, size_t MAX> CORBA_Object*
-TAO_Bounded_Object_Sequence<T, T_var,MAX>::_upcast (void* src) const
-{
-  T **tmp = ACE_static_cast (T**, src);
-
-  return *tmp;
-}
-
-// *************************************************************
-// Operations for class TAO_Unbounded_Pseudo_Sequence
-// *************************************************************
-
-// constructor for unbounded seq
-template <class T, class T_var>
-TAO_Unbounded_Pseudo_Sequence<T,T_var>::
-TAO_Unbounded_Pseudo_Sequence (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum,
-                                 TAO_Unbounded_Pseudo_Sequence<T,T_var>::allocbuf (maximum))
-{
-}
-
-template <class T, class T_var>
-TAO_Unbounded_Pseudo_Sequence<T,T_var>::
-TAO_Unbounded_Pseudo_Sequence (const TAO_Unbounded_Pseudo_Sequence<T,T_var> &rhs)
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  T **tmp1 = TAO_Unbounded_Pseudo_Sequence<T,T_var>::allocbuf (this->maximum_);
-  T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    tmp1[i] = T::_duplicate (tmp2[i]);
-
-  this->buffer_ = tmp1;
-}
-
-template<class T, class T_var>
-TAO_Unbounded_Pseudo_Sequence<T,T_var>::~TAO_Unbounded_Pseudo_Sequence (void)
-{
-  this->_deallocate_buffer ();
-}
-
-// assignment operator
-template <class T, class T_var> TAO_Unbounded_Pseudo_Sequence<T,T_var>&
-TAO_Unbounded_Pseudo_Sequence<T,T_var>::
-operator= (const TAO_Unbounded_Pseudo_Sequence<T,T_var> &rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  if (this->release_)
-    {
-      T **tmp = ACE_reinterpret_cast (T **,
-                                      this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::release (tmp[i]);
-          tmp[i] = T::_nil ();
-        }
-      if (this->maximum_ < rhs.maximum_)
-        {
-          TAO_Unbounded_Pseudo_Sequence<T,T_var>::freebuf (tmp);
-          this->buffer_ =
-            TAO_Unbounded_Pseudo_Sequence<T,T_var>::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    this->buffer_ =
-      TAO_Unbounded_Pseudo_Sequence<T,T_var>::allocbuf (rhs.maximum_);
-
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-
-  T **tmp1 = ACE_reinterpret_cast (T **, this->buffer_);
-  T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    tmp1[i] = T::_duplicate (tmp2[i]);
-
-  return *this;
-}
-
-template <class T, class T_var> T **
-TAO_Unbounded_Pseudo_Sequence<T,T_var>::allocbuf (CORBA::ULong nelems)
-{
-  T **buf = 0;
-
-  ACE_NEW_RETURN (buf, T*[nelems], 0);
-
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    buf[i] = T::_nil ();
-
-  return buf;
-}
-
-template <class T, class T_var> void
-TAO_Unbounded_Pseudo_Sequence<T,T_var>::freebuf (T **buffer)
-{
-  if (buffer == 0)
-    return;
-
-  // {orbos/97-05-15:16.11} The freebuf function ensures that the
-  // destructor for each element is called before the buffer is
-  // destroyed, except for string elements, which are freed using
-  // string_free(), and object reference elements, which are freed
-  // using release(). The freebuf function will ignore null pointers
-  // passed to it.
-
-  // @@ How are we supposed to implement that! We don't know the
-  // length of the buffer here.
-  // Mark the length in the first four bytes? For the moment we let
-  // that be.
-
-  delete [] buffer;
-}
-
-template<class T, class T_var> void
-TAO_Unbounded_Pseudo_Sequence<T,T_var>::_allocate_buffer (CORBA::ULong length)
-{
-  T **tmp = TAO_Unbounded_Pseudo_Sequence<T,T_var>::allocbuf (length);
-
-  if (this->buffer_ != 0)
-    {
-      T **old = ACE_reinterpret_cast (T**, this->buffer_);
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        // Only call duplicate when we did not own the previous
-        // buffer, since after this method we own it we must also own
-        // the objects.  If we already own the objects there is no
-        // need to copy them, if we did we would also have to remove
-        // the old instances.
-        if (!this->release_)
-          tmp[i] = T::_duplicate (old[i]);
-        else
-          tmp[i] = old[i];
-
-      if (this->release_)
-        delete[] old;
-    }
-  this->buffer_ = tmp;
-}
-
-template<class T, class T_var> void
-TAO_Unbounded_Pseudo_Sequence<T,T_var>::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    return;
-  T **tmp = ACE_reinterpret_cast (T**, this->buffer_);
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = T::_nil ();
-    }
-  TAO_Unbounded_Pseudo_Sequence<T,T_var>::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-template<class T, class T_var> void
-TAO_Unbounded_Pseudo_Sequence<T,T_var>::_shrink_buffer (CORBA::ULong nl,
-                                                        CORBA::ULong ol)
-{
-  T **tmp = ACE_static_cast (T**, this->buffer_);
-
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = T::_nil ();
-    }
-}
-
-// *************************************************************
-// Operations for class TAO_Bounded_Pseudo_Sequence
-// *************************************************************
-
-template <class T, class T_var, size_t MAX>
-TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::
-TAO_Bounded_Pseudo_Sequence (void)
-  :  TAO_Bounded_Base_Sequence (MAX,
-                                TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::allocbuf (MAX))
-{
-}
-
-template <class T, class T_var, size_t MAX>
-TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::
-TAO_Bounded_Pseudo_Sequence (const TAO_Bounded_Pseudo_Sequence<T, T_var,MAX> &rhs)
-  : TAO_Bounded_Base_Sequence (rhs)
-{
-  T **tmp1 =
-    TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::allocbuf (MAX);
-  T ** const tmp2 = ACE_reinterpret_cast (T** ACE_CAST_CONST, rhs.buffer_);
-  for (CORBA::ULong i = 0; i < rhs.length_; i++)
-    tmp1[i] = T::_duplicate (tmp2[i]);
-  this->buffer_ = tmp1;
-}
-
-template <class T, class T_var, size_t MAX> TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>&
-TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::operator=
-(const TAO_Bounded_Pseudo_Sequence<T, T_var,MAX> &rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  if (this->release_)
-    {
-      T **tmp = ACE_reinterpret_cast (T **, this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::release (tmp[i]);
-          tmp[i] = T::_nil ();
-        }
-      // No need to reallocate the buffer since it is always of size
-      // MAX
-    }
-  else
-    this->buffer_ =
-      TAO_Bounded_Pseudo_Sequence<T, T_var, MAX>::allocbuf (rhs.maximum_);
-
-  TAO_Bounded_Base_Sequence::operator= (rhs);
-
-  T **tmp1 = ACE_reinterpret_cast (T **, this->buffer_);
-  T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, rhs.buffer_);
-  for (CORBA::ULong i=0; i < rhs.length_; ++i)
-    tmp1[i] = T::_duplicate (tmp2[i]);
-  return *this;
-}
-
-template <class T, class T_var, size_t MAX> T **
-TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::allocbuf (CORBA::ULong)
-{
-  T **buf = 0;
-
-  ACE_NEW_RETURN (buf, T*[MAX], 0);
-
-  for (CORBA::ULong i = 0; i < MAX; i++)
-    buf[i] = T::_nil ();
-
-  return buf;
-}
-
-template <class T, class T_var, size_t MAX> void
-TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::freebuf (T **buffer)
-{
-  // How much do we deallocate? Easy! allocbuf() always creates MAX
-  // elements and initialize them to T::_nil().  So we can be
-  // complaint and call CORBA::release() on each one.
-  for (CORBA::ULong i = 0; i < MAX; ++i)
-    if (buffer[i] != T::_nil ())
-      {
-        CORBA::release (buffer[i]);
-        buffer[i] = T::_nil ();
-      }
-
-  delete[] buffer;
-}
-
-template<class T, class T_var, size_t MAX> void
-TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::_allocate_buffer (CORBA::ULong length)
-{
-  // For this class memory is never reallocated so the implementation
-  // is *really* simple.
-  this->buffer_ =
-    TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::allocbuf (length);
-}
-
-template<class T, class T_var, size_t MAX> void
-TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::_deallocate_buffer (void)
-{
-  if (this->release_ == 0)
-    return;
-  T **tmp = ACE_reinterpret_cast (T **, this->buffer_);
-  TAO_Bounded_Pseudo_Sequence<T, T_var, MAX>::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-template<class T, class T_var, size_t MAX> void
-TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::_shrink_buffer (CORBA::ULong nl,
-                                                           CORBA::ULong ol)
-{
-  T **tmp = ACE_reinterpret_cast (T **, this->buffer_);
-
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = T::_nil ();
-    }
-}
-
-// *************************************************************
-// Operations for class TAO_Bounded_String_Sequence
-// *************************************************************
-
-template<size_t MAX>
-TAO_Bounded_String_Sequence<MAX>::
-TAO_Bounded_String_Sequence (void)
-  :  TAO_Bounded_Base_Sequence (MAX,
-                                TAO_Bounded_String_Sequence<MAX>::allocbuf(MAX))
-{
-}
-
-template<size_t MAX>
-TAO_Bounded_String_Sequence<MAX>::
-TAO_Bounded_String_Sequence (const TAO_Bounded_String_Sequence<MAX> &rhs)
-  : TAO_Bounded_Base_Sequence (rhs)
-{
-  char **tmp1 =
-    TAO_Bounded_String_Sequence<MAX>::allocbuf (this->maximum_);
-  char ** const tmp2 = ACE_reinterpret_cast (char ** ACE_CAST_CONST,
-                                             rhs.buffer_);
-
-  for (CORBA::ULong i=0; i < rhs.length_; i++)
-    tmp1[i] = CORBA::string_dup (tmp2[i]);
-
-  this->buffer_ = tmp1;
-}
-
-template<size_t MAX> TAO_Bounded_String_Sequence<MAX>&
-TAO_Bounded_String_Sequence<MAX>::operator=
-(const TAO_Bounded_String_Sequence<MAX> &rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  if (this->release_)
-    {
-      char **tmp = ACE_reinterpret_cast (char **, this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::string_free (tmp[i]);
-          tmp[i] = 0;
-        }
-      // No need to reallocate because the buffer is supposed to be of
-      // <MAX> size.
-    }
-  else
-    this->buffer_ =
-      TAO_Bounded_String_Sequence<MAX>::allocbuf (rhs.maximum_);
-
-  TAO_Bounded_Base_Sequence::operator= (rhs);
-
-  char **tmp1 = ACE_reinterpret_cast (char **, this->buffer_);
-  char ** const tmp2 = ACE_reinterpret_cast (char ** ACE_CAST_CONST,
-                                             rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < rhs.length_; i++)
-    tmp1[i] = CORBA::string_dup (tmp2[i]);
-  return *this;
-}
-
-template<size_t MAX> TAO_SeqElem_String_Manager
-TAO_Bounded_String_Sequence<MAX>::operator[] (CORBA::ULong slot) const
-{
-  ACE_ASSERT (slot < this->maximum_);
-  char **const tmp = ACE_reinterpret_cast (char **ACE_CAST_CONST,
-                                           this->buffer_);
-  return TAO_SeqElem_String_Manager (tmp + slot,
-                                     this->release_);
-}
-
-template<size_t MAX> char **
-TAO_Bounded_String_Sequence<MAX>::allocbuf (CORBA::ULong)
-{
-  char **buf = 0;
-
-  ACE_NEW_RETURN (buf, char *[MAX], 0);
-
-  for (CORBA::ULong i = 0; i < MAX; i++)
-    buf[i] = 0;
-
-  return buf;
-}
-
-template<size_t MAX> void
-TAO_Bounded_String_Sequence<MAX>::freebuf (char* *buffer)
-{
-  // How much do we deallocate? Easy! <allocbuf> always creates MAX
-  // elements and initialize them to 0 (they say NULL, yuck!).  So we
-  // can be complaint and call CORBA::string_free() on each one.
-
-  for (CORBA::ULong i = 0; i < MAX; ++i)
-    {
-      if (buffer[i] != 0)
-        {
-          CORBA::string_free (buffer[i]);
-          buffer[i] = 0;
-        }
-    }
-
-  delete [] buffer;
-}
-
-template<size_t MAX> void
-TAO_Bounded_String_Sequence<MAX>::_allocate_buffer (CORBA::ULong /* length */)
-{
-  // For this class memory is never reallocated so the implementation
-  // is *really* simple.
-  this->buffer_ =
-    TAO_Bounded_String_Sequence<MAX>::allocbuf (MAX);
-}
-
-template<size_t MAX> void
-TAO_Bounded_String_Sequence<MAX>::_deallocate_buffer (void)
-{
-  if (this->release_ == 0)
-    return;
-  char **tmp = ACE_reinterpret_cast (char **, this->buffer_);
-  TAO_Bounded_String_Sequence<MAX>::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-template<size_t MAX> void
-TAO_Bounded_String_Sequence<MAX>::_shrink_buffer (CORBA::ULong nl,
-                                                  CORBA::ULong ol)
-{
-  char **tmp = ACE_reinterpret_cast (char **,
-                                     this->buffer_);
-
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::string_free (tmp[i]);
-      tmp[i] = 0;
-    }
-}
-
-#endif /* TAO_SEQUENCE_T_C */
diff --git a/TAO/tao/Sequence_T.h b/TAO/tao/Sequence_T.h
deleted file mode 100644
index 94df1ddcb6a..00000000000
--- a/TAO/tao/Sequence_T.h
+++ /dev/null
@@ -1,796 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    sequence_T.h
-//
-// = AUTHOR
-//    Carlos O'Ryan and Aniruddha Gokhale
-//
-// ============================================================================
-
-#ifndef TAO_SEQUENCE_T_H
-#define TAO_SEQUENCE_T_H
-
-#include "tao/Sequence.h"
-
-template <class T>
-class TAO_Unbounded_Sequence : public TAO_Unbounded_Base_Sequence
-{
-  // = TITLE
-  //   Parametrized implementation of IDL unbounded sequences.
-  //
-  // = DESCRIPTION
-  //   This class completes the implementation for TAO_Base_Sequence
-  //   for the unbounded case.
-public:
-  // = Initialization and termination methods.
-
-  TAO_Unbounded_Sequence (void);
-  // Default constructor.
-
-  TAO_Unbounded_Sequence (CORBA::ULong max);
-  // Constructor using a maximum length value.
-
-  TAO_Unbounded_Sequence (CORBA::ULong max,
-                          CORBA::ULong length,
-                          T *data,
-                          CORBA::Boolean release = 0);
-  // Constructor using the data and memory management flag.  Memory
-  // *must* be allocated using the ::allocbuf static method, since in
-  // the future this classes may use a global ACE_Allocator.
-
-  TAO_Unbounded_Sequence (const TAO_Unbounded_Sequence<T> &);
-  // Copy constructor.
-
-  TAO_Unbounded_Sequence<T> &operator= (const TAO_Unbounded_Sequence<T> &);
-  // Assignment operator.
-
-  ~TAO_Unbounded_Sequence (void);
-  // Dtor.
-
-  // = Accessors.
-
-  T &operator[] (CORBA::ULong);
-  // operator []
-
-  const T &operator[] (CORBA::ULong) const;
-  // operator []
-
-  // = Static operations.
-
-  static T *allocbuf (CORBA::ULong);
-  // Allocate storage for the sequence.
-
-  static void freebuf (T *);
-  // Free the sequence.
-
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-  // = orbos/98-01-11 proposed extensions.
-  T *get_buffer (CORBA::Boolean orphan = 0);
-  // Allows read-write access to the underlying buffer.  If <orphan>
-  // is FALSE the sequence returns a pointer to its buffer, allocating
-  // one if it has not yet done so.  The number of elements in the
-  // buffer can be determined from the sequence <length> accessor.
-  //
-  // If the <orphan> argument to <get_buffer> is FALSE, the sequence
-  // maintains ownership of the underlying buffer.  Elements in the
-  // returned buffer may be directly replaced by the caller.  For
-  // sequences of strings, wide strings, and object references, the
-  // caller must use the sequence <release> accessor to determine
-  // whether elements should be freed (using <string_free>,
-  // <wstring_free>, or <CORBA::release> for strings, wide straings,
-  // and object references, respective) before being directly assigned
-  // to.
-  //
-  // If the <orphan> argument to <get_buffer> is TRUE, the sequence
-  // yields ownership of the buffer to the caller.  If <orphan> is
-  // TRUE and the sequence does not own its buffer (i.e., its
-  // <release> flag is FALSE), the return value is a null pointer.  If
-  // the buffer is taken from the sequence using this form of
-  // <get_buffer>, the sequence reverts to the same state it would
-  // have if constructed using its default constructor.  The caller
-  // becomes responsible for eventually freeing each element of the
-  // returned buffer (for strings, wide string, and object
-  // references), and then freeing the returned buffer itself using
-  // <freebuf>.
-
-  const T *get_buffer (void) const;
-  // This function allows read-only access to the sequence buffer.
-  // The sequence returns its buffer, allocating one of one has not
-  // yet been allocated.  No direct modification of the returned
-  // buffer by the caller is permitted.
-
-  void replace (CORBA::ULong max,
-                CORBA::ULong length,
-                T *data,
-                CORBA::Boolean release = 0);
-  // Allows the buffer underlying a sequence to be replaced.  The
-  // parameters to <replace> are identical in type, order, and purpose
-  // to those for the <T *data> constructor for the sequence.
-};
-
-template <class T, size_t MAX>
-class TAO_Bounded_Sequence : public TAO_Bounded_Base_Sequence
-{
-  // = TITLE
-  //   Parametric bounded sequence.
-  //
-  // = DESCRIPTION
-  //   This class completes the implementation for TAO_Base_Sequence
-  //   for the bounded case.
-public:
-  // = Initialization and termination methods.
-  TAO_Bounded_Sequence (void);
-  // Default constructor.
-
-  TAO_Bounded_Sequence (CORBA::ULong length,
-                        T *data,
-                        CORBA::Boolean release=0);
-  // Constructor using the data and memory management flag.
-
-  TAO_Bounded_Sequence (const TAO_Bounded_Sequence<T,MAX> &);
-  // Copy constructor.
-
-  TAO_Bounded_Sequence<T,MAX> &operator= (const TAO_Bounded_Sequence<T,MAX> &);
-  // Assignment operator.
-
-  ~TAO_Bounded_Sequence (void);
-  // Dtor.
-
-  // = Accessors.
-  T &operator[] (CORBA::ULong);
-  // operator []
-
-  const T &operator[] (CORBA::ULong) const;
-  // operator []
-
-  // = Static operations.
-
-  static T *allocbuf (CORBA::ULong);
-  // Allocate storage for the sequence.
-
-  static void freebuf (T *);
-  // Free the sequence.
-
-  virtual void _allocate_buffer (CORBA::ULong length);
-  // allocate a buffer of the requested length. The buffer is allocated for the
-  // right type
-
-  virtual void _deallocate_buffer (void);
-  // deallocate the buffer
-
-  // = orbos/98-01-11 proposed extensions.
-  T *get_buffer (CORBA::Boolean orphan = 0);
-  // Allows read-write access to the underlying buffer.  If <orphan>
-  // is FALSE the sequence returns a pointer to its buffer, allocating
-  // one if it has not yet done so.  The size of the returned buffer
-  // is equal to the sequence bound, which can be determined with the
-  // <maximum> accessor.  The number of elements in the buffer can be
-  // determined from the sequence <length> accessor.
-  //
-  // If the <orphan> argument to <get_buffer> is FALSE, the sequence
-  // maintains ownership of the underlying buffer.  Elements in the
-  // returned buffer may be directly replaced by the caller.  For
-  // sequences of strings, wide strings, and object references, the
-  // caller must use the sequence <release> accessor to determine
-  // whether elements should be freed (using <string_free>,
-  // <wstring_free>, or <CORBA::release> for strings, wide straings,
-  // and object references, respective) before being directly assigned
-  // to.
-  //
-  // If the <orphan> argument to <get_buffer> is TRUE, the sequence
-  // yields ownership of the buffer to the caller.  If <orphan> is
-  // TRUE and the sequence does not own its buffer (i.e., its
-  // <release> flag is FALSE), the return value is a null pointer.  If
-  // the buffer is taken from the sequence using this form of
-  // <get_buffer>, the sequence reverts to the same state it would
-  // have if constructed using its default constructor.  The caller
-  // becomes responsible for eventually freeing each element of the
-  // returned buffer (for strings, wide string, and object
-  // references), and then freeing the returned buffer itself using
-  // <freebuf>.
-
-  const T *get_buffer (void) const;
-  // This function allows read-only access to the sequence buffer.
-  // The sequence returns its buffer, allocating one of one has not
-  // yet been allocated.  No direct modification of the returned
-  // buffer by the caller is permitted.
-
-  void replace (CORBA::ULong max,
-                CORBA::ULong length,
-                T *data,
-                CORBA::Boolean release = 0);
-  // Allows the buffer underlying a sequence to be replaced.  The
-  // parameters to <replace> are identical in type, order, and purpose
-  // to those for the <T *data> constructor for the sequence.
-};
-
-// *************************************************************
-
-template<class T,class T_var> class TAO_Unbounded_Object_Sequence;
-template<class T,class T_var> class TAO_Unbounded_Pseudo_Sequence;
-template<class T, class T_var, size_t MAX> class TAO_Bounded_Object_Sequence;
-template<size_t MAX> class TAO_Bounded_String_Sequence;
-
-template<class T,class T_var> class TAO_Object_Field_T;
-
-// *************************************************************
-
-template<class T, class T_var>
-class TAO_Object_Manager
-{
-  // = TITLE
-  //   Manager for Objects.
-  //
-  // = DESCRIPTION
-  //   The mapping for sequences of objects (and other pseudo objects)
-  //   requires an auxiliar class or <Manager> to handle the reference
-  //   count on the object, (a kind of smart pointer).
-  //   The main difference with respect to T_var classes is that
-  //   automatic release is not controlled on a per-item basis, but
-  //   for the sequence as a whole.
-  //   Further the class must implement "transparent" assignment into
-  //   the sequence, for instance, operator[] returns a managed
-  //   object, but:
-  //
-  //      object_sequence[i] = foo;
-  //
-  //   must change the state of the sequence.
-  //
-  //   This class implements the generic object manager and is used to
-  //   instantiate the proper sequence types.
-  //
-  // = NOTES
-  //   It has been proposed that the class should be parametric on
-  //   both T and T_ptr, IMHO this is no necesary: though the IDL spec
-  //   says that T_ptr *could* map to a type different to T* in the
-  //   particular case of TAO it does map to <T*>.
-  //
-  friend class TAO_Unbounded_Object_Sequence<T,T_var>;
-public:
-  // @@ Use partial template specialization here to give access only
-  // to the right kind of sequence.
-  // friend template<CORBA::ULong MAX>
-  //    class TAO_Bounded_Object_Sequence<T,MAX>;
-
-  // = Initialization and termination methods.
-  TAO_Object_Manager (const TAO_Object_Manager<T,T_var> &rhs);
-  // Copy constructor, the semantics are non-trivial:
-  //   + The referenced element is duplicated or not according to the
-  //   release value on the <rhs>.
-  //   + In any case a new reference to the same object is created.
-
-  TAO_Object_Manager (T **, CORBA::Boolean release);
-  // Constructor from address of an element, it should be private and
-  // only TAO_*_Object_Sequence would use it, but we have some
-  // problems with friendship and templates.
-
-  ~TAO_Object_Manager (void);
-  // Destructor, only releases the object if <release_> is true.
-
-  TAO_Object_Manager<T,T_var> &operator= (const TAO_Object_Manager<T,T_var> &rhs);
-  // Assignment from another managed type, only release if
-  // <this->release_> is true.
-  // @@ TODO what happens if rhs.release_ is true an this->relase_ is
-  // false?
-
-  TAO_Object_Manager<T,T_var> &operator= (const TAO_Object_Field_T<T,T_var> &rhs);
-  // Assignment from another var-like type, only release if
-  // <this->release_> is true and only duplicate if this->release_ is
-  // true.
-
-  TAO_Object_Manager<T,T_var> &operator= (T *);
-  // Assignment from T *.
-
-  TAO_Object_Manager<T,T_var> &operator= (T_var &);
-  // Assignment from T *.
-
-  T * operator-> (void) const;
-  // Return pointer.
-
-  operator const T *() const;
-  // Cast (read-only).
-
-  operator T *&();
-  // Cast.
-
-  T *in (void) const;
-  // for in parameter.
-
-  T *&inout (void);
-  // for inout parameter.
-
-  T *&out (void);
-  // for out parameter.
-
-  T *_retn (void);
-  // for return type
-
-private:
-  T **ptr_;
-  // data member, notice that it is a pointer, to implement the
-  // reference behavior for assignment.
-
-  CORBA::Boolean release_;
-  // release flag based on parent's flag
-};
-
-template<class T, class T_var>
-class TAO_Pseudo_Object_Manager
-{
-  // = TITLE
-  //   Manager for Pseudo Objects.
-  //
-  // = DESCRIPTION
-  //
-  friend class TAO_Unbounded_Pseudo_Sequence<T,T_var>;
-public:
-  // @@ Use partial template specialization here to give access only
-  // to the right kind of sequence.
-  // friend template<CORBA::ULong MAX>
-  //    class TAO_Bounded_Object_Sequence<T,MAX>;
-
-  // = Initialization and termination methods.
-  TAO_Pseudo_Object_Manager (const TAO_Pseudo_Object_Manager<T,T_var> &rhs);
-  // Copy constructor, the semantics are non-trivial:
-  //   + The referenced element is duplicated or not according to the
-  //   release value on the <rhs>.
-  //   + In any case a new reference to the same object is created.
-
-  TAO_Pseudo_Object_Manager (T **, CORBA::Boolean release);
-  // Constructor from address of an element, it should be private and
-  // only TAO_*_Object_Sequence would use it, but we have some
-  // problems with friendship and templates.
-
-  ~TAO_Pseudo_Object_Manager (void);
-  // Destructor, only releases the object if <release_> is true.
-
-  TAO_Pseudo_Object_Manager<T,T_var> &operator= (const TAO_Pseudo_Object_Manager<T,T_var> &rhs);
-  // Assignment from another managed type, only release if
-  // <this->release_> is true.
-  // @@ TODO what happens if rhs.release_ is true an this->relase_ is
-  // false?
-
-  TAO_Pseudo_Object_Manager<T,T_var> &operator= (T *);
-  // Assignment from T *.
-
-  TAO_Pseudo_Object_Manager<T,T_var> &operator= (T_var &);
-  // Assignment from T *.
-
-  T * operator-> (void) const;
-  // Return pointer.
-
-  operator const T *() const;
-  // Cast (read-only).
-
-  operator T *&();
-  // Cast.
-
-  T *in (void) const;
-  // for in parameter.
-
-  T *&inout (void);
-  // for inout parameter.
-
-  T *&out (void);
-  // for out parameter.
-
-  T *_retn (void);
-  // for return type
-
-private:
-  T **ptr_;
-  // data member, notice that it is a pointer, to implement the
-  // reference behavior for assignment.
-
-  CORBA::Boolean release_;
-  // release flag based on parent's flag
-};
-
-// *************************************************************
-
-template<class T,class T_var>
-class TAO_Unbounded_Object_Sequence : public TAO_Unbounded_Base_Sequence
-{
-  // = TITLE
-  //   Parametric sequence for types that require managers.
-  //
-  // = DESCRIPTION
-  //   Some IDL types require that sequences on them have a "manager"
-  //   class, in charge of handling the object lifetime, examples are
-  //   pseudo objects, object references and strings.
-
-  // = SPEC
-  //   16.8 Mapping for Structured Types
-  //   The mapping for struct, union, and sequence (but not array) is a
-  //   C++ struct or class with a default constructor, a copy
-  //   constructor, an assignment operator, and a destructor.
-  //
-public:
-  // = Initialization and termination methods.
-
-  TAO_Unbounded_Object_Sequence (void);
-  // {orbos/97-05-15:16.8}
-  // The default constructor initializes object reference members to
-  // appropriately typed nil object references and string members to
-  // NULL; all other members are initialized via their default
-  // constructors.
-  //
-  // {orbos/97-05-15:16.11}
-  // For both bounded and unbounded sequences, the default constructor
-  // (as shown in the example above) sets the sequence length equal to
-  // 0.
-
-  TAO_Unbounded_Object_Sequence (CORBA::ULong max);
-  // Unbounded sequences provide a constructor that allows only the
-  // initial value of the maximum length to be set (the ``maximum
-  // constructor'' shown in the example above). This allows
-  // applications to control how much buffer space is initially
-  // allocated by the sequence. This constructor also sets the length
-  // to 0 and the release flag to TRUE.
-
-  TAO_Unbounded_Object_Sequence (CORBA::ULong maximum,
-                                 CORBA::ULong length,
-                                 T* *data,
-                                 CORBA::Boolean release=0);
-  // The ``T *data'' constructor (as shown in the example above)
-  // allows the length and contents of a bounded or unbounded sequence
-  // to be set. For unbounded sequences, it also allows the initial
-  // value of the maximum length to be set. For this constructor,
-  // ownership of the contents vector is determined by the release
-  // parameter---FALSE means the caller owns the storage, while TRUE
-  // means that the sequence assumes ownership of the storage.
-  // If release is TRUE, the contents vector must have been allocated
-  // using the sequence allocbuf function, and the sequence will pass
-  // it to freebuf when finished with it.
-
-  TAO_Unbounded_Object_Sequence(const TAO_Unbounded_Object_Sequence<T,T_var> &);
-  // The copy constructor performs a deep copy from the existing
-  // structure to create a new structure, including calling _duplicate
-  // on all object  reference members and performing the necessary
-  // heap allocations for all string members.
-  //
-  // The copy constructor creates a new sequence with the same maximum
-  // and length as the given sequence, copies each of its current
-  // elements (items zero through length-1), and sets the release
-  // flag to TRUE.
-
-  ~TAO_Unbounded_Object_Sequence (void);
-  // The destructor releases all object reference memebrs and frees
-  // all string members.
-
-  TAO_Unbounded_Object_Sequence<T,T_var> &operator= (const TAO_Unbounded_Object_Sequence <T,T_var> &);
-  // The assignment operator first releases all object reference
-  // members and frees all string members, and then performs a
-  // deepcopy to create a new structure.
-  //
-  // The assignment operator deepcopies its parameter, releasing old
-  // storage if necessary. It behaves as if the original sequence is
-  // destroyed via its destructor and then the source sequence copied
-  // using the copy constructor. If release=TRUE, the destructor
-  // destroys each of the current elements (items zero through
-  // length--1).  For an unbounded sequence, if a reallocation is
-  // necessary due to a change in the length and the sequence was
-  // created using the release=TRUE parameter in its constructor, the
-  // sequence will deallocate the old storage. If release is FALSE
-  // under these circumstances, old storage will not be freed before
-  // the reallocation is performed. After reallocation, the release
-  // flag is always set to TRUE.
-
-  TAO_Object_Manager<T,T_var> operator[] (CORBA::ULong slot) const;
-  // read-write accessor
-
-  static T **allocbuf (CORBA::ULong);
-  // The allocbuf function allocates a vector of T elements that can
-  // be passed to the T *data constructor. The length of the vector is
-  // given by the nelems function argument.  The allocbuf function
-  // initializes each element using its default constructor, except
-  // for strings, which are initialized to null pointers, and object
-  // references, which are initialized to suitably typed nil object
-  // references. A null pointer is returned if allocbuf for some
-  // reason cannot allocate the requested vector. Vectors allocated by
-  // allocbuf should be freed using the freebuf function.
-
-  static void freebuf (T **);
-  // The freebuf function ensures that the destructor for each element
-  // is called before the buffer is destroyed, except for string
-  // elements, which are freed using string_free(), and object
-  // reference elements, which are freed using release(). The freebuf
-  // function will ignore null pointers passed to it.
-
-  // The Base_Sequence functions, please see "tao/Sequence.h"
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-  virtual void _downcast (void* target,
-                          CORBA_Object* src,
-                          CORBA_Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  // No default to workaround egcs problem with templates and
-  // namespaces
-  virtual CORBA_Object* _upcast (void* src) const;
-};
-
-// *************************************************************
-
-template<class T, class T_var, size_t MAX>
-class TAO_Bounded_Object_Sequence : public TAO_Bounded_Base_Sequence
-{
-  // = TITLE
-  //   Parametric sequence for types that require managers.
-  //
-  // = DESCRIPTION
-  //   Please see the documentation for the unbounded case.
-  //
-public:
-  // = Initialization and termination methods.
-
-  TAO_Bounded_Object_Sequence (void);
-  // For bounded sequences, the maximum length is part of the type and
-  // cannot be set or modified, while for unbounded sequences, the
-  // default constructor also sets the maximum length to 0. The
-  // default constructor for a bounded sequence always allocates a
-  // contents vector, so it always sets the release flag to TRUE.
-
-  TAO_Bounded_Object_Sequence (CORBA::ULong length,
-                               T* *value,
-                               CORBA::Boolean release=0);
-  // Constructor from data.
-
-  TAO_Bounded_Object_Sequence (const TAO_Bounded_Object_Sequence<T,T_var,MAX> &);
-  // Copy constructor.
-
-  ~TAO_Bounded_Object_Sequence (void);
-  // destructor
-
-  TAO_Bounded_Object_Sequence &operator= (const TAO_Bounded_Object_Sequence<T,T_var,MAX> &);
-  // Assignment from another Bounded sequence.
-
-  TAO_Object_Manager<T,T_var> operator[] (CORBA::ULong slot) const;
-  // Read-write accessor.
-
-  static T **allocbuf (CORBA::ULong length);
-  // Allocate storage for a sequence..
-
-  static void freebuf (T **buffer);
-  // Free a buffer allocated by allocbuf() and release each element on
-  // it.
-
-  // The Base_Sequence functions, please see "tao/sequence.h"
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-  virtual void _downcast (void* target,
-                          CORBA_Object* src,
-                          CORBA_Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  // No default to workaround egcs problem with templates and
-  // namespaces
-  virtual CORBA_Object* _upcast (void* src) const;
-};
-
-// *************************************************************
-
-template<class T,class T_var>
-class TAO_Unbounded_Pseudo_Sequence : public TAO_Unbounded_Base_Sequence
-{
-  // = TITLE
-  //   Parametric sequence for pseudo objects.
-  //
-  // = DESCRIPTION
-  //   Some IDL types (including pseudo objects) require that
-  //   sequences on them have a "manager" class, in charge of handling
-  //   the object lifetime.
-  //   This parametric class implements those sequences. In general
-  //   the sequence is similar to Object_Sequente, except for some
-  //   TAO internal details. The complete documentation of each method
-  //   is provided in TAO_Unbounded_Object_Sequece
-public:
-  // = Initialization and termination methods.
-
-  TAO_Unbounded_Pseudo_Sequence (void);
-  // default ctor
-
-  TAO_Unbounded_Pseudo_Sequence (CORBA::ULong max);
-  // Constructor with a "hint" for the maximum capacity.
-
-  TAO_Unbounded_Pseudo_Sequence (CORBA::ULong maximum,
-                                 CORBA::ULong length,
-                                 T* *data,
-                                 CORBA::Boolean release=0);
-  // Constructor with a given buffer.
-
-  TAO_Unbounded_Pseudo_Sequence(const TAO_Unbounded_Pseudo_Sequence<T,T_var> &);
-  // Copy ctor, deep copies.
-
-  ~TAO_Unbounded_Pseudo_Sequence (void);
-  // dtor releases all the contained elements.
-
-  TAO_Unbounded_Pseudo_Sequence<T,T_var> &operator= (const TAO_Unbounded_Pseudo_Sequence <T,T_var> &);
-  // The assignment operator first releases all object reference
-  // members and frees all string members, and then performs a
-  // deepcopy to create a new structure.
-
-  TAO_Pseudo_Object_Manager<T,T_var> operator[] (CORBA::ULong slot) const;
-  // read-write accessor
-
-  static T **allocbuf (CORBA::ULong);
-  // The allocbuf function allocates a vector of T elements that can
-  // be passed to the T *data constructor.
-
-  static void freebuf (T **);
-  // Release all the elements.
-
-  // The Base_Sequence functions, please see "tao/Sequence.h"
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-};
-
-// *************************************************************
-
-template<class T, class T_var, size_t MAX>
-class TAO_Bounded_Pseudo_Sequence : public TAO_Bounded_Base_Sequence
-{
-  // = TITLE
-  //   Bounded version of TAO_Unbounded_Pseudo_Sequence.
-  //
-  // = DESCRIPTION
-  //   Please see the documentation for the unbounded case.
-  //
-public:
-  // = Initialization and termination methods.
-
-  TAO_Bounded_Pseudo_Sequence (void);
-  // default ctor.
-
-  TAO_Bounded_Pseudo_Sequence (CORBA::ULong length,
-                               T* *value,
-                               CORBA::Boolean release=0);
-  // Constructor from data.
-
-  TAO_Bounded_Pseudo_Sequence (const TAO_Bounded_Pseudo_Sequence<T,T_var,MAX> &);
-  // Copy constructor.
-
-  ~TAO_Bounded_Pseudo_Sequence (void);
-  // destructor
-
-  TAO_Bounded_Pseudo_Sequence &operator= (const TAO_Bounded_Pseudo_Sequence<T,T_var,MAX> &);
-  // Assignment from another Bounded sequence.
-
-  TAO_Pseudo_Object_Manager<T,T_var> operator[] (CORBA::ULong slot) const;
-  // Read-write accessor.
-
-  static T **allocbuf (CORBA::ULong length);
-  // Allocate storage for a sequence..
-
-  static void freebuf (T **buffer);
-  // Free a buffer allocated by allocbuf() and release each element on
-  // it.
-
-  // The Base_Sequence functions, please see "tao/sequence.h"
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-};
-
-// *************************************************************
-
-template<size_t MAX>
-class TAO_Bounded_String_Sequence : public TAO_Bounded_Base_Sequence
-{
-  // = TITLE
-  //   Bounded sequence of strings.
-  //
-  // = DESCRIPTION
-  //   As its unbounded counterpart it duplicates and releases strings
-  //   (via CORBA::string_dup and CORBA::string_free) under the
-  //   control of a per sequence flag, but the capacity of the
-  //   sequence is bound on the type.
-public:
-  TAO_Bounded_String_Sequence (void);
-  // {SPEC}
-  // For bounded sequences, the maximum length is part of the type and
-  // cannot be set or modified, while for unbounded  sequences, the
-  // default constructor also sets the maximum length to 0. The
-  // default constructor for a bounded sequence always allocates a
-  // contents vector, so it always sets the release flag to TRUE.
-
-  TAO_Bounded_String_Sequence (CORBA::ULong length,
-                               char* *value,
-                               CORBA::Boolean release = 0);
-  // {SPEC}
-  // The ``T *data'' constructor (as shown in the example above)
-  // allows the length and contents of a bounded or unbounded sequence
-  // to be set. For unbounded sequences, it also allows the initial
-  // value of the maximum length to be set. For this constructor,
-  // ownership of the contents vector is determined by the release
-  // parameter---FALSE means the caller owns the storage, while TRUE
-  // means that the sequence assumes ownership of the storage.
-  //
-  // If release is TRUE, the contents vector must have been allocated
-  // using the sequence  allocbuf function, and the sequence will pass
-  // it to freebuf when finished with it.
-
-  TAO_Bounded_String_Sequence (const TAO_Bounded_String_Sequence<MAX> &);
-  // {SPEC}
-  // Management Functions'' on page 16. The copy constructor creates a
-  // new sequence with the same maximum and length as the given
-  // sequence, copies each of its current elements (items zero through
-  // length--1), and sets the release flag to TRUE.
-
-  TAO_Bounded_String_Sequence &operator= (const TAO_Bounded_String_Sequence<MAX> &);
-  // {SPEC}
-  // The assignment operator deep copies its parameter, releasing
-  // old storage if necessary. It behaves as if the original sequence
-  // is destroyed via its destructor and then the source sequence
-  // copied using the copy constructor.
-
-  ~TAO_Bounded_String_Sequence (void);
-  // {SPEC}
-  // If release=TRUE, the destructor destroys each of the current
-  // elements (items zero through length-1).
-
-  TAO_SeqElem_String_Manager operator[] (CORBA::ULong slot) const;
-  // read-write accessor
-
-  static char **allocbuf (CORBA::ULong length);
-  // {SPEC}
-  // The allocbuf function allocates a vector of T elements that can
-  // be passed to the T *data constructor. The length of the vector is
-  // given by the nelems function argument.  The allocbuf function
-  // initializes each element using its default constructor, except
-  // for strings, which are initialized to null pointers, and object
-  // references, which are initialized to suitably typed nil object
-  // references. A null pointer is returned if allocbuf for some
-  // reason cannot allocate the requested vector. Vectors allocated by
-  // allocbuf should be freed using the freebuf function.
-
-  static void freebuf (char **buffer);
-  // {SPEC}
-  // The freebuf function ensures that the destructor for each element
-  // is called before the buffer is destroyed, except for string
-  // elements, which are freed using string_free(), and object
-  // reference elements, which are freed using release(). The freebuf
-  // function will ignore null pointers passed to it.
-
-  // @@ Please document me.
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-};
-
-// *************************************************************
-
-#if defined (__ACE_INLINE__)
-#include "tao/Sequence_T.i"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Sequence_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Sequence_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* TAO_SEQUENCE_T_H */
diff --git a/TAO/tao/Sequence_T.i b/TAO/tao/Sequence_T.i
deleted file mode 100644
index 5162df73b7a..00000000000
--- a/TAO/tao/Sequence_T.i
+++ /dev/null
@@ -1,476 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ***************************************************
-// Operations on the generic unbounded sequence class.
-// ***************************************************
-
-template <class T> ACE_INLINE T *
-TAO_Unbounded_Sequence<T>::allocbuf (CORBA::ULong size)
-{
-  return new T[size];
-}
-
-template <class T> ACE_INLINE void
-TAO_Unbounded_Sequence<T>::freebuf (T *buffer)
-{
-  delete [] buffer;
-}
-
-template <class T> ACE_INLINE
-TAO_Unbounded_Sequence<T>::TAO_Unbounded_Sequence (void)
-{
-}
-
-template <class T> ACE_INLINE
-TAO_Unbounded_Sequence<T>::TAO_Unbounded_Sequence (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum,
-                                 TAO_Unbounded_Sequence<T>::allocbuf (maximum))
-{
-}
-
-template <class T> ACE_INLINE
-TAO_Unbounded_Sequence<T>::TAO_Unbounded_Sequence (CORBA::ULong maximum,
-                                                   CORBA::ULong length,
-                                                   T *data,
-                                                   CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-template <class T> ACE_INLINE T *
-TAO_Unbounded_Sequence<T>::get_buffer (CORBA::Boolean orphan)
-{
-  T *result = 0;
-  if (orphan == 0)
-    {
-      // We retain ownership.
-
-      if (this->buffer_ == 0)
-        {
-          result = TAO_Unbounded_Sequence<T>::allocbuf (this->length_);
-          this->buffer_ = result;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (T*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish
-          // ownership.
-          result = ACE_reinterpret_cast(T*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-      /* else
-         // Oops, it's not our buffer to relinquish...
-         return 0;
-      */
-    }
-  return result;
-}
-
-template <class T> ACE_INLINE const T *
-TAO_Unbounded_Sequence<T>::get_buffer (void) const
-{
-  return ACE_reinterpret_cast(const T * ACE_CAST_CONST, this->buffer_);
-}
-
-template <class T> ACE_INLINE void
-TAO_Unbounded_Sequence<T>::replace (CORBA::ULong max,
-                                    CORBA::ULong length,
-                                    T *data,
-                                    CORBA::Boolean release)
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  if (this->buffer_ && this->release_ == 1)
-    {
-      T *tmp = ACE_reinterpret_cast(T*,this->buffer_);
-      TAO_Unbounded_Sequence<T>::freebuf (tmp);
-    }
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-// ***************************************************
-// operations on the generic Bounded sequence class
-// ***************************************************
-
-template <class T, size_t MAX> ACE_INLINE T *
-TAO_Bounded_Sequence<T, MAX>::allocbuf (CORBA::ULong)
-{
-  return new T[MAX];
-}
-
-template <class T, size_t MAX> ACE_INLINE void
-TAO_Bounded_Sequence<T, MAX>::freebuf (T *buffer)
-{
-  delete [] buffer;
-}
-
-template <class T, size_t MAX> ACE_INLINE
-TAO_Bounded_Sequence<T, MAX>::TAO_Bounded_Sequence (void)
-  : TAO_Bounded_Base_Sequence (MAX, 0, allocbuf (MAX), 1)
-{
-}
-
-template <class T, size_t MAX> ACE_INLINE
-TAO_Bounded_Sequence<T, MAX>::TAO_Bounded_Sequence (CORBA::ULong length,
-                                                    T *data,
-                                                    CORBA::Boolean release)
-  : TAO_Bounded_Base_Sequence (MAX, length, data, release)
-{
-}
-
-template <class T, size_t MAX> ACE_INLINE T *
-TAO_Bounded_Sequence<T, MAX>::get_buffer (CORBA::Boolean orphan)
-{
-  T *result = 0;
-  if (orphan == 0)
-    {
-      // We retain ownership.
-
-      if (this->buffer_ == 0)
-        {
-          result = TAO_Bounded_Sequence<T,MAX>::allocbuf (this->maximum_);
-          this->buffer_ = result;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (T*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish
-          // ownership.
-          result = ACE_reinterpret_cast(T*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  return result;
-}
-
-template <class T, size_t MAX> ACE_INLINE const T *
-TAO_Bounded_Sequence<T, MAX>::get_buffer (void) const
-{
-  return ACE_reinterpret_cast(const T * ACE_CAST_CONST, this->buffer_);
-}
-
-template <class T, size_t MAX> ACE_INLINE void
-TAO_Bounded_Sequence<T, MAX>::replace (CORBA::ULong max,
-                                       CORBA::ULong length,
-                                       T *data,
-                                       CORBA::Boolean release)
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  if (this->buffer_ && this->release_ == 1)
-    {
-      T* tmp = ACE_reinterpret_cast(T*, this->buffer_);
-      TAO_Bounded_Sequence<T, MAX>::freebuf (tmp);
-    }
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-template <class T, size_t MAX> ACE_INLINE T &
-TAO_Bounded_Sequence<T, MAX>::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  T *tmp = ACE_reinterpret_cast (T*,this->buffer_);
-  return tmp[i];
-}
-
-template <class T, size_t MAX> ACE_INLINE const T &
-TAO_Bounded_Sequence<T, MAX>::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  const T* tmp = ACE_reinterpret_cast (const T* ACE_CAST_CONST,this->buffer_);
-  return tmp[i];
-}
-
-// *************************************************************
-// Inline operations for class TAO_Object_Manager<T>
-// *************************************************************
-
-template <class T, class T_var> ACE_INLINE
-TAO_Object_Manager<T,T_var>::~TAO_Object_Manager (void)
-{
-}
-
-template <class T, class T_var> ACE_INLINE
-TAO_Object_Manager<T,T_var>::TAO_Object_Manager (const TAO_Object_Manager<T,T_var> &rhs)
-  : ptr_ (rhs.ptr_),
-    release_ (rhs.release_)
-{
-}
-
-template <class T, class T_var> ACE_INLINE
-TAO_Object_Manager<T,T_var>::TAO_Object_Manager(T** buffer, CORBA::Boolean release)
-  : ptr_ (buffer),
-    release_ (release)
-{
-}
-
-template <class T, class T_var> ACE_INLINE T *
-TAO_Object_Manager<T,T_var>::operator-> (void) const
-{
-  return *this->ptr_;
-}
-
-template <class T, class T_var> ACE_INLINE
-TAO_Object_Manager<T,T_var>::operator const T* () const // cast
-{
-  return *this->ptr_;
-}
-
-template <class T, class T_var> ACE_INLINE
-TAO_Object_Manager<T,T_var>::operator T* &() // cast
-{
-  return *this->ptr_;
-}
-
-template <class T, class T_var> ACE_INLINE T *
-TAO_Object_Manager<T,T_var>::in (void) const
-{
-  return *this->ptr_;
-}
-
-template <class T, class T_var> ACE_INLINE T *&
-TAO_Object_Manager<T,T_var>::inout (void)
-{
-  return *this->ptr_;
-}
-
-template <class T, class T_var> ACE_INLINE T *&
-TAO_Object_Manager<T,T_var>::out (void)
-{
-  CORBA::release (*this->ptr_);
-  *this->ptr_ = T::_nil ();
-  return *this->ptr_;
-}
-
-template <class T, class T_var> ACE_INLINE T *
-TAO_Object_Manager<T,T_var>::_retn (void)
-{
-  T *temp = *this->ptr_;
-  *this->ptr_ = T::_nil ();
-  return temp;
-}
-
-// *************************************************************
-// Inline operations for class TAO_Pseudo_Object_Manager<T>
-// *************************************************************
-
-template <class T, class T_var> ACE_INLINE
-TAO_Pseudo_Object_Manager<T,T_var>::~TAO_Pseudo_Object_Manager (void)
-{
-}
-
-template <class T, class T_var> ACE_INLINE
-TAO_Pseudo_Object_Manager<T,T_var>::
-    TAO_Pseudo_Object_Manager (const TAO_Pseudo_Object_Manager<T,T_var> &rhs)
-  : ptr_ (rhs.ptr_),
-    release_ (rhs.release_)
-{
-}
-
-template <class T, class T_var> ACE_INLINE
-TAO_Pseudo_Object_Manager<T,T_var>::
-    TAO_Pseudo_Object_Manager(T** buffer, CORBA::Boolean release)
-  : ptr_ (buffer),
-    release_ (release)
-{
-}
-
-template <class T, class T_var> ACE_INLINE T *
-TAO_Pseudo_Object_Manager<T,T_var>::operator-> (void) const
-{
-  return *this->ptr_;
-}
-
-template <class T, class T_var> ACE_INLINE
-TAO_Pseudo_Object_Manager<T,T_var>::operator const T* () const // cast
-{
-  return *this->ptr_;
-}
-
-template <class T, class T_var> ACE_INLINE
-TAO_Pseudo_Object_Manager<T,T_var>::operator T* &() // cast
-{
-  return *this->ptr_;
-}
-
-template <class T, class T_var> ACE_INLINE T *
-TAO_Pseudo_Object_Manager<T,T_var>::in (void) const
-{
-  return *this->ptr_;
-}
-
-template <class T, class T_var> ACE_INLINE T *&
-TAO_Pseudo_Object_Manager<T,T_var>::inout (void)
-{
-  return *this->ptr_;
-}
-
-template <class T, class T_var> ACE_INLINE T *&
-TAO_Pseudo_Object_Manager<T,T_var>::out (void)
-{
-  CORBA::release (*this->ptr_);
-  *this->ptr_ = T::_nil ();
-  return *this->ptr_;
-}
-
-template <class T, class T_var> ACE_INLINE T *
-TAO_Pseudo_Object_Manager<T,T_var>::_retn (void)
-{
-  T *temp = *this->ptr_;
-  *this->ptr_ = T::_nil ();
-  return temp;
-}
-
-// *************************************************************
-// class TAO_Unbounded_Object_Sequence
-// *************************************************************
-
-//default constructor
-template <class T, class T_var> ACE_INLINE
-TAO_Unbounded_Object_Sequence<T,T_var>::TAO_Unbounded_Object_Sequence (void)
-{
-}
-
-template <class T, class T_var> ACE_INLINE
-TAO_Unbounded_Object_Sequence<T,T_var>::
-TAO_Unbounded_Object_Sequence (CORBA::ULong maximum,
-                               CORBA::ULong length,
-                               T* *value,
-                               CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-template <class T, class T_var> ACE_INLINE TAO_Object_Manager<T,T_var>
-TAO_Unbounded_Object_Sequence<T,T_var>::operator[] (CORBA::ULong slot) const
-{
-  ACE_ASSERT (slot < this->maximum_);
-  T ** const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Object_Manager<T,T_var> (tmp + slot, this->release_);
-}
-
-// *************************************************************
-// class TAO_Bounded_Object_Sequence
-// *************************************************************
-
-template<class T, class T_var, size_t MAX> ACE_INLINE
-TAO_Bounded_Object_Sequence<T,T_var,MAX>::~TAO_Bounded_Object_Sequence (void)
-{
-  this->_deallocate_buffer ();
-}
-
-template <class T, class T_var, size_t MAX> ACE_INLINE
-TAO_Bounded_Object_Sequence<T,T_var,MAX>::
-TAO_Bounded_Object_Sequence (CORBA::ULong length,
-                             T **value,
-                             CORBA::Boolean release)
-  : TAO_Bounded_Base_Sequence (MAX, length, value, release)
-{
-}
-
-template <class T, class T_var, size_t MAX> ACE_INLINE TAO_Object_Manager<T,T_var>
-TAO_Bounded_Object_Sequence<T, T_var,MAX>::operator[] (CORBA::ULong slot) const
-{
-  ACE_ASSERT (slot < this->maximum_);
-  T **const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Object_Manager<T,T_var> (tmp + slot, this->release_);
-}
-
-// *************************************************************
-// class TAO_Unbounded_Pseudo_Sequence
-// *************************************************************
-
-//default constructor
-template <class T, class T_var> ACE_INLINE
-TAO_Unbounded_Pseudo_Sequence<T,T_var>::TAO_Unbounded_Pseudo_Sequence (void)
-{
-}
-
-template <class T, class T_var> ACE_INLINE
-TAO_Unbounded_Pseudo_Sequence<T,T_var>::
-TAO_Unbounded_Pseudo_Sequence (CORBA::ULong maximum,
-                               CORBA::ULong length,
-                               T* *value,
-                               CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-template <class T, class T_var> ACE_INLINE TAO_Pseudo_Object_Manager<T,T_var>
-TAO_Unbounded_Pseudo_Sequence<T,T_var>::operator[] (CORBA::ULong slot) const
-{
-  ACE_ASSERT (slot < this->maximum_);
-  T ** const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Pseudo_Object_Manager<T,T_var> (tmp + slot, this->release_);
-}
-
-// *************************************************************
-// class TAO_Bounded_Pseudo_Sequence
-// *************************************************************
-
-template<class T, class T_var, size_t MAX> ACE_INLINE
-TAO_Bounded_Pseudo_Sequence<T,T_var,MAX>::~TAO_Bounded_Pseudo_Sequence (void)
-{
-  this->_deallocate_buffer ();
-}
-
-template <class T, class T_var, size_t MAX> ACE_INLINE
-TAO_Bounded_Pseudo_Sequence<T,T_var,MAX>::
-TAO_Bounded_Pseudo_Sequence (CORBA::ULong length,
-                             T **value,
-                             CORBA::Boolean release)
-  : TAO_Bounded_Base_Sequence (MAX, length, value, release)
-{
-}
-
-template <class T, class T_var, size_t MAX> ACE_INLINE TAO_Pseudo_Object_Manager<T,T_var>
-TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::operator[] (CORBA::ULong slot) const
-{
-  ACE_ASSERT (slot < this->maximum_);
-  T **const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST,
-                                        this->buffer_);
-  return TAO_Pseudo_Object_Manager<T,T_var> (tmp + slot,
-                                             this->release_);
-}
-
-// *************************************************************
-// class TAO_Bounded_String_Sequence
-// *************************************************************
-
-template<size_t MAX> ACE_INLINE
-TAO_Bounded_String_Sequence<MAX>::~TAO_Bounded_String_Sequence (void)
-{
-  this->_deallocate_buffer ();
-}
-
-template<size_t MAX> ACE_INLINE
-TAO_Bounded_String_Sequence<MAX>::
-TAO_Bounded_String_Sequence (CORBA::ULong length,
-                             char **value,
-                             CORBA::Boolean release)
-  : TAO_Bounded_Base_Sequence (MAX, length, value, release)
-{
-}
diff --git a/TAO/tao/Servant_Base.cpp b/TAO/tao/Servant_Base.cpp
deleted file mode 100644
index ab582efc62d..00000000000
--- a/TAO/tao/Servant_Base.cpp
+++ /dev/null
@@ -1,440 +0,0 @@
-// $Id$
-
-#include "tao/Servant_Base.h"
-#include "tao/Timeprobe.h"
-#include "tao/Operation_Table.h"
-#include "tao/ORB_Core.h"
-#include "tao/POA.h"
-#include "tao/Stub.h"
-#include "tao/Environment.h"
-#include "tao/Server_Request.h"
-
-ACE_RCSID(tao, Servant_Base, "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Servant_Base.i"
-#endif /* ! __ACE_INLINE__ */
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-
-static const char *TAO_Servant_Base_Timeprobe_Description[] =
-{
-  "Servant_Base::_find - start",
-  "Servant_Base::_find - end"
-};
-
-enum
-{
-  TAO_SERVANT_BASE_FIND_START = 700,
-  TAO_SERVANT_BASE_FIND_END
-};
-
-// Setup Timeprobes
-ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Servant_Base_Timeprobe_Description,
-                                  TAO_SERVANT_BASE_FIND_START);
-
-#endif /* ACE_ENABLE_TIMEPROBES */
-
-TAO_ServantBase::TAO_ServantBase (void)
-  : optable_ (0),
-    single_threaded_poa_lock_ (0),
-    single_threaded_poa_lock_count_ (0)
-{
-}
-
-TAO_ServantBase::TAO_ServantBase (const TAO_ServantBase &rhs)
-  : optable_ (rhs.optable_),
-    single_threaded_poa_lock_ (0),
-    single_threaded_poa_lock_count_ (0)
-{
-}
-
-TAO_ServantBase &
-TAO_ServantBase::operator= (const TAO_ServantBase &rhs)
-{
-  this->optable_ = rhs.optable_;
-  return *this;
-}
-
-TAO_ServantBase::~TAO_ServantBase (void)
-{
-}
-
-PortableServer::POA_ptr
-TAO_ServantBase::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-{
-  return TAO_ORB_Core_instance ()->root_poa_reference (ACE_TRY_ENV);
-}
-
-void
-TAO_ServantBase::_add_ref (CORBA::Environment &)
-{
-}
-
-void
-TAO_ServantBase::_remove_ref (CORBA::Environment &)
-{
-}
-
-CORBA::Boolean
-TAO_ServantBase::_is_a (const char* logical_type_id,
-                        CORBA::Environment &ACE_TRY_ENV)
-{
-  const char *id = CORBA::_tc_Object->id (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  if (ACE_OS::strcmp (logical_type_id, id) == 0)
-    {
-      return 1;
-    }
-
-  return 0;
-}
-
-CORBA::Boolean
-TAO_ServantBase::_non_existent (CORBA::Environment &)
-{
-  return 0;
-}
-
-int
-TAO_ServantBase::_find (const char *opname,
-                        TAO_Skeleton& skelfunc,
-                        const unsigned int length)
-{
-  ACE_FUNCTION_TIMEPROBE (TAO_SERVANT_BASE_FIND_START);
-  return optable_->find (opname, skelfunc, length);
-}
-
-int
-TAO_ServantBase::_bind (const char *opname,
-                        const TAO_Skeleton skel_ptr)
-{
-  return optable_->bind (opname, skel_ptr);
-}
-
-TAO_Stub *
-TAO_ServantBase::_create_stub (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = 0;
-
-  TAO_POA_Current_Impl *poa_current_impl =
-    TAO_TSS_RESOURCES::instance ()->poa_current_impl_;
-
-  CORBA::ORB_ptr servant_orb = 0;
-
-  if (poa_current_impl != 0)
-    servant_orb = poa_current_impl->orb_core ().orb () ;
-
-  if (poa_current_impl != 0 &&
-      this == poa_current_impl->servant ())
-    {
-      stub = servant_orb->create_stub_object (poa_current_impl->object_key (),
-                                              this->_interface_repository_id (),
-                                              ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-    }
-  else
-    {
-      PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::Object_var object = poa->servant_to_reference (this, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      // Get the stub object
-      stub = object->_stubobj ();
-
-      // Increment the reference count since <object> will zap its
-      // stub object on deletion.
-      stub->_incr_refcnt ();
-    }
-
-  if (servant_orb == 0)
-    servant_orb = stub->orb_core ()->orb ();
-  stub->servant_orb (servant_orb);
-  return stub;
-}
-
-ACE_SYNCH_MUTEX &
-TAO_ServantBase::_single_threaded_poa_lock (void)
-{
-  return *this->single_threaded_poa_lock_;
-}
-
-void
-TAO_ServantBase::_increment_single_threaded_poa_lock_count (void)
-{
-  // Only one thread at a time through this code (guarantee provided
-  // by the POA).
-  u_long current_count = this->single_threaded_poa_lock_count_++;
-  if (current_count == 0)
-    {
-      ACE_NEW (this->single_threaded_poa_lock_,
-               ACE_SYNCH_MUTEX);
-    }
-}
-
-void
-TAO_ServantBase::_decrement_single_threaded_poa_lock_count (void)
-{
-  // Only one thread at a time through this code (guarantee provided
-  // by the POA).
-  u_long current_count = --this->single_threaded_poa_lock_count_;
-  if (current_count == 0)
-    {
-      delete this->single_threaded_poa_lock_;
-      this->single_threaded_poa_lock_ = 0;
-    }
-}
-
-TAO_RefCountServantBase::~TAO_RefCountServantBase (void)
-{
-}
-
-void
-TAO_RefCountServantBase::_add_ref (CORBA::Environment &)
-{
-  ++this->ref_count_;
-}
-
-void
-TAO_RefCountServantBase::_remove_ref (CORBA::Environment &)
-{
-  CORBA::ULong new_count = --this->ref_count_;
-  if (new_count == 0)
-    {
-      delete this;
-    }
-}
-
-TAO_RefCountServantBase::TAO_RefCountServantBase (void)
-  : ref_count_ (1)
-{
-}
-
-TAO_RefCountServantBase::TAO_RefCountServantBase (const TAO_RefCountServantBase &)
-  : ref_count_ (1)
-{
-}
-
-TAO_RefCountServantBase &
-TAO_RefCountServantBase::operator= (const TAO_RefCountServantBase &)
-{
-  return *this;
-}
-
-TAO_ServantBase_var::TAO_ServantBase_var (void)
-  : ptr_ (0)
-{
-}
-
-TAO_ServantBase_var::TAO_ServantBase_var (TAO_ServantBase *p)
-  : ptr_ (p)
-{
-}
-
-TAO_ServantBase_var::TAO_ServantBase_var (const TAO_ServantBase_var &b)
-  : ptr_ (b.ptr_)
-{
-  if (this->ptr_ != 0)
-    this->ptr_->_add_ref ();
-}
-
-TAO_ServantBase_var::~TAO_ServantBase_var (void)
-{
-  if (this->ptr_ != 0)
-    this->ptr_->_remove_ref ();
-}
-
-TAO_ServantBase_var &
-TAO_ServantBase_var::operator= (TAO_ServantBase *p)
-{
-  if (this->ptr_ != 0)
-    this->ptr_->_remove_ref ();
-
-  this->ptr_ = p;
-
-  return *this;
-}
-
-TAO_ServantBase_var &
-TAO_ServantBase_var::operator= (const TAO_ServantBase_var &b)
-{
-  if (this->ptr_ != b.ptr_)
-  {
-    if (this->ptr_ != 0)
-      this->ptr_->_remove_ref ();
-
-    if ((this->ptr_ = b.ptr_) != 0)
-      this->ptr_->_add_ref ();
-  }
-
-  return *this;
-}
-
-TAO_ServantBase *
-TAO_ServantBase_var::operator->() const
-{
-  return this->ptr_;
-}
-
-TAO_ServantBase *
-TAO_ServantBase_var::in (void) const
-{
-  return this->ptr_;
-}
-
-TAO_ServantBase *&
-TAO_ServantBase_var::inout (void)
-{
-  return this->ptr_;
-}
-
-TAO_ServantBase *&
-TAO_ServantBase_var::out (void)
-{
-  if (this->ptr_ != 0)
-    this->ptr_->_remove_ref();
-
-  this->ptr_ = 0;
-
-  return this->ptr_;
-}
-
-TAO_ServantBase *
-TAO_ServantBase_var::_retn (void)
-{
-  TAO_ServantBase *retval = this->ptr_;
-  this->ptr_ = 0;
-  return retval;
-}
-
-TAO_Stub *
-TAO_Local_ServantBase::_create_stub (CORBA_Environment &ACE_TRY_ENV)
-{
-  PortableServer::ObjectId_var invalid_oid =
-    PortableServer::string_to_ObjectId ("invalid");
-
-  TAO_ObjectKey tmp_key (invalid_oid->length (),
-                         invalid_oid->length (),
-                         invalid_oid->get_buffer (),
-                         0);
-
-  // It is ok to use TAO_ORB_Core_instance here since the locality
-  // constrained servant does not really register with a POA or get
-  // exported remotely.
-  //
-  // The correct thing to do is to probably use ORB of the default
-  // POA. The unfortunate part is that calling default_POA() requires
-  // the creation of a local stub, hence causing a infinite loop.
-  return TAO_ORB_Core_instance ()->orb ()->create_stub_object (tmp_key,
-                                                               this->_interface_repository_id (),
-                                                               ACE_TRY_ENV);
-}
-
-void
-TAO_Local_ServantBase::_dispatch (CORBA::ServerRequest &request,
-                                  void *context,
-                                  CORBA_Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (request);
-  ACE_UNUSED_ARG (context);
-
-  ACE_THROW (CORBA::BAD_OPERATION ());
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-CORBA::Object_ptr
-TAO_DynamicImplementation::_this (CORBA::Environment &ACE_TRY_ENV)
-{
-  // The _this() function returns a CORBA::Object_ptr for the target
-  // object. Unlike _this() for static skeletons, its return type is
-  // not interface-specific because a DSI servant may very well
-  // incarnate multiple CORBA objects of different types.
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  // Create a object
-  return new CORBA::Object (stub, this, 1);
-}
-
-const char *
-TAO_DynamicImplementation::_interface_repository_id (void) const
-{
-  // This should never be called
-  return 0;
-}
-
-void *
-TAO_DynamicImplementation::_downcast (const char *repository_id)
-{
-  ACE_UNUSED_ARG (repository_id);
-
-  // Don't know enough to do better
-  return this;
-}
-
-TAO_Stub *
-TAO_DynamicImplementation::_create_stub (CORBA::Environment &ACE_TRY_ENV)
-{
-  // If DynamicImplementation::_this() is invoked outside of the
-  // context of a request invocation on a target object being served
-  // by the DSI servant, it raises the PortableServer::WrongPolicy
-  // exception.
-  TAO_POA_Current_Impl *poa_current_impl =
-    TAO_TSS_RESOURCES::instance ()->poa_current_impl_;
-
-  if (poa_current_impl != 0 &&
-      this == poa_current_impl->servant ())
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
-    }
-
-  PortableServer::POA_var poa = poa_current_impl->get_POA (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::RepositoryId interface = this->_primary_interface (poa_current_impl->object_id (),
-                                                            poa.in (),
-                                                            ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return poa_current_impl->poa ()->orb_core ().orb ()->create_stub_object (poa_current_impl->object_key (),
-                                                                           interface,
-                                                                           ACE_TRY_ENV);
-}
-
-void
-TAO_DynamicImplementation::_dispatch (CORBA::ServerRequest &request,
-                                      void *context,
-                                      CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (context);
-
-  // Delegate to user
-  this->invoke (&request, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (request.response_expected ())
-    {
-      request.init_reply (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      request.dsi_marshal (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Atomic_Op<ACE_SYNCH_MUTEX, long>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Atomic_Op<ACE_SYNCH_MUTEX, long>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Servant_Base.h b/TAO/tao/Servant_Base.h
deleted file mode 100644
index 66647cfa318..00000000000
--- a/TAO/tao/Servant_Base.h
+++ /dev/null
@@ -1,294 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Servant_Base.h
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-// ============================================================================
-
-#ifndef TAO_SERVANT_BASE_H
-#define TAO_SERVANT_BASE_H
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/POAC.h"
-
-class TAO_Operation_Table;
-
-class TAO_Export TAO_ServantBase
-{
-  // = TITLE
-  //     Base class for skeletons and servants.
-  //
-  // = DESCRIPTION
-  //     The POA spec requires that all servants inherit from this
-  //     class.
-public:
-  friend class TAO_POA;
-  friend class TAO_Object_Adapter;
-  friend class CORBA_Object;
-  friend class TAO_Local_ServantBase;
-
-  virtual ~TAO_ServantBase (void);
-  // Destructor.
-
-  virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // Returns the default POA for this servant.
-
-  virtual CORBA::Boolean _is_a (const char* logical_type_id,
-                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // Local implementation of the CORBA::Object::_is_a method.
-
-  virtual CORBA::Boolean _non_existent (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // Default <_non_existent>: always returns false.
-
-  // = Reference counting hooks: no-ops by default.
-  virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  virtual void *_downcast (const char *repository_id) = 0;
-  // Get the correct vtable.
-
-  virtual TAO_Stub *_create_stub (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // This is an auxiliar method for _this() and _narrow().
-
-protected:
-  TAO_ServantBase (void);
-  // Default constructor, only derived classes can be created.
-
-  TAO_ServantBase (const TAO_ServantBase &);
-  // Copy constructor, protected so no instances can be created.
-
-  TAO_ServantBase &operator= (const TAO_ServantBase &);
-  // assignment operator.
-
-  virtual void _dispatch (CORBA::ServerRequest &request,
-                          void *context,
-                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-  // Dispatches a request to the object: find the operation, cast the
-  // type to the most derived type, demarshall all the parameters from
-  // the request and finally invokes the operation, storing the
-  // results and out parameters (if any) or the exceptions thrown into
-  // <request>.
-
-  virtual int _find (const char *opname,
-                     TAO_Skeleton &skelfunc,
-                     const unsigned int length = 0);
-  // Find an operation in the operation table.
-
-  virtual int _bind (const char *opname,
-                     const TAO_Skeleton skel_ptr);
-  // Register a CORBA IDL operation name.
-
-  virtual const char *_interface_repository_id (void) const = 0;
-  // Get this interface's repository id (TAO specific).
-
-  // = Should be protected/private, but a nested class needs it.
-public:
-  ACE_SYNCH_MUTEX &_single_threaded_poa_lock (void);
-  // Access to the single threaded poa lock.
-
-protected:
-  void _increment_single_threaded_poa_lock_count (void);
-  // New single threaded POA wants to use this lock.
-
-  void _decrement_single_threaded_poa_lock_count (void);
-  // Single threaded POA is no longer interested in this lock.
-
-  TAO_Operation_Table *optable_;
-  // The operation table for this servant, it is initialized by the
-  // most derived class.
-
-  ACE_SYNCH_MUTEX *single_threaded_poa_lock_;
-  // Lock for single threaded POAs.
-
-  u_long single_threaded_poa_lock_count_;
-  // Reference count for lock.
-};
-
-class TAO_Export TAO_RefCountServantBase : public virtual TAO_ServantBase
-{
-  // = TITLE
-  //     Reference counting mix-in class.
-  //
-  // = DESCRIPTION
-  //     The RefCountServantBase mix-in class overrides the inherited
-  //     _add_ref and _remove_ref functions it inherits from
-  //     ServantBase, implementing them to provide true reference
-  //     counting. An instance of a servant class derived from
-  //     RefCountServantBase initially has a reference count of
-  //     one. Invoking _add_ref on the servant instance increases its
-  //     reference count by one. Invoking _remove_ref on the servant
-  //     instance decreases its reference count by one; if the
-  //     resulting reference count equals zero, _remove_ref invokes
-  //     delete on its this pointer in order to destroy the
-  //     servant. For ORBs that operate in multi-threaded
-  //     environments, the implementations of _add_ref and _remove_ref
-  //     that the RefCountServantBase class provides shall be
-  //     thread-safe.
-  //
-  //     Like ServantBase, RefCountServantBase supports copy
-  //     construction and the default assignment operation. Copy
-  //     construction always sets the reference count of the new
-  //     servant instance to one. The default assignment
-  //     implementation merely returns *this and does not affect the
-  //     reference count.
-
-public:
-
-  ~TAO_RefCountServantBase (void);
-  // Destructor.
-
-  virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // Increase reference count by one.
-
-  virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // Decreases reference count by one; if the resulting reference
-  // count equals zero, _remove_ref invokes delete on its this pointer
-  // in order to destroy the servant.
-
-protected:
-
-  TAO_RefCountServantBase (void);
-  // Constructor: initial reference count is one.
-
-  TAO_RefCountServantBase (const TAO_RefCountServantBase &);
-  // Copy Constructor: Always sets the reference count of the new
-  // servant instance to one.
-
-  TAO_RefCountServantBase &operator= (const TAO_RefCountServantBase &);
-  // The default assignment implementation merely returns *this and
-  // does not affect the reference count.
-
-private:
-
-  ACE_Atomic_Op<ACE_SYNCH_MUTEX, long> ref_count_;
-  // Reference counter.
-};
-
-class TAO_Export TAO_ServantBase_var
-{
-  // = TITLE
-  //     Auto pointer for reference counting servants.
-  //
-  // = DESCRIPTION
-  //     For the convenience of automatically managing servant
-  //     reference counts, the PortableServer namespace also provides
-  //     the ServantBase_var class. This class behaves similarly to
-  //     _var classes for object references (see Section 20.3.1).
-
-public:
-  TAO_ServantBase_var (void);
-
-  TAO_ServantBase_var (TAO_ServantBase *p);
-
-  TAO_ServantBase_var (const TAO_ServantBase_var &b);
-
-  ~TAO_ServantBase_var (void);
-
-  TAO_ServantBase_var &operator= (TAO_ServantBase *p);
-
-  TAO_ServantBase_var &operator= (const TAO_ServantBase_var &b);
-
-  TAO_ServantBase *operator-> () const;
-
-  TAO_ServantBase *in (void) const;
-
-  TAO_ServantBase *&inout (void);
-
-  TAO_ServantBase *&out (void);
-
-  TAO_ServantBase *_retn (void);
-
-private:
-
-  TAO_ServantBase *ptr_;
-};
-
-class TAO_Export TAO_Servant_Hash
-{
-public:
-  u_long operator () (PortableServer::Servant servant) const;
-  // Returns hash value.
-};
-
-class TAO_Export TAO_Local_ServantBase : public virtual TAO_ServantBase
-{
-  // = TITLE
-  //   Base class for local skeletons and servants.
-protected:
-  TAO_Stub *_create_stub (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // This is an auxiliar method for _this().  Make sure *not* to
-  // register with the default POA.
-
-  void _dispatch (CORBA::ServerRequest &request,
-                  void *context,
-                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // Throws CORBA::BAD_OPERATION exception.
-};
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-class TAO_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:
-  virtual void invoke (CORBA::ServerRequest_ptr request,
-                       CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-  // The invoke() method receives requests issued to any CORBA object
-  // incarnated by the DSI servant and performs the processing
-  // necessary to execute the request.
-
-  virtual CORBA::RepositoryId _primary_interface (const PortableServer::ObjectId &oid,
-                                                  PortableServer::POA_ptr poa,
-                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-  // The _primary_interface() method receives an ObjectId value and a
-  // POA_ptr as input parameters and returns a valid RepositoryId
-  // representing the most-derived interface for that oid.
-
-  CORBA::Object_ptr _this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // Returns a CORBA::Object_ptr for the target object.
-
-protected:
-
-  virtual const char *_interface_repository_id (void) const;
-  // Return 0.  Should never be used.
-
-  virtual void *_downcast (const char *repository_id);
-  // Simply returns "this"
-
-  virtual TAO_Stub *_create_stub (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // This is an auxiliar method for _this() and _narrow().
-
-  virtual void _dispatch (CORBA::ServerRequest &request,
-                          void *context,
-                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // Turns around and calls invoke.
-};
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#if defined (__ACE_INLINE__)
-# include "tao/Servant_Base.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_SERVANT_BASE_H */
diff --git a/TAO/tao/Servant_Base.i b/TAO/tao/Servant_Base.i
deleted file mode 100644
index 3b332151ebc..00000000000
--- a/TAO/tao/Servant_Base.i
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Id$
-
-ACE_INLINE u_long 
-TAO_Servant_Hash::operator () (PortableServer::Servant servant) const
-{
-  return u_long (servant);
-}
-
diff --git a/TAO/tao/Server_Request.cpp b/TAO/tao/Server_Request.cpp
deleted file mode 100644
index ec63bbccc6f..00000000000
--- a/TAO/tao/Server_Request.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-// $Id$
-
-// Implementation of the Dynamic Server Skeleton Interface
-
-#include "tao/Server_Request.h"
-
-#include "tao/CDR.h"
-#include "tao/POAC.h"
-#include "tao/Environment.h"
-#include "tao/NVList.h"
-#include "tao/Principal.h"
-#include "tao/ORB_Core.h"
-#include "tao/Timeprobe.h"
-#include "tao/Any.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Server_Request.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, Server_Request, "$Id$")
diff --git a/TAO/tao/Server_Request.h b/TAO/tao/Server_Request.h
deleted file mode 100644
index 3c4bcd6a122..00000000000
--- a/TAO/tao/Server_Request.h
+++ /dev/null
@@ -1,208 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Server_Request.h
-//
-// = DESCRIPTION
-//    Header file for CORBA's Dynamic Server Skeleton Interface's
-//    "Server Request" type.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems, Inc. and Chris Cleeland.
-//     Modifications by Aniruddha Gokhale based on CORBAv2.2 Feb 98
-// ============================================================================
-
-#ifndef TAO_SERVER_REQUEST_H
-#define TAO_SERVER_REQUEST_H
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Object_KeyC.h"
-#include "tao/GIOP.h"
-#include "tao/Object.h"
-
-class TAO_POA;
-class TAO_ORB_Core;
-
-class TAO_Param_Data_Skel
-{
-  // = TITLE
-  //   Description of a single parameter.
-  //
-  // = DESCRIPTION
-  //
-  //   If value_size is nonzero for OUT, INOUT, or RETURN parameters,
-  //   it's (a) an indicator that the ORB returns a pointer-to-value
-  //   for this parameter, and also (b) is the size of the top-level
-  //   of the value that's returned (e.g. ignoring nested sequence
-  //   buffers).  That is, it moves CPU cycles from runtime -- some
-  //   calls to tc->size() -- to compile time where they're
-  //   cheap/free.
-  //
-  //   It _must_ only be set for cases where the ORB allocates the
-  //   return value, which must then be ORB::free()d ... e.g. where
-  //   the value is a pointer to data such as a struct, sequence, or
-  //   union.  (The CORBA C++ mapping doesn't require that for all
-  //   "out" structs; only those of "variable size".)  If this value
-  //   is nonzero, the value passed to do_static_call() must be the address
-  //   of a pointer.
-public:
-  CORBA::TypeCode_ptr tc;
-  // Type of param.
-
-  CORBA::ULong mode;
-  // Its mode.
-
-  CORBA::Boolean own;
-  // whether we own it or not
-};
-
-class TAO_Call_Data_Skel
-{
-  // = TITLE
-  //   Descriptions of operations, as used by the stub interpreter.
-  //   Only interpretive marshaling/unmarshaling is used, and the
-  //   stubs don't know what particular on-the-wire protocol is being
-  //   used.
-  //
-  // = DESCRIPTION
-  //   When using C++ exceptions, many C++ compilers will require the
-  //   use of compiled code throw the exception.  As binary standards
-  //   for exception throwing evolve, it may become practical to
-  //   interpretively throw exceptions.
-public:
-  const char *opname;
-  // Operation name.
-
-  CORBA::Boolean is_roundtrip;
-  // !oneway
-
-  // When constructing tables of parameters, put them in the same
-  // order they appear in the IDL spec: return value, then parameters
-  // left to right.  Other orders may produce illegal IIOP protocol
-  // messages.
-
-  CORBA::ULong param_count;
-  // # parameters.
-
-  const TAO_Param_Data_Skel *params;
-  // Their descriptions.
-
-};
-
-class TAO_Export CORBA_ServerRequest
-{
-  // = TITLE
-  //    Class representing a CORBA ServerRequest object.
-  //
-  // = DESCRIPTION
-  //   This is not supposed to be IIOP-specific, or to expose quite so
-  //   many implementation details, but right now does.
-public:
-  static CORBA_ServerRequest *_duplicate (CORBA_ServerRequest *req);
-  // the duplicate method for Pseudo Objects
-
-  static CORBA_ServerRequest *_nil (void);
-  // the standard _nil method on pseudo objects
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  virtual void arguments (CORBA::NVList_ptr &list,
-                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-  // Implementation uses this to provide the ORB with the operation's
-  // parameter list ... on return, their values are available; the
-  // list fed in has typecodes and (perhap) memory assigned.
-
-  virtual void set_result (const CORBA::Any &value,
-                           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-  // Implementation uses this to provide the operation result
-  // ... illegal if exception() was called or params() was not called.
-  //
-  // XXX Implementation should be able to assume response has been
-  // sent when this returns, and reclaim memory it allocated.
-
-  virtual void set_exception (const CORBA::Any &value,
-                              CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-  // Implementation uses this to provide the exception value which is
-  // the only result of this particular invocation.
-  //
-  // XXX Implementation should be able to assume response has been
-  // sent when this returns, and reclaim memory it allocated.
-
-  // = Get various universal call attributes.
-
-  // e.g., who made the call, the target of the call, what ORB and OA
-  // that target object uses.
-  //
-  // NOTE: none of these report exceptions; unavailability of any of
-  // this stuff is a catastrophic error since this is all part of the
-  // basic CORBA Object Model.
-
-  virtual void dsi_marshal (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
-  // marshal outgoing parameters. Used by DSI
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  virtual const char *operation (void) const = 0;
-  // get the operation name
-
-  virtual unsigned int operation_length (void) const = 0;
-  // get the length of the operation name
-
-  virtual void init_reply (CORBA_Environment &ACE_TRY_ENV =
-                               TAO_default_environment ()) = 0;
-  // Start a Reply message.
-
-  //  CORBA::Context_ptr ctx (void) = 0;
-  // return the context pointer
-
-  // = Extensions.
-
-  virtual TAO_POA *oa (void) = 0;
-  // get the Object Adapter
-
-  virtual CORBA::ORB_ptr  orb (void) = 0;
-  // get the underlying ORB
-
-  virtual void demarshal (CORBA_Environment &ACE_TRY_ENV,
-                          const TAO_Call_Data_Skel *info,
-                          ...) = 0;
-  // demarshal incoming parameters
-
-  virtual void marshal (CORBA_Environment &ACE_TRY_ENV,
-                        //                        CORBA_Environment &skel_env,
-                        const TAO_Call_Data_Skel *info,
-                        ...) = 0;
-  // marshal outgoing parameters
-
-  virtual TAO_InputCDR &incoming (void) = 0;
-  // Retrieve the incoming stream.
-
-  virtual TAO_OutputCDR &outgoing (void) = 0;
-  // Retrieve the outgoing stream.
-
-  virtual CORBA::Boolean response_expected (void) const = 0;
-  // is the response expected
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA::ServerRequest_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Server_Request.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_SERVER_REQUEST_H */
diff --git a/TAO/tao/Server_Request.i b/TAO/tao/Server_Request.i
deleted file mode 100644
index bc1d29d03be..00000000000
--- a/TAO/tao/Server_Request.i
+++ /dev/null
@@ -1,35 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// @@ TODO TAO allocates its ServerRequest objects from the stack,
-// using reference counting wouldn't help much.  Using a _clone()
-// method would make the following methods really easy to implement,
-// but that's hard to implement for the extremely optimized
-// IIOP_ServerRequest.
-// Another solution would be to modify the class hierarchy, make
-// ServerRequest the "slow" version (with copies for each field) and
-// IIOP_ServerRequest the "fast" version (with no copies at all). The
-// first would be use for DII and the later for SII.
-
-ACE_INLINE CORBA::Boolean
-CORBA::is_nil (CORBA_ServerRequest *x)
-{
-  return x != 0;
-}
-
-ACE_INLINE void
-CORBA::release (CORBA_ServerRequest *)
-{
-}
-
-ACE_INLINE CORBA_ServerRequest *
-CORBA_ServerRequest::_duplicate (CORBA_ServerRequest *)
-{
-  return 0;
-}
-
-ACE_INLINE CORBA_ServerRequest *
-CORBA_ServerRequest::_nil (void)
-{
-  return 0;
-}
diff --git a/TAO/tao/Server_Strategy_Factory.cpp b/TAO/tao/Server_Strategy_Factory.cpp
deleted file mode 100644
index 4a523e27bff..00000000000
--- a/TAO/tao/Server_Strategy_Factory.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-// $Id$
-
-#include "tao/Server_Strategy_Factory.h"
-
-ACE_RCSID(tao, Server_Strategy_Factory, "$Id$")
-
-TAO_Server_Strategy_Factory::TAO_Server_Strategy_Factory (void)
-  : active_object_map_creation_parameters_ ()
-{
-}
-
-TAO_Server_Strategy_Factory::~TAO_Server_Strategy_Factory(void)
-{
-}
-
-int
-TAO_Server_Strategy_Factory::open (TAO_ORB_Core*)
-{
-  return 0;
-}
-
-int
-TAO_Server_Strategy_Factory::enable_poa_locking (void)
-{
-  return -1;
-}
-
-int
-TAO_Server_Strategy_Factory::activate_server_connections (void)
-{
-  return 0;
-}
-
-int
-TAO_Server_Strategy_Factory::server_connection_thread_flags (void)
-{
-  return 0;
-}
-
-int
-TAO_Server_Strategy_Factory::server_connection_thread_count (void)
-{
-  return 0;
-}
-
-ACE_Lock *
-TAO_Server_Strategy_Factory::create_event_loop_lock (void)
-{
-  return 0;
-}
-
-const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &
-TAO_Server_Strategy_Factory::active_object_map_creation_parameters (void) const
-{
-  return this->active_object_map_creation_parameters_;
-}
-
-TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters::Active_Object_Map_Creation_Parameters (void)
-  : active_object_map_size_ (TAO_DEFAULT_SERVER_ACTIVE_OBJECT_MAP_SIZE),
-    object_lookup_strategy_for_user_id_policy_ (TAO_DYNAMIC_HASH),
-    object_lookup_strategy_for_system_id_policy_ (TAO_ACTIVE_DEMUX),
-    reverse_object_lookup_strategy_for_unique_id_policy_ (TAO_DYNAMIC_HASH),
-    use_active_hint_in_ids_ (1),
-    allow_reactivation_of_system_ids_ (1),
-    poa_map_size_ (TAO_DEFAULT_SERVER_POA_MAP_SIZE),
-    poa_lookup_strategy_for_transient_id_policy_ (TAO_ACTIVE_DEMUX),
-    poa_lookup_strategy_for_persistent_id_policy_ (TAO_DYNAMIC_HASH),
-    use_active_hint_in_poa_names_ (1)
-{
-}
diff --git a/TAO/tao/Server_Strategy_Factory.h b/TAO/tao/Server_Strategy_Factory.h
deleted file mode 100644
index ec21a847d35..00000000000
--- a/TAO/tao/Server_Strategy_Factory.h
+++ /dev/null
@@ -1,122 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     Server_Strategy_Factory.h
-//
-// = AUTHOR
-//     Chris Cleeland
-//
-// ============================================================================
-
-#ifndef TAO_SERVER_STRATEGY_FACTORY_H
-#define TAO_SERVER_STRATEGY_FACTORY_H
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Object.h"
-
-class TAO_Active_Object_Map_Impl;
-class TAO_Reverse_Active_Object_Map_Impl;
-class TAO_ORB_Core;
-
-enum TAO_Demux_Strategy
-{
-  TAO_LINEAR,
-  TAO_DYNAMIC_HASH,
-  TAO_ACTIVE_DEMUX,
-  TAO_USER_DEFINED
-};
-
-class TAO_Export TAO_Server_Strategy_Factory : public ACE_Service_Object
-{
-  // = TITLE
-  //    Base class for the server's abstract factory that manufactures
-  //    various strategies of special utility to it.  This simply
-  //    serves as an interface to a subclass that REALLY gets
-  //    specified and loaded by the Service Configurator.
-public:
-
-  struct Active_Object_Map_Creation_Parameters
-  {
-    Active_Object_Map_Creation_Parameters (void);
-    // Constructor.
-
-    CORBA::ULong active_object_map_size_;
-    // Default size of object lookup table.
-
-    TAO_Demux_Strategy object_lookup_strategy_for_user_id_policy_;
-    // The type of lookup/demultiplexing strategy being used for user
-    // id policy
-
-    TAO_Demux_Strategy object_lookup_strategy_for_system_id_policy_;
-    // The type of lookup/demultiplexing strategy being used for
-    // system id policy
-
-    TAO_Demux_Strategy reverse_object_lookup_strategy_for_unique_id_policy_;
-    // The type of reverse lookup/demultiplexing strategy being used
-    // for the UNIQUE_ID policy
-
-    int use_active_hint_in_ids_;
-    // Flag to indicate whether the active hint should be used with
-    // the IOR.
-
-    int allow_reactivation_of_system_ids_;
-    // Flag to indicate whether reactivations of servants was required
-    // (under the system id policy).  If not, certain resources may
-    // not be required.
-
-    CORBA::ULong poa_map_size_;
-
-    TAO_Demux_Strategy poa_lookup_strategy_for_transient_id_policy_;
-
-    TAO_Demux_Strategy poa_lookup_strategy_for_persistent_id_policy_;
-
-    int use_active_hint_in_poa_names_;
-  };
-
-  // = Initialization and termination methods.
-  TAO_Server_Strategy_Factory (void);
-  // Constructor.
-
-  virtual ~TAO_Server_Strategy_Factory(void);
-  // Destructor.
-
-  virtual int open (TAO_ORB_Core* orb_core);
-  // Call <open> on various strategies.  This is not performed in
-  // <init> so that the other portions of the ORB have a chance to
-  // "settle" in their initialization since the streategies herein
-  // might need some of that information.
-
-  virtual int enable_poa_locking (void);
-  // Enable POA locking?
-
-  virtual int activate_server_connections (void);
-  // Are server connections active (i.e. run in their own thread)
-
-  virtual int server_connection_thread_flags (void);
-  virtual int server_connection_thread_count (void);
-  // The thread activation parameters
-
-  virtual ACE_Lock *create_event_loop_lock (void);
-  // Creates and returns a lock for the event loop.
-
-  virtual const Active_Object_Map_Creation_Parameters &active_object_map_creation_parameters (void) const;
-  // Return the active object map creation parameters.
-
-protected:
-
-  Active_Object_Map_Creation_Parameters active_object_map_creation_parameters_;
-  // Active object map creation parameters.
-};
-
-#endif /* TAO_SERVER_STRATEGY_FACTORY_H */
diff --git a/TAO/tao/Services.cpp b/TAO/tao/Services.cpp
deleted file mode 100644
index b917c859520..00000000000
--- a/TAO/tao/Services.cpp
+++ /dev/null
@@ -1,558 +0,0 @@
-//$Id$
-/* -*- C++ -*- */
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "tao/Services.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Environment.h"
-
-#if !defined (__ACE_INLINE__)
-#include "Services.i"
-#endif /* !defined INLINE */
-
-
-#if !defined (_CORBA_SERVICEDETAIL__TAO_SEQ_OCTET_CS_)
-#define _CORBA_SERVICEDETAIL__TAO_SEQ_OCTET_CS_
-
-// *************************************************************
-// CORBA::ServiceDetail::_tao_seq_Octet
-// *************************************************************
-
-CORBA::ServiceDetail::_tao_seq_Octet::_tao_seq_Octet (void)
-{}
-CORBA::ServiceDetail::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-CORBA::ServiceDetail::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-CORBA::ServiceDetail::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-CORBA::ServiceDetail::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
-{}
-
-static const CORBA::Long _oc_CORBA_ServiceDetail__tao_seq_Octet[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-
-  0,
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceDetail__tao_seq_Octet (CORBA::tk_sequence, sizeof (_oc_CORBA_ServiceDetail__tao_seq_Octet), (char *) &_oc_CORBA_ServiceDetail__tao_seq_Octet, 0, sizeof (CORBA::ServiceDetail::_tao_seq_Octet));
-CORBA::TypeCode_ptr CORBA::ServiceDetail::_tc__tao_seq_Octet = &_tc_TAO_tc_CORBA_ServiceDetail__tao_seq_Octet;
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CS_
-
-  void
-  CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA::ULong* tmp = CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA::ULong *old = ACE_reinterpret_cast (CORBA::ULong *,this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-      
-      if (this->release_)
-        CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (old);
-      
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    
-    CORBA::ULong *tmp = ACE_reinterpret_cast (CORBA::ULong *,this->buffer_);
-    
-    CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (tmp);
-    this->buffer_ = 0;
-  } 
-  
-  CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::~_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (void) // Dtor.
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CS_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CS_
-
-// *************************************************************
-// CORBA::ServiceInformation::_tao_seq_ServiceOption
-// *************************************************************
-
-CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (void)
-{}
-CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (CORBA::ULong max) // uses max size
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ULong>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (CORBA::ULong max, CORBA::ULong length, CORBA::ULong *buffer, CORBA::Boolean release)
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ULong>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (const _tao_seq_ServiceOption &seq) // copy ctor
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ULong>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-CORBA::ServiceInformation::_tao_seq_ServiceOption::~_tao_seq_ServiceOption (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CS_
-
-  void
-  CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA::ServiceDetail* tmp = CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA::ServiceDetail *old = ACE_reinterpret_cast (CORBA::ServiceDetail *,this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-      
-      if (this->release_)
-        CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (old);
-      
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    
-    CORBA::ServiceDetail *tmp = ACE_reinterpret_cast (CORBA::ServiceDetail *,this->buffer_);
-    
-    CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (tmp);
-    this->buffer_ = 0;
-  } 
-  
-  CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::~_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (void) // Dtor.
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CS_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CS_
-
-// *************************************************************
-// CORBA::ServiceInformation::_tao_seq_ServiceDetail
-// *************************************************************
-
-CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (void)
-{}
-CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (CORBA::ULong max) // uses max size
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ServiceDetail>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (CORBA::ULong max, CORBA::ULong length, CORBA::ServiceDetail *buffer, CORBA::Boolean release)
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ServiceDetail>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (const _tao_seq_ServiceDetail &seq) // copy ctor
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ServiceDetail>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-CORBA::ServiceInformation::_tao_seq_ServiceDetail::~_tao_seq_ServiceDetail (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA::ServiceDetail &_tao_elem) // copying
-{
-  CORBA::ServiceDetail *_any_val;
-  ACE_NEW (_any_val, CORBA::ServiceDetail (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ServiceDetail, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::ServiceDetail *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ServiceDetail, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ServiceDetail *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ServiceDetail, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::ServiceDetail *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::ServiceDetail, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_ServiceDetail, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_ServiceDetail, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0; 
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA::ServiceInformation &_tao_elem) // copying
-{
-  CORBA::ServiceInformation *_any_val;
-  ACE_NEW (_any_val, CORBA::ServiceInformation (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ServiceInformation, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::ServiceInformation *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ServiceInformation, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ServiceInformation *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ServiceInformation, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::ServiceInformation *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::ServiceInformation, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_ServiceInformation, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_ServiceInformation, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0; 
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA_ServiceDetail::_tao_seq_Octet &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    
-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-    {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
-        ACE_dynamic_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (CORBA_ServiceDetail::_tao_seq_Octet *)&_tao_sequence);
-      if (oseq->mb ())
-        return strm.write_octet_array_mb (oseq->mb ());
-      else
-        return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-    
-#else /* TAO_NO_COPY_OCTET_SEQUENCES */
-    return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
-  }
-  return 0; // error
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_ServiceDetail::_tao_seq_Octet &_tao_sequence)
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    
-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-    if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE))
-    {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
-        ACE_dynamic_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
-      oseq->replace (_tao_seq_len, strm.start ());
-      oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-      strm.skip_bytes (_tao_seq_len);
-      return 1;
-    }
-    else
-      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-    
-#else /* TAO_NO_COPY_OCTET_SEQUENCES */
-    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
-  }
-  return 0; // error
-}
-
-CORBA::Boolean 
-operator<< (TAO_OutputCDR &strm, const CORBA_ServiceDetail &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.service_detail_type) &&
-    (strm << _tao_aggregate.service_detail)
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-CORBA::Boolean 
-operator>> (TAO_InputCDR &strm, CORBA_ServiceDetail &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.service_detail_type) &&
-    (strm >> _tao_aggregate.service_detail)
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-CORBA::Boolean 
-operator<< (
-            TAO_OutputCDR &strm,
-            const CORBA_ServiceInformation::_tao_seq_ServiceOption &_tao_sequence
-            )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  }
-  return 0; // error
-}
-
-CORBA::Boolean 
-operator>> (TAO_InputCDR &strm, 
-            CORBA_ServiceInformation::_tao_seq_ServiceOption &_tao_sequence)
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  }
-  return 0; // error
-}
-
-CORBA::Boolean 
-operator<< (
-            TAO_OutputCDR &strm,
-            const CORBA_ServiceInformation::_tao_seq_ServiceDetail &_tao_sequence
-            )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean 
-operator>> (TAO_InputCDR &strm, 
-            CORBA_ServiceInformation::_tao_seq_ServiceDetail &_tao_sequence)
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean 
-operator<< (TAO_OutputCDR &strm, 
-            const CORBA_ServiceInformation &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.service_options) &&
-    (strm << _tao_aggregate.service_details)
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-CORBA::Boolean operator>> (TAO_InputCDR &strm, 
-                           CORBA_ServiceInformation &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.service_options) &&
-    (strm >> _tao_aggregate.service_details)
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
diff --git a/TAO/tao/Services.h b/TAO/tao/Services.h
deleted file mode 100644
index 9245677a3a3..00000000000
--- a/TAO/tao/Services.h
+++ /dev/null
@@ -1,544 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Service_Detail.h
-//
-// = DESCRIPTION
-//
-//    Service_Detail stubs. This code generated by the The ACE ORB (TAO) IDL
-//    Compiler and was then hand crafted
-//
-// ============================================================================
-
-#ifndef TAO_SERVICES_H
-#define TAO_SERVICES_H
-
-#include "tao/Sequence.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-struct TAO_Export CORBA_ServiceDetail
-{
-  CORBA::ServiceDetailType service_detail_type;
-
-#if !defined (_CORBA_SERVICEDETAIL__TAO_SEQ_OCTET_CH_)
-#define _CORBA_SERVICEDETAIL__TAO_SEQ_OCTET_CH_
-
-  // *************************************************************
-  // _tao_seq_Octet
-  // *************************************************************
-
-  class  _tao_seq_Octet : public TAO_Unbounded_Sequence<CORBA::Octet>
-  {
-    public:
-      _tao_seq_Octet (void); // default ctor
-      _tao_seq_Octet (CORBA::ULong max); // uses max size
-      _tao_seq_Octet (
-                      CORBA::ULong max,
-                      CORBA::ULong length,
-                      CORBA::Octet *buffer,
-                      CORBA::Boolean release=0
-                      );
-      _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor
-      ~_tao_seq_Octet (void); // dtor
-
-#if defined(TAO_NO_COPY_OCTET_SEQUENCES)
-      _tao_seq_Octet (
-                      CORBA::ULong length,
-                      const ACE_Message_Block* mb
-                      )
-        : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
-#endif /* TAO_NO_COPY_OCTET_SEQUENCE */
-    };
-
-  typedef _tao_seq_Octet *_tao_seq_Octet_ptr;
-  static CORBA::TypeCode_ptr _tc__tao_seq_Octet;
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SERVICEDETAIL__TAO_SEQ_OCTET___VAR_CH_)
-#define _CORBA_SERVICEDETAIL__TAO_SEQ_OCTET___VAR_CH_
-
-  // *************************************************************
-  // class CORBA::ServiceDetail::_tao_seq_Octet_var
-  // *************************************************************
-
-  class  _tao_seq_Octet_var
-    {
-    public:
-      _tao_seq_Octet_var (void); // default constructor
-      _tao_seq_Octet_var (_tao_seq_Octet *);
-      _tao_seq_Octet_var (const _tao_seq_Octet_var &); // copy constructor
-      ~_tao_seq_Octet_var (void); // destructor
-
-      _tao_seq_Octet_var &operator= (_tao_seq_Octet *);
-      _tao_seq_Octet_var &operator= (const _tao_seq_Octet_var &);
-      _tao_seq_Octet *operator-> (void);
-      const _tao_seq_Octet *operator-> (void) const;
-
-      operator const _tao_seq_Octet &() const;
-      operator _tao_seq_Octet &();
-      operator _tao_seq_Octet &() const;
-      CORBA::Octet &operator[] (CORBA::ULong slot);
-      // in, inout, out, _retn
-      const _tao_seq_Octet &in (void) const;
-      _tao_seq_Octet &inout (void);
-      _tao_seq_Octet *&out (void);
-      _tao_seq_Octet *_retn (void);
-      _tao_seq_Octet *ptr (void) const;
-
-    private:
-      _tao_seq_Octet *ptr_;
-    };
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_SERVICEDETAIL__TAO_SEQ_OCTET___OUT_CH_)
-#define _CORBA_SERVICEDETAIL__TAO_SEQ_OCTET___OUT_CH_
-
-    class  _tao_seq_Octet_out
-    {
-    public:
-      _tao_seq_Octet_out (_tao_seq_Octet *&);
-      _tao_seq_Octet_out (_tao_seq_Octet_var &);
-      _tao_seq_Octet_out (const _tao_seq_Octet_out &);
-      _tao_seq_Octet_out &operator= (const _tao_seq_Octet_out &);
-      _tao_seq_Octet_out &operator= (_tao_seq_Octet *);
-      operator _tao_seq_Octet *&();
-      _tao_seq_Octet *&ptr (void);
-      _tao_seq_Octet *operator-> (void);
-      CORBA::Octet &operator[] (CORBA::ULong slot);
-
-    private:
-      _tao_seq_Octet *&ptr_;
-      // assignment from T_var not allowed
-      void operator= (const _tao_seq_Octet_var &);
-    };
-
-
-#endif /* end #if !defined */
-
-    _tao_seq_Octet service_detail;
-};
-
-class  CORBA_ServiceDetail_var
-{
- public:
-  CORBA_ServiceDetail_var (void); // default constructor
-  CORBA_ServiceDetail_var (CORBA_ServiceDetail *);
-  CORBA_ServiceDetail_var (const CORBA_ServiceDetail_var &); // copy constructor
-  ~CORBA_ServiceDetail_var (void); // destructor
-
-  CORBA_ServiceDetail_var &operator= (CORBA_ServiceDetail *);
-  CORBA_ServiceDetail_var &operator= (const CORBA_ServiceDetail_var &);
-  CORBA_ServiceDetail *operator-> (void);
-  const CORBA_ServiceDetail *operator-> (void) const;
-
-  operator const CORBA_ServiceDetail &() const;
-  operator CORBA_ServiceDetail &();
-  operator CORBA_ServiceDetail &() const;
-  // in, inout, out, _retn
-  const CORBA_ServiceDetail &in (void) const;
-  CORBA_ServiceDetail &inout (void);
-  CORBA_ServiceDetail *&out (void);
-  CORBA_ServiceDetail *_retn (void);
-  CORBA_ServiceDetail *ptr (void) const;
-
- private:
-  CORBA_ServiceDetail *ptr_;
-};
-
-class  CORBA_ServiceDetail_out
-{
- public:
-  CORBA_ServiceDetail_out (CORBA_ServiceDetail *&);
-  CORBA_ServiceDetail_out (CORBA_ServiceDetail_var &);
-  CORBA_ServiceDetail_out (const CORBA_ServiceDetail_out &);
-  CORBA_ServiceDetail_out &operator= (const CORBA_ServiceDetail_out &);
-  CORBA_ServiceDetail_out &operator= (CORBA_ServiceDetail *);
-  operator CORBA_ServiceDetail *&();
-  CORBA_ServiceDetail *&ptr (void);
-  CORBA_ServiceDetail *operator-> (void);
-
- private:
-  CORBA_ServiceDetail *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_ServiceDetail_var &);
-};
-
-struct  CORBA_ServiceInformation
-{
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CH_
-
-  class _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (void); // Default constructor.
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (CORBA::ULong maximum);
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (CORBA::ULong maximum,
-                                                                               CORBA::ULong length,
-                                                                               CORBA::ULong *data,
-                                                                               CORBA::Boolean release = 0);
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption & rhs);
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &operator= (const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &rhs);
-      virtual ~_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (void); // Dtor.
-
-      // = Accessors.
-      CORBA::ULong &operator[] (CORBA::ULong i);
-      const CORBA::ULong &operator[] (CORBA::ULong i) const;
-      // = Static operations.
-      static CORBA::ULong *allocbuf (CORBA::ULong size);
-      static void freebuf (CORBA::ULong *buffer);
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      // Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-      CORBA::ULong *get_buffer (CORBA::Boolean orphan = 0);
-      const CORBA::ULong *get_buffer (void) const;
-      void replace (CORBA::ULong max,
-                    CORBA::ULong length,
-                    CORBA::ULong *data,
-                    CORBA::Boolean release);
-    };
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CH_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CH_
-
-  // *************************************************************
-  // _tao_seq_ServiceOption
-  // *************************************************************
-
-  class  _tao_seq_ServiceOption : public
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ULong>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-    {
-    public:
-      _tao_seq_ServiceOption (void); // default ctor
-      _tao_seq_ServiceOption (CORBA::ULong max); // uses max size
-      _tao_seq_ServiceOption (
-                              CORBA::ULong max,
-                              CORBA::ULong length,
-                              CORBA::ULong *buffer,
-                              CORBA::Boolean release=0
-                              );
-      _tao_seq_ServiceOption (const _tao_seq_ServiceOption &); // copy ctor
-      ~_tao_seq_ServiceOption (void); // dtor
-    };
-  typedef _tao_seq_ServiceOption *_tao_seq_ServiceOption_ptr;
-  static CORBA::TypeCode_ptr _tc__tao_seq_ServiceOption;
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION___VAR_CH_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION___VAR_CH_
-
-  // *************************************************************
-  // class CORBA::ServiceInformation::_tao_seq_ServiceOption_var
-  // *************************************************************
-
-  class  _tao_seq_ServiceOption_var
-    {
-    public:
-      _tao_seq_ServiceOption_var (void); // default constructor
-      _tao_seq_ServiceOption_var (_tao_seq_ServiceOption *);
-      _tao_seq_ServiceOption_var (const _tao_seq_ServiceOption_var &); // copy constructor
-      ~_tao_seq_ServiceOption_var (void); // destructor
-      _tao_seq_ServiceOption_var &operator= (_tao_seq_ServiceOption *);
-      _tao_seq_ServiceOption_var &operator= (const _tao_seq_ServiceOption_var &);
-      _tao_seq_ServiceOption *operator-> (void);
-      const _tao_seq_ServiceOption *operator-> (void) const;
-
-      operator const _tao_seq_ServiceOption &() const;
-      operator _tao_seq_ServiceOption &();
-      operator _tao_seq_ServiceOption &() const;
-      CORBA::ServiceOption &operator[] (CORBA::ULong slot);
-      // in, inout, out, _retn
-      const _tao_seq_ServiceOption &in (void) const;
-      _tao_seq_ServiceOption &inout (void);
-      _tao_seq_ServiceOption *&out (void);
-      _tao_seq_ServiceOption *_retn (void);
-      _tao_seq_ServiceOption *ptr (void) const;
-
-    private:
-      _tao_seq_ServiceOption *ptr_;
-    };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION___OUT_CH_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION___OUT_CH_
-
-  class  _tao_seq_ServiceOption_out
-    {
-    public:
-      _tao_seq_ServiceOption_out (_tao_seq_ServiceOption *&);
-      _tao_seq_ServiceOption_out (_tao_seq_ServiceOption_var &);
-      _tao_seq_ServiceOption_out (const _tao_seq_ServiceOption_out &);
-      _tao_seq_ServiceOption_out &operator= (const _tao_seq_ServiceOption_out &);
-      _tao_seq_ServiceOption_out &operator= (_tao_seq_ServiceOption *);
-      operator _tao_seq_ServiceOption *&();
-      _tao_seq_ServiceOption *&ptr (void);
-      _tao_seq_ServiceOption *operator-> (void);
-      CORBA::ServiceOption &operator[] (CORBA::ULong slot);
-    private:
-      _tao_seq_ServiceOption *&ptr_;
-      // assignment from T_var not allowed
-      void operator= (const _tao_seq_ServiceOption_var &);
-    };
-
-
-#endif /* end #if !defined */
-
-  _tao_seq_ServiceOption service_options;
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CH_
-
-  class _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (void); // Default constructor.
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (CORBA::ULong maximum);
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (CORBA::ULong maximum,
-                                                                               CORBA::ULong length,
-                                                                               CORBA_ServiceDetail *data,
-                                                                               CORBA::Boolean release = 0);
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail & rhs);
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &operator= (const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &rhs);
-      virtual ~_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (void); // Dtor.
-      // = Accessors.
-      CORBA_ServiceDetail &operator[] (CORBA::ULong i);
-      const CORBA_ServiceDetail &operator[] (CORBA::ULong i) const;
-      // = Static operations.
-      static CORBA_ServiceDetail *allocbuf (CORBA::ULong size);
-      static void freebuf (CORBA_ServiceDetail *buffer);
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      // Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-      CORBA_ServiceDetail *get_buffer (CORBA::Boolean orphan = 0);
-      const CORBA_ServiceDetail *get_buffer (void) const;
-      void replace (CORBA::ULong max,
-                    CORBA::ULong length,
-                    CORBA_ServiceDetail *data,
-                    CORBA::Boolean release);
-    };
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CH_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CH_
-
-  // *************************************************************
-  // _tao_seq_ServiceDetail
-  // *************************************************************
-
-  class  _tao_seq_ServiceDetail : public
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_ServiceDetail>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-    {
-    public:
-      _tao_seq_ServiceDetail (void); // default ctor
-      _tao_seq_ServiceDetail (CORBA::ULong max); // uses max size
-      _tao_seq_ServiceDetail (
-                              CORBA::ULong max,
-                              CORBA::ULong length,
-                              CORBA_ServiceDetail *buffer,
-                              CORBA::Boolean release=0
-                              );
-      _tao_seq_ServiceDetail (const _tao_seq_ServiceDetail &); // copy ctor
-      ~_tao_seq_ServiceDetail (void); // dtor
-    };
-  typedef _tao_seq_ServiceDetail *_tao_seq_ServiceDetail_ptr;
-  static CORBA::TypeCode_ptr _tc__tao_seq_ServiceDetail;
-
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL___VAR_CH_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL___VAR_CH_
-
-  // *************************************************************
-  // class CORBA::ServiceInformation::_tao_seq_ServiceDetail_var
-  // *************************************************************
-
-  class  _tao_seq_ServiceDetail_var
-    {
-    public:
-      _tao_seq_ServiceDetail_var (void); // default constructor
-      _tao_seq_ServiceDetail_var (_tao_seq_ServiceDetail *);
-      _tao_seq_ServiceDetail_var (const _tao_seq_ServiceDetail_var &); // copy constructor
-      ~_tao_seq_ServiceDetail_var (void); // destructor
-
-      _tao_seq_ServiceDetail_var &operator= (_tao_seq_ServiceDetail *);
-      _tao_seq_ServiceDetail_var &operator= (const _tao_seq_ServiceDetail_var &);
-      _tao_seq_ServiceDetail *operator-> (void);
-      const _tao_seq_ServiceDetail *operator-> (void) const;
-
-      operator const _tao_seq_ServiceDetail &() const;
-      operator _tao_seq_ServiceDetail &();
-      operator _tao_seq_ServiceDetail &() const;
-      CORBA_ServiceDetail &operator[] (CORBA::ULong slot);
-      // in, inout, out, _retn
-      const _tao_seq_ServiceDetail &in (void) const;
-      _tao_seq_ServiceDetail &inout (void);
-      _tao_seq_ServiceDetail *&out (void);
-      _tao_seq_ServiceDetail *_retn (void);
-      _tao_seq_ServiceDetail *ptr (void) const;
-
-    private:
-      _tao_seq_ServiceDetail *ptr_;
-    };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL___OUT_CH_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL___OUT_CH_
-
-  class  _tao_seq_ServiceDetail_out
-    {
-    public:
-      _tao_seq_ServiceDetail_out (_tao_seq_ServiceDetail *&);
-      _tao_seq_ServiceDetail_out (_tao_seq_ServiceDetail_var &);
-      _tao_seq_ServiceDetail_out (const _tao_seq_ServiceDetail_out &);
-      _tao_seq_ServiceDetail_out &operator= (const _tao_seq_ServiceDetail_out &);
-      _tao_seq_ServiceDetail_out &operator= (_tao_seq_ServiceDetail *);
-      operator _tao_seq_ServiceDetail *&();
-      _tao_seq_ServiceDetail *&ptr (void);
-      _tao_seq_ServiceDetail *operator-> (void);
-      CORBA_ServiceDetail &operator[] (CORBA::ULong slot);
-
-    private:
-      _tao_seq_ServiceDetail *&ptr_;
-      // assignment from T_var not allowed
-      void operator= (const _tao_seq_ServiceDetail_var &);
-    };
-
-
-#endif /* end #if !defined */
-
-    _tao_seq_ServiceDetail service_details;
-};
-
-
-class  CORBA_ServiceInformation_var
-{
- public:
-  CORBA_ServiceInformation_var (void); // default constructor
-  CORBA_ServiceInformation_var (CORBA_ServiceInformation *);
-  CORBA_ServiceInformation_var (const CORBA_ServiceInformation_var &); // copy constructor
-  ~CORBA_ServiceInformation_var (void); // destructor
-
-  CORBA_ServiceInformation_var &operator= (CORBA_ServiceInformation *);
-  CORBA_ServiceInformation_var &operator= (const CORBA_ServiceInformation_var &);
-  CORBA_ServiceInformation *operator-> (void);
-  const CORBA_ServiceInformation *operator-> (void) const;
-
-  operator const CORBA_ServiceInformation &() const;
-  operator CORBA_ServiceInformation &();
-  operator CORBA_ServiceInformation &() const;
-  // in, inout, out, _retn
-  const CORBA_ServiceInformation &in (void) const;
-  CORBA_ServiceInformation &inout (void);
-  CORBA_ServiceInformation *&out (void);
-  CORBA_ServiceInformation *_retn (void);
-  CORBA_ServiceInformation *ptr (void) const;
-
- private:
-  CORBA_ServiceInformation *ptr_;
-};
-
-class  CORBA_ServiceInformation_out
-{
- public:
-  CORBA_ServiceInformation_out (CORBA_ServiceInformation *&);
-  CORBA_ServiceInformation_out (CORBA_ServiceInformation_var &);
-  CORBA_ServiceInformation_out (const CORBA_ServiceInformation_out &);
-  CORBA_ServiceInformation_out &operator= (const CORBA_ServiceInformation_out &);
-  CORBA_ServiceInformation_out &operator= (CORBA_ServiceInformation *);
-
-  operator CORBA_ServiceInformation *&();
-  CORBA_ServiceInformation *&ptr (void);
-  CORBA_ServiceInformation *operator-> (void);
-
- private:
-  CORBA_ServiceInformation *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_ServiceInformation_var &);
-};
-
-
-void  operator<<= (CORBA::Any &, const CORBA::ServiceDetail &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::ServiceDetail*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::ServiceDetail *&);
-void  operator<<= (CORBA::Any &, const CORBA_ServiceInformation &); // copying version
-void  operator<<= (CORBA::Any &, CORBA_ServiceInformation*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA_ServiceInformation *&);
-
-#ifndef __ACE_INLINE__
-
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA_ServiceDetail &); //
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA_ServiceDetail &);
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA_ServiceDetail::_tao_seq_Octet &); //
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA_ServiceDetail::_tao_seq_Octet &);
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA_ServiceInformation &);
- //
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA_ServiceInformation &);
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA_ServiceInformation::_tao_seq_ServiceOption &); //
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA_ServiceInformation::_tao_seq_ServiceOption &);
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA_ServiceInformation::_tao_seq_ServiceDetail &); //
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA_ServiceInformation::_tao_seq_ServiceDetail &);
-
-#endif /* __ACE_INLINE__ */
-
-#if defined (__ACE_INLINE__)
-#include "Services.i"
-#endif /* defined INLINE */
-
-
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_SERVICES_H */
diff --git a/TAO/tao/Services.i b/TAO/tao/Services.i
deleted file mode 100644
index 0dbaff7e6b4..00000000000
--- a/TAO/tao/Services.i
+++ /dev/null
@@ -1,1244 +0,0 @@
-//$Id$
-/* -*- C++ -*- */
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// *************************************************************
-// Inline operations for class CORBA::ServiceDetail_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_ServiceDetail_var::CORBA_ServiceDetail_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA_ServiceDetail_var::CORBA_ServiceDetail_var ( CORBA_ServiceDetail *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
- CORBA_ServiceDetail_var::CORBA_ServiceDetail_var (const  CORBA_ServiceDetail_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new  CORBA_ServiceDetail(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
- CORBA_ServiceDetail_var::~CORBA_ServiceDetail_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE  CORBA_ServiceDetail_var &
- CORBA_ServiceDetail_var::operator= ( CORBA_ServiceDetail *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE  CORBA_ServiceDetail_var &
- CORBA_ServiceDetail_var::operator= (const  CORBA_ServiceDetail_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new  CORBA_ServiceDetail (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const  CORBA_ServiceDetail *
- CORBA_ServiceDetail_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE  CORBA_ServiceDetail *
- CORBA_ServiceDetail_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
- CORBA_ServiceDetail_var::operator const  CORBA_ServiceDetail &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
- CORBA_ServiceDetail_var::operator  CORBA_ServiceDetail &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
- CORBA_ServiceDetail_var::operator  CORBA_ServiceDetail &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const  CORBA_ServiceDetail &
- CORBA_ServiceDetail_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE  CORBA_ServiceDetail &
- CORBA_ServiceDetail_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE  CORBA_ServiceDetail *&
- CORBA_ServiceDetail_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE  CORBA_ServiceDetail *
- CORBA_ServiceDetail_var::_retn (void)
-{
-   CORBA_ServiceDetail *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE  CORBA_ServiceDetail *
- CORBA_ServiceDetail_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ServiceDetail_out
-// *************************************************************
-
-ACE_INLINE
- CORBA_ServiceDetail_out::CORBA_ServiceDetail_out ( CORBA_ServiceDetail *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
- CORBA_ServiceDetail_out::CORBA_ServiceDetail_out ( CORBA_ServiceDetail_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
- CORBA_ServiceDetail_out::CORBA_ServiceDetail_out (const  CORBA_ServiceDetail_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_ServiceDetail_out&,p).ptr_)
-{}
-
-ACE_INLINE  CORBA_ServiceDetail_out &
- CORBA_ServiceDetail_out::operator= (const  CORBA_ServiceDetail_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_ServiceDetail_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_ServiceDetail_out &
-CORBA_ServiceDetail_out::operator= (CORBA_ServiceDetail *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_ServiceDetail_out::operator CORBA_ServiceDetail *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceDetail *&
-CORBA_ServiceDetail_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceDetail *
-CORBA_ServiceDetail_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#if !defined (_CORBA_SERVICEDETAIL__TAO_SEQ_OCTET_CI_)
-#define _CORBA_SERVICEDETAIL__TAO_SEQ_OCTET_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::ServiceDetail::_tao_seq_Octet_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_ServiceDetail::_tao_seq_Octet_var::_tao_seq_Octet_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA_ServiceDetail::_tao_seq_Octet_var::_tao_seq_Octet_var (CORBA_ServiceDetail::_tao_seq_Octet *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_ServiceDetail::_tao_seq_Octet_var::_tao_seq_Octet_var (const CORBA_ServiceDetail::_tao_seq_Octet_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA_ServiceDetail::_tao_seq_Octet(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceDetail::_tao_seq_Octet_var::~_tao_seq_Octet_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet_var &
-CORBA_ServiceDetail::_tao_seq_Octet_var::operator= (CORBA_ServiceDetail::_tao_seq_Octet *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet_var &
-CORBA_ServiceDetail::_tao_seq_Octet_var::operator= (const CORBA_ServiceDetail::_tao_seq_Octet_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA_ServiceDetail::_tao_seq_Octet (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA_ServiceDetail::_tao_seq_Octet *
-CORBA_ServiceDetail::_tao_seq_Octet_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet *
-CORBA_ServiceDetail::_tao_seq_Octet_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceDetail::_tao_seq_Octet_var::operator const CORBA_ServiceDetail::_tao_seq_Octet &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceDetail::_tao_seq_Octet_var::operator CORBA_ServiceDetail::_tao_seq_Octet &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceDetail::_tao_seq_Octet_var::operator CORBA_ServiceDetail::_tao_seq_Octet &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::Octet &
-CORBA_ServiceDetail::_tao_seq_Octet_var::operator[] (CORBA::ULong slot)
-{
-  return this->ptr_->operator[] (slot);
-}
-
-ACE_INLINE const CORBA_ServiceDetail::_tao_seq_Octet &
-CORBA_ServiceDetail::_tao_seq_Octet_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet &
-CORBA_ServiceDetail::_tao_seq_Octet_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet *&
-CORBA_ServiceDetail::_tao_seq_Octet_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet *
-CORBA_ServiceDetail::_tao_seq_Octet_var::_retn (void)
-{
-  CORBA_ServiceDetail::_tao_seq_Octet *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet *
-CORBA_ServiceDetail::_tao_seq_Octet_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ServiceDetail::_tao_seq_Octet_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_ServiceDetail::_tao_seq_Octet_out::_tao_seq_Octet_out (CORBA_ServiceDetail::_tao_seq_Octet *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceDetail::_tao_seq_Octet_out::_tao_seq_Octet_out (CORBA_ServiceDetail::_tao_seq_Octet_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceDetail::_tao_seq_Octet_out::_tao_seq_Octet_out (const CORBA_ServiceDetail::_tao_seq_Octet_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_ServiceDetail::_tao_seq_Octet_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet_out &
-CORBA_ServiceDetail::_tao_seq_Octet_out::operator= (const CORBA_ServiceDetail::_tao_seq_Octet_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_ServiceDetail::_tao_seq_Octet_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet_out &
-CORBA_ServiceDetail::_tao_seq_Octet_out::operator= (CORBA_ServiceDetail::_tao_seq_Octet *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_ServiceDetail::_tao_seq_Octet_out::operator CORBA_ServiceDetail::_tao_seq_Octet *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet *&
-CORBA_ServiceDetail::_tao_seq_Octet_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet *
-CORBA_ServiceDetail::_tao_seq_Octet_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Octet &
-CORBA_ServiceDetail::_tao_seq_Octet_out::operator[] (CORBA::ULong slot)
-{
-  return this->ptr_->operator[] (slot);
-}
-
-
-#endif /* end #if !defined */
-
-// *************************************************************
-// Inline operations for class CORBA::ServiceInformation_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_ServiceInformation_var::CORBA_ServiceInformation_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA_ServiceInformation_var::CORBA_ServiceInformation_var (CORBA_ServiceInformation *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_ServiceInformation_var::CORBA_ServiceInformation_var (const CORBA_ServiceInformation_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA_ServiceInformation(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceInformation_var::~CORBA_ServiceInformation_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation_var &
-CORBA_ServiceInformation_var::operator= (CORBA_ServiceInformation *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_ServiceInformation_var &
-CORBA_ServiceInformation_var::operator= (const CORBA_ServiceInformation_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA_ServiceInformation (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA_ServiceInformation *
-CORBA_ServiceInformation_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation *
-CORBA_ServiceInformation_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation_var::operator const CORBA_ServiceInformation &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation_var::operator CORBA_ServiceInformation &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation_var::operator CORBA_ServiceInformation &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const CORBA_ServiceInformation &
-CORBA_ServiceInformation_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation &
-CORBA_ServiceInformation_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA_ServiceInformation *&
-CORBA_ServiceInformation_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation *
-CORBA_ServiceInformation_var::_retn (void)
-{
-  CORBA_ServiceInformation *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA_ServiceInformation *
-CORBA_ServiceInformation_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ServiceInformation_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_ServiceInformation_out::CORBA_ServiceInformation_out (CORBA_ServiceInformation *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceInformation_out::CORBA_ServiceInformation_out (CORBA_ServiceInformation_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceInformation_out::CORBA_ServiceInformation_out (const CORBA_ServiceInformation_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_ServiceInformation_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_ServiceInformation_out &
-CORBA_ServiceInformation_out::operator= (const CORBA_ServiceInformation_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_ServiceInformation_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_ServiceInformation_out &
-CORBA_ServiceInformation_out::operator= (CORBA_ServiceInformation *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation_out::operator CORBA_ServiceInformation *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation *&
-CORBA_ServiceInformation_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation *
-CORBA_ServiceInformation_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CI_
-
-  // = Static operations.
-  ACE_INLINE CORBA::ULong *
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    return new CORBA::ULong[size];
-  }
-  
-  ACE_INLINE void CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (CORBA::ULong *buffer)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-  
-  ACE_INLINE
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (void) // Default constructor.
-  {
-  }
-  
-  ACE_INLINE
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::ULong *data,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-  {
-  }
-  
-  ACE_INLINE
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (const CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    CORBA::ULong *tmp1 = CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (this->maximum_);
-    CORBA::ULong * const tmp2 = ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
-  
-  ACE_INLINE CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::operator= (const CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &rhs)
-  // Assignment operator.
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-      {
-        // free the old buffer
-        CORBA::ULong *tmp = ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
-        CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (tmp);
-        this->buffer_ = CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA::ULong *tmp1 = ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
-    CORBA::ULong * const tmp2 = ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    return *this;
-  }
-  
-  // = Accessors.
-  ACE_INLINE CORBA::ULong &
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::operator[] (CORBA::ULong i)
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA::ULong* tmp = ACE_reinterpret_cast(CORBA::ULong*,this->buffer_);
-    return tmp[i];
-  }
-  
-  ACE_INLINE const CORBA::ULong &
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::operator[] (CORBA::ULong i) const
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA::ULong * const tmp = ACE_reinterpret_cast (CORBA::ULong* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
-  }
-  
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
-  ACE_INLINE CORBA::ULong *
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::get_buffer (CORBA::Boolean orphan)
-  {
-    CORBA::ULong *result = 0;
-    if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (this->length_);
-        this->buffer_ = result;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA::ULong*, this->buffer_);
-      }
-    }
-    else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA::ULong*,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
-    }
-    return result;
-  }
-  
-  ACE_INLINE const CORBA::ULong *
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const CORBA::ULong * ACE_CAST_CONST, this->buffer_);
-  }
-  
-  ACE_INLINE void
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::replace (CORBA::ULong max,
-  CORBA::ULong length,
-  CORBA::ULong *data,
-  CORBA::Boolean release)
-  {
-    this->maximum_ = max;
-    this->length_ = length;
-    if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::ULong *tmp = ACE_reinterpret_cast(CORBA::ULong*,this->buffer_);
-      CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (tmp);
-    }
-    this->buffer_ = data;
-    this->release_ = release;
-  }
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CI_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::ServiceInformation::_tao_seq_ServiceOption_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::_tao_seq_ServiceOption_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::_tao_seq_ServiceOption_var (CORBA_ServiceInformation::_tao_seq_ServiceOption *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::_tao_seq_ServiceOption_var (const CORBA_ServiceInformation::_tao_seq_ServiceOption_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA_ServiceInformation::_tao_seq_ServiceOption(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::~_tao_seq_ServiceOption_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption_var &
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::operator= (CORBA_ServiceInformation::_tao_seq_ServiceOption *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption_var &
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::operator= (const CORBA_ServiceInformation::_tao_seq_ServiceOption_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA_ServiceInformation::_tao_seq_ServiceOption (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA_ServiceInformation::_tao_seq_ServiceOption *
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption *
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::operator const CORBA_ServiceInformation::_tao_seq_ServiceOption &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::operator CORBA_ServiceInformation::_tao_seq_ServiceOption &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::operator CORBA_ServiceInformation::_tao_seq_ServiceOption &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::ServiceOption &
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::operator[] (CORBA::ULong slot)
-{
-  return this->ptr_->operator[] (slot);
-}
-
-ACE_INLINE const CORBA_ServiceInformation::_tao_seq_ServiceOption &
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption &
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption *&
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption *
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::_retn (void)
-{
-  CORBA_ServiceInformation::_tao_seq_ServiceOption *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption *
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_ServiceInformation::_tao_seq_ServiceOption_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceOption_out::_tao_seq_ServiceOption_out (CORBA_ServiceInformation::_tao_seq_ServiceOption *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceOption_out::_tao_seq_ServiceOption_out (CORBA_ServiceInformation::_tao_seq_ServiceOption_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceOption_out::_tao_seq_ServiceOption_out (const CORBA_ServiceInformation::_tao_seq_ServiceOption_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_ServiceInformation::_tao_seq_ServiceOption_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption_out &
-CORBA_ServiceInformation::_tao_seq_ServiceOption_out::operator= (const CORBA_ServiceInformation::_tao_seq_ServiceOption_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_ServiceInformation::_tao_seq_ServiceOption_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption_out &
-CORBA_ServiceInformation::_tao_seq_ServiceOption_out::operator= (CORBA_ServiceInformation::_tao_seq_ServiceOption *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation::_tao_seq_ServiceOption_out::operator CORBA_ServiceInformation::_tao_seq_ServiceOption *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption *&
-CORBA_ServiceInformation::_tao_seq_ServiceOption_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption *
-CORBA_ServiceInformation::_tao_seq_ServiceOption_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ServiceOption &
-CORBA_ServiceInformation::_tao_seq_ServiceOption_out::operator[] (CORBA::ULong slot)
-{
-  return this->ptr_->operator[] (slot);
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CI_
-
-  // = Static operations.
-  ACE_INLINE CORBA_ServiceDetail *
-  CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    return new CORBA_ServiceDetail[size];
-  }
-  
-  ACE_INLINE void CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (CORBA::ServiceDetail *buffer)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-  
-  ACE_INLINE
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (void) // Default constructor.
-  {
-  }
-  
-  ACE_INLINE
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA_ServiceDetail *data,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-  {
-  }
-  
-  ACE_INLINE
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (const CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    CORBA_ServiceDetail *tmp1 = CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (this->maximum_);
-    CORBA_ServiceDetail * const tmp2 = ACE_reinterpret_cast (CORBA_ServiceDetail * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
-  
-  ACE_INLINE CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::operator= (const CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &rhs)
-  // Assignment operator.
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-      {
-        // free the old buffer
-        CORBA_ServiceDetail *tmp = ACE_reinterpret_cast (CORBA_ServiceDetail *, this->buffer_);
-        CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (tmp);
-        this->buffer_ = CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA_ServiceDetail *tmp1 = ACE_reinterpret_cast (CORBA_ServiceDetail *, this->buffer_);
-    CORBA_ServiceDetail * const tmp2 = ACE_reinterpret_cast (CORBA_ServiceDetail * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    return *this;
-  }
-  
-  // = Accessors.
-  ACE_INLINE CORBA_ServiceDetail &
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::operator[] (CORBA::ULong i)
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA_ServiceDetail* tmp = ACE_reinterpret_cast(CORBA_ServiceDetail*,this->buffer_);
-    return tmp[i];
-  }
-  
-  ACE_INLINE const CORBA_ServiceDetail &
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::operator[] (CORBA::ULong i) const
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA_ServiceDetail * const tmp = ACE_reinterpret_cast (CORBA_ServiceDetail* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
-  }
-  
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
-  ACE_INLINE CORBA_ServiceDetail *
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::get_buffer (CORBA::Boolean orphan)
-  {
-    CORBA_ServiceDetail *result = 0;
-    if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (this->length_);
-        this->buffer_ = result;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA_ServiceDetail*, this->buffer_);
-      }
-    }
-    else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA_ServiceDetail*,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
-    }
-    return result;
-  }
-  
-  ACE_INLINE const CORBA_ServiceDetail *
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const CORBA_ServiceDetail * ACE_CAST_CONST, this->buffer_);
-  }
-  
-  ACE_INLINE void
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::replace (CORBA::ULong max,
-  CORBA::ULong length,
-  CORBA_ServiceDetail *data,
-  CORBA::Boolean release)
-  {
-    this->maximum_ = max;
-    this->length_ = length;
-    if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA_ServiceDetail *tmp = ACE_reinterpret_cast(CORBA_ServiceDetail*,this->buffer_);
-      CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (tmp);
-    }
-    this->buffer_ = data;
-    this->release_ = release;
-  }
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CI_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_ServiceInformation::_tao_seq_ServiceDetail_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::_tao_seq_ServiceDetail_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::_tao_seq_ServiceDetail_var (CORBA_ServiceInformation::_tao_seq_ServiceDetail *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::_tao_seq_ServiceDetail_var (const CORBA_ServiceInformation::_tao_seq_ServiceDetail_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA_ServiceInformation::_tao_seq_ServiceDetail(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::~_tao_seq_ServiceDetail_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail_var &
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::operator= (CORBA_ServiceInformation::_tao_seq_ServiceDetail *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail_var &
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::operator= (const CORBA_ServiceInformation::_tao_seq_ServiceDetail_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA_ServiceInformation::_tao_seq_ServiceDetail (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA_ServiceInformation::_tao_seq_ServiceDetail *
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail *
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::operator const CORBA_ServiceInformation::_tao_seq_ServiceDetail &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::operator CORBA_ServiceInformation::_tao_seq_ServiceDetail &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::operator CORBA_ServiceInformation::_tao_seq_ServiceDetail &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceDetail &
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::operator[] (CORBA::ULong slot)
-{
-  return this->ptr_->operator[] (slot);
-}
-
-ACE_INLINE const CORBA_ServiceInformation::_tao_seq_ServiceDetail &
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail &
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail *&
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail *
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::_retn (void)
-{
-  CORBA_ServiceInformation::_tao_seq_ServiceDetail *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail *
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ServiceInformation::_tao_seq_ServiceDetail_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_out::_tao_seq_ServiceDetail_out (CORBA_ServiceInformation::_tao_seq_ServiceDetail *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_out::_tao_seq_ServiceDetail_out (CORBA_ServiceInformation::_tao_seq_ServiceDetail_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_out::_tao_seq_ServiceDetail_out (const CORBA_ServiceInformation::_tao_seq_ServiceDetail_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_ServiceInformation::_tao_seq_ServiceDetail_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail_out &
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_out::operator= (const CORBA_ServiceInformation::_tao_seq_ServiceDetail_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_ServiceInformation::_tao_seq_ServiceDetail_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail_out &
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_out::operator= (CORBA_ServiceInformation::_tao_seq_ServiceDetail *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_out::operator CORBA_ServiceInformation::_tao_seq_ServiceDetail *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail *&
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail *
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceDetail &
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_out::operator[] (CORBA::ULong slot)
-{
-  return this->ptr_->operator[] (slot);
-}
-
-
-#endif /* end #if !defined */
-
diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp
deleted file mode 100644
index 339b5847181..00000000000
--- a/TAO/tao/Stub.cpp
+++ /dev/null
@@ -1,944 +0,0 @@
-// $Id$
-
-// @ (#)iiopobj.cpp     1.9 95/11/04
-// Copyright 1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// XXXX Bridge:         CORBA::Object operations
-//
-// Some CORBA::Object and other operations are specific to this STUB
-// based implementation, and can neither be used by other kinds of
-// objref nor have a default implementation.
-
-#include "tao/Stub.h"
-#include "tao/Sequence.h"
-#include "tao/Object.h"
-#include "tao/GIOP.h"
-#include "tao/NVList.h"
-#include "tao/Invocation.h"
-#include "tao/ORB_Core.h"
-#include "tao/Client_Strategy_Factory.h"
-#include "ace/Auto_Ptr.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Stub.i"
-#endif /* ! __ACE_INLINE__ */
-
-#include "tao/Timeprobe.h"
-
-ACE_RCSID(tao, TAO_Stub, "$Id$")
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-
-static const char *TAO_TAO_Stub_Timeprobe_Description[] =
-  {
-    "TAO_Stub::do_static_call - start",
-    "TAO_Stub::do_static_call - end",
-    "TAO_Stub::do_static_call - set_cancel",
-    "TAO_Stub::do_static_call - grab_orb_core",
-    "TAO_Stub::do_static_call - invocation_ctor",
-    "TAO_Stub::do_static_call - invocation_start",
-    "TAO_Stub::do_static_call - put_params"
-  };
-
-enum
-  {
-    // Timeprobe description table start key
-    TAO_STUB_OBJECT_DO_STATIC_CALL_START = 500,
-    TAO_STUB_OBJECT_DO_STATIC_CALL_END,
-    TAO_STUB_OBJECT_DO_STATIC_CALL_SET_CANCEL,
-    TAO_STUB_OBJECT_DO_STATIC_CALL_GRAB_ORB_CORE,
-    TAO_STUB_OBJECT_DO_STATIC_CALL_INVOCATION_CTOR,
-    TAO_STUB_OBJECT_DO_STATIC_CALL_INVOCATION_START,
-    TAO_STUB_OBJECT_DO_STATIC_CALL_PUT_PARAMS
-  };
-
-// Setup Timeprobes
-ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_TAO_Stub_Timeprobe_Description,
-                                  TAO_STUB_OBJECT_DO_STATIC_CALL_START);
-
-#endif /* ACE_ENABLE_TIMEPROBES */
-
-TAO_Stub::TAO_Stub (char *repository_id,
-                    const TAO_MProfile &profiles,
-                    TAO_ORB_Core* orb_core)
-  : type_id (repository_id),
-    base_profiles_ ((CORBA::ULong) 0),
-    forward_profiles_ (0),
-    profile_in_use_ (0),
-    profile_lock_ptr_ (0),
-    profile_success_ (0),
-    // what about ACE_SYNCH_MUTEX refcount_lock_
-    refcount_ (1),
-    use_locate_request_ (0),
-    first_locate_request_ (0),
-    orb_core_ (orb_core),
-    servant_orb_ ()
-#if defined (TAO_HAS_CORBA_MESSAGING)
-    , policies_ (0)
-#endif /* TAO_HAS_CORBA_MESSAGING */
-{
-  if (this->orb_core_ == 0)
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO: (%P|%t) TAO_Stub created with default "
-                      "ORB core\n"));
-        }
-      this->orb_core_ = TAO_ORB_Core_instance ();
-    }
-
-  // Duplicate the ORB. This will help us keep the ORB around until
-  // the CORBA::Object we represent dies.
-  this->orb_ = CORBA::ORB::_duplicate (this->orb_core_->orb ());
-
-  this->profile_lock_ptr_ =
-    this->orb_core_->client_factory ()->create_profile_lock ();
-
-  this->set_base_profiles (profiles);
-}
-
-void
-TAO_Stub::add_forward_profiles (const TAO_MProfile &mprofiles)
-{
-  // we assume that the profile_in_use_ is being
-  // forwarded!  Grab the lock so things don't change.
-  ACE_MT (ACE_GUARD (ACE_Lock,
-                     guard,
-                     *this->profile_lock_ptr_));
-
-  TAO_MProfile *now_pfiles = this->forward_profiles_;
-  if (now_pfiles == 0)
-    now_pfiles = &this->base_profiles_;
-
-  ACE_NEW (this->forward_profiles_,
-           TAO_MProfile (mprofiles));
-
-  // forwarded profile points to the new IOR (profiles)
-  this->profile_in_use_->forward_to (this->forward_profiles_);
-
-  // new profile list points back to the list which was forwarded.
-  this->forward_profiles_->forward_from (now_pfiles);
-
-  // make sure we start at the beginning of mprofiles
-  this->forward_profiles_->rewind ();
-}
-// Quick'n'dirty hash of objref data, for partitioning objrefs into
-// sets.
-//
-// NOTE that this must NOT go across the network!
-
-// @@ Use all profiles for hash function!!!!!  FRED
-//    can get different values, depending on the profile_in_use!!
-CORBA::ULong
-TAO_Stub::hash (CORBA::ULong max,
-                CORBA::Environment &ACE_TRY_ENV)
-{
-  // we rely on the profile object to has it's address info
-  if (profile_in_use_)
-    return profile_in_use_->hash (max, ACE_TRY_ENV);
-  ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) hash called on a null profile!\n"), 0);
-}
-
-// Expensive comparison of objref data, to see if two objrefs
-// certainly point at the same object. (It's quite OK for this to
-// return FALSE, and yet have the two objrefs really point to the same
-// object.)
-//
-// NOTE that this must NOT go across the network!
-// @@ Two object references are the same if any two profiles are the same!
-CORBA::Boolean
-TAO_Stub::is_equivalent (CORBA::Object_ptr other_obj)
-{
-  if (CORBA::is_nil (other_obj) == 1)
-    return 0;
-
-  TAO_Profile *other_profile = other_obj->_stubobj ()->profile_in_use_;
-  TAO_Profile *this_profile = this->profile_in_use_;
-
-  if (other_profile == 0 || this_profile == 0)
-    return 0;
-
-  // Compare the profiles
-  return this_profile->is_equivalent (other_profile);
-}
-
-// Memory managment
-
-CORBA::ULong
-TAO_Stub::_incr_refcnt (void)
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->refcount_lock_, 0);
-
-  return this->refcount_++;
-}
-
-CORBA::ULong
-TAO_Stub::_decr_refcnt (void)
-{
-  {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->refcount_lock_, 0);
-    this->refcount_--;
-    if (this->refcount_ != 0)
-      return this->refcount_;
-  }
-
-  delete this;
-  return 0;
-}
-
-// Note that if the repository ID (typeID) is NULL, it will make
-// narrowing rather expensive, though it does ensure that type-safe
-// narrowing code gets thoroughly exercised/debugged!  Without a
-// typeID, the _narrow will be required to make an expensive remote
-// "is_a" call.
-
-// THREADING NOTE: Code below this point is of course thread-safe (at
-// least on supported threaded platforms), so the caller of these
-// routines need only ensure that the data being passed in is not
-// being modified by any other thread.
-//
-// As an _experiment_ (to estimate the performance cost) remote calls
-// are currently deemed "cancel-safe".  That means that they can be
-// called by threads when they're in asynchronous cancellation mode.
-// The only effective way to do this is to disable async cancellation
-// for the duration of the call.  There are numerous rude interactions
-// with code generators for C++ ... cancellation handlers just do
-// normal stack unwinding like exceptions, but exceptions are purely
-// synchronous and sophisticated code generators rely on that to
-// generate better code, which in some cases may be very hard to
-// unwind.
-
-class TAO_Synchronous_Cancellation_Required
-  // = TITLE
-  //     Stick one of these at the beginning of a block that can't
-  //     support asynchronous cancellation, and which must be
-  //     cancel-safe.
-  //
-  // = EXAMPLE
-  //     somefunc()
-  //     {
-  //       TAO_Synchronous_Cancellation_Required NOT_USED;
-  //       ...
-  //     }
-{
-public:
-  // These should probably be in a separate inline file, but they're
-  // only used within this one file right now, and we always want them
-  // inlined, so here they sit.
-  TAO_Synchronous_Cancellation_Required (void)
-    : old_type_ (0)
-    {
-#if !defined (VXWORKS)
-      ACE_OS::thr_setcanceltype (THR_CANCEL_DEFERRED, &old_type_);
-#endif /* ! VXWORKS */
-    }
-
-  ~TAO_Synchronous_Cancellation_Required (void)
-    {
-#if !defined (VXWORKS)
-      int dont_care;
-      ACE_OS::thr_setcanceltype(old_type_, &dont_care);
-#endif /* ! VXWORKS */
-    }
-private:
-  int old_type_;
-};
-
-// "Stub interpreter" for static stubs.  IDL compiler (or human
-// equivalent thereof :-) should just dump a read-only description of
-// the call into "calldata" and do varargs calls to this routine,
-// which does all the work.
-
-void
-TAO_Stub::do_static_call (CORBA::Environment &ACE_TRY_ENV,
-                             const TAO_Call_Data *info,
-                             void** args)
-
-{
-  ACE_FUNCTION_TIMEPROBE (TAO_STUB_OBJECT_DO_STATIC_CALL_START);
-
-  TAO_Synchronous_Cancellation_Required NOT_USED;
-
-  ACE_TIMEPROBE (TAO_STUB_OBJECT_DO_STATIC_CALL_SET_CANCEL);
-
-  ACE_TIMEPROBE (TAO_STUB_OBJECT_DO_STATIC_CALL_GRAB_ORB_CORE);
-
-  // Do a locate_request if necessary/wanted.
-  // Suspect that you will be forwarded, so be proactive!
-  // strategy for reducing overhead when you think a request will
-  // be forwarded.  No standard way now to know.
-  if (this->use_locate_request_ && this->first_locate_request_)
-    {
-      TAO_GIOP_Locate_Request_Invocation call (this,
-                                               this->orb_core_);
-
-      // Simply let these exceptions propagate up
-      // (if any of them occurs.)
-      call.start (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      call.invoke (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->first_locate_request_ = 0;
-    }
-
-  if (info->is_roundtrip)
-    {
-      TAO_GIOP_Twoway_Invocation call (this, info->opname,
-                                       this->orb_core_);
-      ACE_TIMEPROBE (TAO_STUB_OBJECT_DO_STATIC_CALL_INVOCATION_CTOR);
-
-      // We may need to loop through here more than once if we're
-      // forwarded to some other object reference.
-      //
-      // NOTE: A quality-of-service policy may be useful to establish
-      // here, specifically one controlling how many times the call is
-      // reissued before failing the call on the assumption that
-      // something is broken.
-      //
-      // NOTE: something missing is a dynamic way to change the policy
-      // of whether to issue LocateRequest messages or not.  This code
-      // uses a simple, fixed policy: never use LocateRequest
-      // messages.
-      //
-      for (;;)
-        {
-          call.start (ACE_TRY_ENV);
-          ACE_CHECK;
-
-          ACE_TIMEPROBE (TAO_STUB_OBJECT_DO_STATIC_CALL_INVOCATION_START);
-
-          // Make the call ... blocking for the response.
-          this->put_params (ACE_TRY_ENV, info, call, args);
-          ACE_CHECK;
-
-          ACE_TIMEPROBE (TAO_STUB_OBJECT_DO_STATIC_CALL_PUT_PARAMS);
-
-          int status =
-            call.invoke (info->excepts,
-                         info->except_count,
-                         ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (status == TAO_INVOKE_RESTART)
-            continue;
-
-          if (status == TAO_INVOKE_EXCEPTION)
-            return; // Shouldn't happen
-
-          if (status != TAO_INVOKE_OK)
-            ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
-
-          // The only case left is status == TAO_INVOKE_OK, exit the
-          // loop.  We cannot retry because at this point we either
-          // got a reply or something with an status of
-          // COMPLETED_MAYBE, thus we cannot reissue the request if we
-          // are to satisfy the "at most once" semantics.
-          break;
-        }
-
-      // Now, get all the "return", "out", and "inout" parameters
-      // from the response message body ... return parameter is
-      // first, the rest are in the order defined in the IDL spec
-      // (which is also the order that DII users are required to
-      // use).
-
-      const TAO_Param_Data *pdp = info->params;
-      for (void** i = args;
-           i !=  args + info->param_count;
-           i++, pdp++)
-        {
-          void *ptr = *i;
-
-          // if it is an inout parameter, it would become
-          // necessary to first release the "in" memory
-          if (pdp->mode == PARAM_INOUT)
-            {
-              // @@ TODO - add others as we test each case
-              // (ASG) will do 03/22/98.
-              // @@ IMHO this should be handled in the stub
-              // (coryan)
-              CORBA::TCKind kind = pdp->tc->kind (ACE_TRY_ENV);
-              ACE_CHECK;
-
-              switch (kind)
-                {
-                case CORBA::tk_string:
-                  {
-                    CORBA::string_free (*(char **)ptr);
-                    *(char **)ptr = 0;
-                  }
-                  break;
-                default:
-                  break;
-                }
-            }
-
-          if (pdp->mode == PARAM_RETURN
-              || pdp->mode == PARAM_OUT
-              || pdp->mode == PARAM_INOUT)
-            {
-              // The language mapping's memory allocation
-              // policy says that some data is heap-allocated.
-              // This interpreter is told about the relevant
-              // policy by whoever built the operation
-              // description (e.g. the IDL compiler) so it
-              // doesn't have to know the policy associated
-              // with a particular language binding
-              // (e.g. C/C++ differ, and C++ even has
-              // different policies for different kinds of
-              // structures).
-              if (pdp->value_size == 0)
-                {
-                  call.get_value (pdp->tc, ptr, ACE_TRY_ENV);
-                  ACE_CHECK;
-                }
-              else
-                {
-                  // @@ (ASG) -  I think we must completely
-                  // get rid of this case because IDL compiler
-                  // generated stubs will use this function
-                  // and they better allocate all the memory.
-
-                  // assert (value_size == tc->size());
-                  *(void **)ptr = new CORBA::Octet [pdp->value_size];
-                  call.get_value (pdp->tc, *(void **)ptr, ACE_TRY_ENV);
-                  ACE_CHECK;
-                }
-            }
-        }
-    } // if (two way)
-  else
-    {
-      TAO_GIOP_Oneway_Invocation call (this, info->opname,
-                                       this->orb_core_);
-      ACE_TIMEPROBE (TAO_STUB_OBJECT_DO_STATIC_CALL_INVOCATION_CTOR);
-
-      for (;;)
-        {
-          call.start (ACE_TRY_ENV);
-          ACE_CHECK;
-
-          this->put_params (ACE_TRY_ENV, info, call, args);
-          ACE_CHECK;
-
-          ACE_TIMEPROBE (TAO_STUB_OBJECT_DO_STATIC_CALL_PUT_PARAMS);
-          int status = call.invoke (ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (status == TAO_INVOKE_RESTART)
-            continue;
-
-          if (status == TAO_INVOKE_EXCEPTION)
-            return; // Shouldn't happen
-
-          if (status != TAO_INVOKE_OK)
-            ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
-
-          break;
-        }
-    }
-}
-
-void
-TAO_Stub::put_params (CORBA::Environment &ACE_TRY_ENV,
-                         const TAO_Call_Data *info,
-                         TAO_GIOP_Invocation &call,
-                         void** args)
-{
-  // Now, put all "in" and "inout" parameters into the request
-  // message body.
-  //
-  // Some "inout" data have an extra level of indirection,
-  // specified by the language mapping's memory allocation
-  // policies ... the indirection only shows up here when it's
-  // needed later for allocating "out" memory, otherwise there's
-  // just one indirection.
-
-  const TAO_Param_Data *pdp = info->params;
-  for (void** i = args;
-       i != args + info->param_count;
-       i++, pdp++)
-    {
-      void *ptr = *i;
-
-      if (pdp->mode == PARAM_IN)
-        {
-          call.put_param (pdp->tc, ptr, ACE_TRY_ENV);
-        }
-      else if (pdp->mode == PARAM_INOUT)
-        {
-          if (pdp->value_size == 0)
-            call.put_param (pdp->tc, ptr, ACE_TRY_ENV);
-          else
-            call.put_param (pdp->tc, *(void **)ptr, ACE_TRY_ENV);
-        }
-      ACE_CHECK;
-    }
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-// DII analogue of the above.
-
-void
-TAO_Stub::do_dynamic_call (const char *opname,
-                              CORBA::Boolean is_roundtrip,
-                              CORBA::NVList_ptr args,
-                              CORBA::NamedValue_ptr result,
-                              CORBA::Flags,
-                              CORBA::ExceptionList &exceptions,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Synchronous_Cancellation_Required NOT_USED;
-
-  // Do a locate_request if necessary/wanted.
-  // Suspect that you will be forwarded, so be proactive!
-  // strategy for reducing overhead when you think a request will
-  // be forwarded.  No standard way now to know.
-  if (this->use_locate_request_ && this->first_locate_request_)
-    {
-      TAO_GIOP_Locate_Request_Invocation call (this, this->orb_core_);
-
-      // Simply let these exceptions propagate up
-      // (if any of them occurs.)
-      call.start (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      call.invoke (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->first_locate_request_ = 0;
-    }
-
-  if (is_roundtrip)
-    {
-      TAO_GIOP_Twoway_Invocation call (this, opname, this->orb_core_);
-
-      // Loop as needed for forwarding; see above.
-
-      for (;;)
-        {
-          call.start (ACE_TRY_ENV);
-          ACE_CHECK;
-
-          this->put_params (call, args, ACE_TRY_ENV);
-          ACE_CHECK;
-
-          // Make the call ... blocking for the response.
-          int status =
-            call.invoke (exceptions, ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (status == TAO_INVOKE_RESTART)
-            continue;
-
-          if (status == TAO_INVOKE_EXCEPTION)
-            return; // Shouldn't happen
-
-          if (status != TAO_INVOKE_OK)
-            ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
-
-          // The only case left is status == TAO_INVOKE_OK, exit the
-          // loop.  We cannot retry because at this point we either
-          // got a reply or something with an status of
-          // COMPLETED_MAYBE, thus we cannot reissue the request if we
-          // are to satisfy the "at most once" semantics.
-          break;
-        }
-
-      // Now, get all the "return", "out", and "inout" parameters
-      // from the response message body ... return parameter is
-      // first, the rest are in the order defined in the IDL spec
-      // (which is also the order that DII users are required to
-      // use).
-
-      if (result != 0)
-        {
-#if 0
-          // @@ (ASG) I need to look into this OUT_LIST_MEMORY stuff
-          // (4/21/98).
-          // @@ (Carlos) All this code seems bogus, we know that
-          //    allocating memory of behalf of the user is and endless
-          //    source of trouble (due to vtbls and the such).
-
-          // If caller didn't set OUT_LIST_MEMORY flag, allocate
-          // memory for return value ...
-
-          if (!(flags & CORBA::OUT_LIST_MEMORY))
-            {
-              CORBA::TypeCode_var tcp = result->value ()->type ();
-              size_t size = tcp->size (ACE_TRY_ENV);
-              ACE_CHECK;
-
-              if (size != 0)
-                {
-                  void *ptr = new CORBA::Octet [size];
-
-                  result->value ()->replace (tcp.in (), ptr, 1, ACE_TRY_ENV);
-                  ACE_CHECK;
-                }
-            }
-#endif
-          if (!result->value ()->value_)
-            {
-              // storage was not allocated. In this case, we
-              // simply grab the portion of the CDR stream
-              // that contained this parameter, The
-              // application should use the appropriate >>=
-              // operator to retrieve the value
-              char *begin, *end;
-              TAO_InputCDR temp (call.inp_stream ());
-              CORBA::TypeCode::traverse_status retval;
-              CORBA::Any *any = result->value ();
-
-              begin = call.inp_stream ().rd_ptr ();
-              // skip the parameter to get the ending position
-              retval = temp.skip (any->type_, ACE_TRY_ENV);
-              ACE_CHECK;
-
-              if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                {
-                  end = temp.rd_ptr ();
-                  any->cdr_ = new ACE_Message_Block (end - begin);
-                  any->cdr_->wr_ptr (end - begin);
-                  TAO_OutputCDR out (any->cdr_);
-                  retval = out.append (any->type_,
-                                       &call.inp_stream (), ACE_TRY_ENV);
-                  ACE_CHECK;
-
-                  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                    {
-                      any->value_ = 0;
-                      any->any_owns_data_ = 0;
-                    }
-                }
-            }
-          else
-            {
-              // the application had allocated the top level
-              // storage. We simply retrieve the data
-              call.get_value (result->value ()->type_,
-                              result->value ()->value_, ACE_TRY_ENV);
-              ACE_CHECK;
-            }
-        }
-
-      for (u_int i = 0; i < args->count (); i++)
-        {
-          CORBA::NamedValue_ptr value = args->item (i, ACE_TRY_ENV);
-          ACE_CHECK;
-
-          CORBA::Any *any = value->value ();
-
-          if (value->flags () == CORBA::ARG_OUT
-              || value->flags () == CORBA::ARG_INOUT)
-            {
-#if 0
-              // @@  (ASG) need to deal with this
-
-              // If caller didn't set OUT_LIST_MEMORY flag, allocate
-              // memory for this parameter ...
-              if (!(flags & CORBA::OUT_LIST_MEMORY))
-                {
-                  CORBA::TypeCode_var tcp = value->value ()->type ();
-                  size_t size = tcp->size (ACE_TRY_ENV);
-                  ACE_CHECK;
-
-                  if (size != 0)
-                    {
-                      CORBA::Octet *ptr = new CORBA::Octet [size];
-
-                      value->value ()->replace (tcp.in (), ptr,
-                                                1, ACE_TRY_ENV);
-                      ACE_CHECK;
-                    }
-                }
-#endif
-              if (!any->value_)
-                {
-                  // storage was not allocated. In this case,
-                  // we simply grab the portion of the CDR
-                  // stream that contained this parameter, The
-                  // application should use the appropriate
-                  // >>= operator to retrieve the value
-                  char *begin, *end;
-                  TAO_InputCDR temp (call.inp_stream ());
-                  CORBA::TypeCode::traverse_status retval;
-
-                  begin = call.inp_stream ().rd_ptr ();
-                  // skip the parameter to get the ending position
-                  retval = temp.skip (any->type_, ACE_TRY_ENV);
-                  ACE_CHECK;
-
-                  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                    {
-                      end = temp.rd_ptr ();
-                      any->cdr_ = new ACE_Message_Block (end - begin);
-                      TAO_OutputCDR out (any->cdr_);
-
-                      retval = out.append (any->type_,
-                                           &call.inp_stream (), ACE_TRY_ENV);
-                      ACE_CHECK;
-
-                      if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          any->value_ = 0;
-                          any->any_owns_data_ = 0;
-                        }
-                    }
-                }
-              else
-                {
-                  // the application had allocated the top level
-                  // storage. We simply retrieve the data
-                  call.get_value (any->type_,
-                                  (void *) any->value_, ACE_TRY_ENV);
-                  ACE_CHECK;
-                }
-            }
-        }
-    }
-  else
-    {
-      TAO_GIOP_Oneway_Invocation call (this, opname, this->orb_core_);
-
-      for (;;)
-        {
-          call.start (ACE_TRY_ENV);
-          ACE_CHECK;
-
-          this->put_params (call, args, ACE_TRY_ENV);
-          ACE_CHECK;
-
-          int status = call.invoke (ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (status == TAO_INVOKE_RESTART)
-            continue;
-
-          if (status == TAO_INVOKE_EXCEPTION)
-            return; // Shouldn't happen
-
-          if (status != TAO_INVOKE_OK)
-            ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
-
-          break;
-        }
-    }
-}
-
-void
-TAO_Stub::put_params (TAO_GIOP_Invocation &call,
-                      CORBA::NVList_ptr args,
-                      CORBA::Environment &ACE_TRY_ENV)
-{
-  // Now, put all "in" and "inout" parameters into the request
-  // message body.
-
-  for (u_int i = 0; i < args->count (); i++)
-    {
-      CORBA::NamedValue_ptr value = args->item (i, ACE_TRY_ENV);
-      ACE_CHECK;
-
-      if (value->flags () == CORBA::ARG_IN
-          || value->flags () == CORBA::ARG_INOUT)
-        {
-          // If the Any owns the data, then we have allocated space.
-          if (value->value ()->any_owns_data_)
-            {
-              call.put_param (value->value ()->type_,
-                              value->value ()->value_, ACE_TRY_ENV);
-              ACE_CHECK;
-            }
-          else
-            {
-              TAO_OutputCDR &cdr = call.out_stream ();
-              TAO_InputCDR in (value->value ()->cdr_,
-                               TAO_ENCAP_BYTE_ORDER,
-                               this->orb_core_);
-              cdr.append (value->value ()->type_, &in, ACE_TRY_ENV);
-              ACE_CHECK;
-            }
-        }
-    }
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-// ****************************************************************
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-
-CORBA::Policy_ptr
-TAO_Stub::get_policy (
-    CORBA::PolicyType type,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard,
-                    this->refcount_lock_,
-                    CORBA::Policy::_nil ());
-
-  if (this->policies_ == 0)
-    return CORBA::Policy::_nil ();
-
-  return this->policies_->get_policy (type, ACE_TRY_ENV);
-}
-
-CORBA::Policy_ptr
-TAO_Stub::get_client_policy (
-    CORBA::PolicyType type,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard,
-                    this->refcount_lock_,
-                    CORBA::Policy::_nil ());
-
-  CORBA::Policy_var result;
-  if (this->policies_ != 0)
-    {
-      result = this->policies_->get_policy (type, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-    }
-
-  if (CORBA::is_nil (result.in ()))
-    {
-      TAO_Policy_Current &policy_current = this->orb_core_->policy_current ();
-      result = policy_current.get_policy (type, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-    }
-
-  if (CORBA::is_nil (result.in ()))
-    {
-      TAO_Policy_Manager *policy_manager =
-        this->orb_core_->policy_manager ();
-      if (policy_manager != 0)
-        {
-          result = policy_manager->get_policy (type, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-        }
-    }
-
-  if (CORBA::is_nil (result.in ()))
-    {
-      result = this->orb_core_->get_default_policy (type, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-    }
-
-  return result._retn ();
-}
-
-POA_Messaging::RelativeRoundtripTimeoutPolicy*
-TAO_Stub::relative_roundtrip_timeout (void)
-{
-  // No need to lock, the stub only changes its policies at
-  // construction time...
-
-  POA_Messaging::RelativeRoundtripTimeoutPolicy* result = 0;
-  if (this->policies_ != 0)
-    result = this->policies_->relative_roundtrip_timeout ();
-
-  // No need to lock, the object is in TSS storage....
-  if (result == 0)
-    {
-      TAO_Policy_Current &policy_current =
-        this->orb_core_->policy_current ();
-      result = policy_current.relative_roundtrip_timeout ();
-    }
-
-  // @@ Must lock, but is is harder to implement than just modifying
-  //    this call: the ORB does take a lock to modify the policy
-  //    manager
-  if (result == 0)
-    {
-      TAO_Policy_Manager *policy_manager =
-        this->orb_core_->policy_manager ();
-      if (policy_manager != 0)
-        result = policy_manager->relative_roundtrip_timeout ();
-    }
-
-  if (result == 0)
-    result = this->orb_core_->default_relative_roundtrip_timeout ();
-
-  return result;
-}
-
-TAO_Stub*
-TAO_Stub::set_policy_overrides (
-    const CORBA::PolicyList & policies,
-    CORBA::SetOverrideType set_add,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  // Notice the use of an explicit constructor....
-  auto_ptr<TAO_Policy_Manager_Impl> policy_manager (new TAO_Policy_Manager_Impl);
-
-  if (set_add == CORBA::SET_OVERRIDE)
-    {
-      policy_manager->set_policy_overrides (policies,
-                                            set_add,
-                                            ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-    }
-  else if (this->policies_ == 0)
-    {
-      policy_manager->set_policy_overrides (policies,
-                                            CORBA::SET_OVERRIDE,
-                                            ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-    }
-  else
-    {
-      *policy_manager = *this->policies_;
-      policy_manager->set_policy_overrides (policies,
-                                            set_add,
-                                            ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-    }
-
-  TAO_Stub* stub;
-  ACE_NEW_RETURN (stub, TAO_Stub (CORBA::string_dup (this->type_id.in ()),
-                                  this->base_profiles_,
-                                  this->orb_core_),
-                  0);
-  stub->policies_ = policy_manager.release ();
-  return stub;
-}
-
-CORBA::PolicyList *
-TAO_Stub::get_policy_overrides (
-    const CORBA::PolicyTypeSeq & types,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  if (this->policies_ == 0)
-    return 0;
-
-  return this->policies_->get_policy_overrides (types, ACE_TRY_ENV);
-}
-
-CORBA::Boolean
-TAO_Stub::validate_connection (
-    CORBA::PolicyList_out inconsistent_policies,
-    CORBA::Environment &)
-{
-  // @@ What is a good default value to return....
-  inconsistent_policies = 0;
-  return 0;
-}
-
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class auto_ptr<TAO_Policy_Manager_Impl>;
-template class ACE_Auto_Basic_Ptr<TAO_Policy_Manager_Impl>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate auto_ptr<TAO_Policy_Manager_Impl>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Policy_Manager_Impl>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
deleted file mode 100644
index 428b7ab75d5..00000000000
--- a/TAO/tao/Stub.h
+++ /dev/null
@@ -1,541 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Stub.h
-//
-// = DESCRIPTION
-//
-//    Data structures used by static and dynamic stubs, and to a
-//    lesser degree by skeletons
-//
-//    Header file for Win32 C/C++/COM interface to one kind of CORBA
-//    remote invocation framework.  This is for use by
-//    compiler-generated code, not by portable applications!
-//
-//    These constitute the stub API to this "ORB Core".  Such
-//    interfaces are not specified by OMG, and may differ between
-//    different ORBs.  This one has the particular advantage that
-//    stubs can be quite small.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems, Inc.
-//
-// ============================================================================
-
-#ifndef TAO_STUB_H
-#define TAO_STUB_H
-
-#include "tao/Pluggable.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/MProfile.h"
-#include "tao/ORB.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-#include "tao/MessagingS.h"
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
-
-class TAO_GIOP_Invocation;
-class TAO_ORB_Core;
-class TAO_Policy_Manager_Impl;
-
-// Descriptions of parameters.
-
-enum TAO_Param_Type
-{
-  // = TITLE
-  //   TAO_Param_Type
-  //
-  // = DESCRIPTION
-  //   Parameter mode of a given parameter.
-  PARAM_IN,
-  PARAM_OUT,
-  PARAM_INOUT,
-  PARAM_RETURN  // = PARAM_OUT
-};
-
-class TAO_Profile;
-
-struct TAO_Param_Data
-{
-  // = TITLE
-  //   TAO_Param_Data
-  //
-  // = DESCRIPTION
-  //   Description of a single parameter.
-  //
-  //   If value_size is nonzero for OUT, INOUT, or RETURN parameters,
-  //   it's (a) an indicator that the ORB returns a pointer-to-value
-  //   for this parameter, and also (b) is the size of the top-level
-  //   of the value that's returned (e.g. ignoring nested sequence
-  //   buffers).  That is, it moves CPU cycles from runtime -- some
-  //   calls to tc->size() -- to compile time where they're
-  //   cheap/free.
-  //
-  //   It _must_ only be set for cases where the ORB allocates the
-  //   return value, which must then be ORB::free()d ... e.g. where
-  //   the value is a pointer to data such as a struct, sequence, or
-  //   union.  (The CORBA C++ mapping doesn't require that for all
-  //   "out" structs; only those of "variable size".)  If this value
-  //   is nonzero, the value passed to do_static_call() must be the address
-  //   of a pointer.
-
-  CORBA::TypeCode_ptr tc;
-  // TypeCode for the parameter
-
-  TAO_Param_Type mode;
-  // Its mode.
-
-  size_t value_size;
-  // zero or tc->size (). For SII, we always know its size since it is the IDL
-  // compiler which generates the stub code.
-};
-
-// Function pointer returning a pointer to CORBA::Exception. This is used to
-// describe the allocator for user-defined exceptions that are used internally
-// by the interpreter.
-typedef CORBA::Exception* (*TAO_Exception_Alloc) (void);
-
-struct TAO_Exception_Data
-{
-  // = TITLE
-  //   TAO_Exception_Data
-  //
-  // = DESCRIPTION
-  //   Description of a single exception
-  //
-  //   The interpreter needs a way to allocate memory to hold the exception
-  //   that was raised by the stub. This data structure provides the typecode
-  //   for the exception as well as a static function pointer that does the job
-  //   of memory allocation.
-
-  CORBA::TypeCode_ptr tc;
-  // typecode describing the exception
-
-  TAO_Exception_Alloc alloc;
-  // the allocator for this exception
-};
-
-struct TAO_Call_Data
-{
-  // = TITLE
-  //   TAO_Call_Data
-  //
-  // = DESCRIPTION
-  //   Descriptions of operations, as used by the stub interpreter.
-  //   Only interpretive marshaling/unmarshaling is used, and the
-  //   stubs don't know what particular on-the-wire protocol is being
-  //   used.
-  //
-  //   When using C++ exceptions, many C++ compilers will require the
-  //   use of compiled code throw the exception.  As binary standards
-  //   for exception throwing evolve, it may become practical to
-  //   interpretively throw exceptions.
-
-  const char *opname;
-  // Operation name.
-
-  CORBA::Boolean is_roundtrip;
-  // !oneway
-
-  // When constructing tables of parameters, put them in the same
-  // order they appear in the IDL spec: return value, then parameters
-  // left to right.  Other orders may produce illegal protocol
-  // messages.
-
-  u_int param_count;
-  // # parameters.
-
-  const TAO_Param_Data *params;
-  // Their descriptions.
-
-  // The exceptions allowed by this operation can be listed in any
-  // order, and need not include the system exceptions which may be
-  // returned by OMG-IDL operations.  If an operation tries to return
-  // any exception not allowed by its type signature, this causes a a
-  // system exception to be reported.
-
-  u_int except_count;
-  // # exceptions.
-
-  //  CORBA::TypeCode_ptr *excepts;
-  TAO_Exception_Data *excepts;
-  // Their descriptions.
-};
-
-struct TAO_Skel_Entry
-{
-  // = TITLE
-  //   TAO_Skel_Entry
-  //
-  // = DESCRIPTION
-  //   Skeletons map "ServerRequest" generic signatures to the static
-  //   call signature required by the implementation's methods.  table
-  //   of these per implementation
-  //
-  //   There are several optimizations that'd be desirable for use by
-  //   "static skeletons", notably (a) passing of per-object data held
-  //   by the OA so that the method doesn't need to look it up itself,
-  //   (b) removing all mandatory heap allocation of data, and of
-  //   course (c) handling all the built-in ORB calls like "is_a" and
-  //   "get_implementation".  This code is currently set up only for
-  //   Dynamic Skeletons and bridging, for which none of those are
-  //   real issues.
-
-  const TAO_Call_Data *op_descriptor;
-  // pointer to the calldata structure that holds information about all the
-  // parameters
-
-  TAO_Skeleton impl_skeleton;
-  // skeleton corresponding to the operation
-};
-
-class TAO_Export TAO_Stub
-{
-  // = TITLE
-  //   TAO_Stub
-  //
-  // = DESCRIPTION
-  //   Per-objref data includes the (protocol-specific) Profile, which
-  //   is handled by placing it into a subclass of this type along
-  //   with data that may be used in protocol-specific caching
-  //   schemes.
-  //
-  //   The type ID (the data specified by CORBA 2.0 that gets exposed
-  //   "on the wire", and in stringified objrefs) is held by this
-  //   module.
-  //
-  //   The stub and DII interpreter APIs are member functions of this
-  //   type.
-public:
-  void do_static_call (CORBA_Environment &ACE_TRY_ENV,
-                       const TAO_Call_Data *info,
-                       void** args);
-  // The "stub interpreter" method parameters are:
-  //
-  //    - ACE_TRY_ENV ... used for exception reporting
-  //    - info ... describes the call
-  //    - args parameters follow
-  //
-  // The varargs parameters are pointers to data instances as
-  // described by info->params.  (If the value_size is nonzero, the
-  // data instance is itself a pointer.)  The order on the call stack
-  // must be exactly the order they're listed in info->params;
-  // normally this is the order the values are listed in the OMG-IDL
-  // operation specification.
-  //
-  // NOTE: This can be sped up by eliminating some parameter
-  // shuffling.  The stub and "do_static_call" parameters are all but the
-  // same, except that their order is different.
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  void do_dynamic_call (const char *opname,
-                        CORBA::Boolean is_roundtrip,
-                        CORBA::NVList_ptr args,
-                        CORBA::NamedValue_ptr result,
-                        CORBA::Flags flags,
-                        CORBA::ExceptionList &exceptions,
-                        CORBA_Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  // Dynamic invocations use a more costly "varargs" calling
-  // convention; it's got the same input data as the (static)
-  // stub-oriented one, but the data is represented somewhat
-  // differently.
-  //
-  // Operation-specific data isn't collected in a stack frame and into
-  // a static/readonly "calldata" structure, but instead is collected
-  // into these parameters, the majority of which are heap-allocated:
-  //
-  //    - opname ... the name of the operation
-  //    - is_roundtrip ... true except for oneway operations, or ones where
-  //      the client doesn't care about responses
-  //    - args ... call parameters and their descriptions
-  //    - result ... result and its description
-  //    - flags ... only one DII flag is legal
-  //    - exceptions ... list of legal user-defined exceptions
-  //    - ACE_TRY_ENV ... used for exception reporting.
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-  CORBA::Policy_ptr get_policy (
-      CORBA::PolicyType type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-
-  POA_Messaging::RelativeRoundtripTimeoutPolicy*
-     relative_roundtrip_timeout (void);
-
-  CORBA::Policy_ptr get_client_policy (
-      CORBA::PolicyType type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  TAO_Stub* set_policy_overrides (
-      const CORBA::PolicyList & policies,
-      CORBA::SetOverrideType set_add,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  CORBA::PolicyList * get_policy_overrides (
-      const CORBA::PolicyTypeSeq & types,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  CORBA::Boolean validate_connection (
-      CORBA::PolicyList_out inconsistent_policies,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
-  CORBA::String_var type_id;
-  // All objref representations carry around a type ID.
-
-  CORBA::ULong hash (CORBA::ULong maximum,
-          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // All objref representations know how to hash themselves and
-  // compare themselves for equivalence to others.  It's easily
-  // possible to have two objrefs that are distinct copies of data
-  // that refers/points to the same remote object (i.e. are
-  // equivalent).
-
-  CORBA::Boolean is_equivalent (CORBA::Object_ptr other_obj);
-  // Implement the is_equivalent() method for the CORBA::Object
-
-  // Our Constructors ...
-
-  TAO_Stub (char *repository_id,
-            const TAO_MProfile &profiles,
-            TAO_ORB_Core *orb_core);
-  // Construct from a repository ID and a list of profiles.
-
-  // = Memory management.
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
-
-  // Manage the base (non-forwarded) profiles.
-  TAO_Profile *profile_in_use (void) ;
-  // returns a pointer to the profile_in_use object.  This object
-  // retains ownership of this profile.
-
-  TAO_MProfile *get_profiles (void);
-  // Copy of the profile list, user must free memory when done.
-  // although the user can call get_profiles then reorder
-  // the list and give it back to TAO_Stub.
-
-  const TAO_MProfile& get_base_profiles (void) const;
-  // Obtain a reference to the basic profile set.
-
-  // manage forward and base profiles.
-  TAO_Profile *next_profile (void);
-  // THREAD SAFE.  If forward_profiles is null then this will
-  // get the next profile in the base_profiles list.  If forward is not null
-  // then this will get the next profile for the list of forwarding
-  // profiles.  If all profiles have been tried then 0 is returned and
-  // profile_in_use_ is set to the first profile in the base_profiles
-  // list.
-
-  TAO_Profile *next_profile_i (void);
-  // NON-THREAD SAFE version of next_profile (void)
-
-  void reset_profiles (void);
-  // THREAD SAFE
-  // this method will reset the base profile list to reference the first
-  // profile and if there are anmy existing forward profiles they are
-  // reset.
-
-  void reset_profiles_i (void);
-  // NON-THREAD SAFE version of reset_profiles (void);
-
-  CORBA::Boolean valid_forward_profile (void);
-  // Returns 1 if a forward profile has successfully been used.
-  // profile_success_ && forward_profiles_
-
-  // Just forward profiles.
-  void use_locate_requests (CORBA::Boolean use_it);
-  // set the flags to use locate_requests.
-
-  void set_valid_profile (void);
-   // NON-THREAD-SAFE.  Will set profile_success_ to 0.
-
-   CORBA::Boolean valid_profile (void);
-   // returns TRUE if a connection was successful with at least
-   // one profile.
-
-   TAO_Profile *set_base_profiles (const TAO_MProfile& mprofiles);
-   // Initialize the base_profiles_ and set profile_in_use_ to
-   // reference the first profile.
-
-  void add_forward_profiles (const TAO_MProfile &mprofiles);
-  // THREAD SAFE.
-  // set the forward_profiles.  This object will assume ownership of
-  // this TAO_MProfile object!!
-
-  CORBA::Boolean next_profile_retry (void);
-  // THREAD SAFE
-  // used to get the next profile after the one being used has
-  // failed during the initial connect or send of the message!
-
-  TAO_ORB_Core* orb_core (void) const;
-  // Accessor
-
-  CORBA::ORB_ptr servant_orb_ptr (void);
-  // This returns a duplicated ORB pointer.
-
-  CORBA::ORB_var &servant_orb_var (void);
-  // This returns the ORB var itself (generally for temporary use).
-
-  void servant_orb (CORBA::ORB_ptr orb);
-  // Accesor and mutator for the servant ORB.  Notice that the muatator
-  // assumes the ownership of the passed in ORB and the accesor does not
-  // return a copy of the orb since the accessing of the ORB is considered
-  // temporary.
-
-protected:
-  void put_params (CORBA_Environment &ACE_TRY_ENV,
-                   const TAO_Call_Data *info,
-                   TAO_GIOP_Invocation &call,
-                   void** args);
-  // Helper method to factor out common code in static oneway
-  // vs. twoway invocations.
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  void put_params (TAO_GIOP_Invocation &call,
-                   CORBA::NVList_ptr args,
-                   CORBA_Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
-  // Helper method to factor out common code in dynamic oneway
-  // vs. twoway invocations.
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-private:
-  TAO_Profile *set_profile_in_use_i (TAO_Profile *pfile);
-  // Makes a copy of the profile and frees the existing profile_in_use.
-  // NOT THREAD SAFE
-
-  void reset_first_locate_request (void);
-  // NON-THREAD-SAFE.
-  // reset the flag telling that the locate request should be used
-
-  void reset_base ();
-  // NON-THREAD-SAFE.  utility method which resets or initializes
-  // the base_profile list and forward flags.
-
-  void forward_back_one (void);
-  // NON-THREAD-SAFE.  utility method which unrolls (removes or pops)
-  // the top most forwarding profile list.
-
-  void reset_forward ();
-   // NOT THREAD-SAFE.  utility method which pops all forward profile
-   // lists and resets the forward_profiles_ pointer.
-
-  ~TAO_Stub (void);
-  // Destructor is to be called only through _decr_refcnt()
-
-  TAO_Profile *next_forward_profile (void);
-  // NON-THREAD-SAFE.  utility method for next_profile.
-
-private:
-  TAO_MProfile     base_profiles_;
-  // ordered list of profiles for this object.
-
-  TAO_MProfile     *forward_profiles_;
-  // The list of forwarding profiles.  This is actually iimplemented as a
-  // linked list of TAO_MProfile objects.
-
-  TAO_Profile *profile_in_use_;
-  // this is the profile that we are currently sending/receiving with
-
-  ACE_Lock* profile_lock_ptr_;
-  // Mutex to protect access to the forwarding profile
-
-  size_t profile_success_;
-  // Have we successfully talked to the forward profile yet?
-
-  ACE_SYNCH_MUTEX refcount_lock_;
-  // Mutex to protect reference count
-
-  CORBA::ULong refcount_;
-  // Number of outstanding references to this object.
-
-  CORBA::Boolean use_locate_request_;
-  // set if locate request should be used
-
-  CORBA::Boolean first_locate_request_;
-  // distinguishes the first from following calls
-
-  TAO_ORB_Core* orb_core_;
-  // The ORB
-
-  CORBA::ORB_var orb_;
-  // ORB required for reference counting.  This will help us keep the
-  // ORB around until the CORBA::Object we represent dies.
-
-  CORBA::ORB_var servant_orb_;
-  // If this stub refers to a collocated object then we need to hold on to
-  // the servant's ORB (which may be different from the client ORB) so that,
-  //   1. we know that the ORB will stay alive long enough, and,
-  //   2. we can search for the servant/POA's status starting from
-  //      the ORB's RootPOA.
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-  TAO_Policy_Manager_Impl* policies_;
-  // The policy overrides in this object, if nil then use the default
-  // policies.
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
-  // = Disallow copy constructor and assignment operator
-  ACE_UNIMPLEMENTED_FUNC (TAO_Stub (const TAO_Stub &))
-  ACE_UNIMPLEMENTED_FUNC (TAO_Stub &operator = (const TAO_Stub &))
-
-#if defined (__GNUG__)
-  // G++ (even 2.6.3) stupidly thinks instances can't be created.
-  // This de-warns.
-  friend class everyone_needs_a_friend;
-#endif /* __GNUG__ */
-};
-
-// Define a TAO_Stub auto_ptr class
-class TAO_Stub_Auto_Ptr
-{
-  // = TITLE
-  //     Implements the draft C++ standard auto_ptr abstraction.
-  //     This class allows one to work Stub Objects *Only*!
-public:
-  // = Initialization and termination methods
-  /* explicit */ TAO_Stub_Auto_Ptr (TAO_Stub *p = 0);
-  TAO_Stub_Auto_Ptr (TAO_Stub_Auto_Ptr &ap);
-  TAO_Stub_Auto_Ptr &operator= (TAO_Stub_Auto_Ptr &rhs);
-  ~TAO_Stub_Auto_Ptr (void);
-
-  // = Accessor methods.
-  TAO_Stub &operator *() const;
-  TAO_Stub *get (void) const;
-  TAO_Stub *release (void);
-  void reset (TAO_Stub *p = 0);
-  TAO_Stub *operator-> () const;
-
-protected:
-  TAO_Stub *p_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Stub.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_STUB_H */
diff --git a/TAO/tao/Stub.i b/TAO/tao/Stub.i
deleted file mode 100644
index f7cc43103d0..00000000000
--- a/TAO/tao/Stub.i
+++ /dev/null
@@ -1,349 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// @@ Get rid of profile specific stuff, it is now in it's own class and
-// file. fredk
-#include <tao/debug.h>
-
-ACE_INLINE TAO_Profile *
-TAO_Stub::set_profile_in_use_i (TAO_Profile *pfile)
-{
-  TAO_Profile *old = this->profile_in_use_;
-
-  // Since we are actively using this profile we dont want
-  // it to disappear, so increase the reference count by one!!
-  if (pfile && (pfile->_incr_refcnt () == 0))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                        "(%P|%t) unable to increment profile ref!\n"),
-                        0);
-    }
-
-  this->profile_in_use_ = pfile;
-
-  if (old)
-    old->_decr_refcnt ();
-
-  return this->profile_in_use_;
-}
-
-ACE_INLINE void
-TAO_Stub::reset_first_locate_request (void)
-{
-  first_locate_request_ = 1;
-}
-
-ACE_INLINE void
-TAO_Stub::reset_base (void)
-{
-  this->base_profiles_.rewind ();
-  reset_first_locate_request ();
-  profile_success_ = 0;
-
-  set_profile_in_use_i (base_profiles_.get_next ());
-}
-
-ACE_INLINE void
-TAO_Stub::forward_back_one (void)
-{
-  TAO_MProfile *from = forward_profiles_->forward_from ();
-
-  delete forward_profiles_;
-
-  // the current profile in this profile list is no
-  // longer being forwarded, so set the reference to zero.
-  if (from == &base_profiles_)
-    {
-      base_profiles_.get_current_profile ()->forward_to (0);
-      forward_profiles_ = 0;
-    }
-  else
-    {
-      from->get_current_profile ()->forward_to (0);
-      forward_profiles_ = from;
-    }
-
-}
-
-ACE_INLINE void
-TAO_Stub::reset_forward (void)
-{
-  while (this->forward_profiles_ != 0)
-    forward_back_one ();
-}
-
-ACE_INLINE void
-TAO_Stub::reset_profiles_i (void)
-{
-  reset_forward ();
-  reset_base ();
-}
-
-ACE_INLINE void
-TAO_Stub::reset_profiles (void)
-{
-  ACE_MT (ACE_GUARD (ACE_Lock,
-                     guard,
-                     *this->profile_lock_ptr_));
-  reset_profiles_i ();
-}
-
-ACE_INLINE
-TAO_Stub::~TAO_Stub (void)
-{
-  assert (this->refcount_ == 0);
-
-  if (forward_profiles_)
-    reset_profiles ();
-
-  if (this->profile_in_use_ != 0)
-    {
-      this->profile_in_use_->reset_hint ();
-      // decrease reference count on profile
-      this->profile_in_use_->_decr_refcnt ();
-      this->profile_in_use_ = 0;
-    }
-
-  if (this->profile_lock_ptr_)
-    delete this->profile_lock_ptr_;
-
-}
-
-ACE_INLINE TAO_Profile *
-TAO_Stub::profile_in_use (void)
-{
-  return this->profile_in_use_;
-}
-
-ACE_INLINE void
-TAO_Stub::use_locate_requests (CORBA::Boolean use_it)
-{
-  if (use_it)
-    {
-      this->first_locate_request_ = 1;
-      this->use_locate_request_ = 1;
-    }
-  else
-    {
-      // Don't use it.
-      this->first_locate_request_ = 0;
-      this->use_locate_request_ = 0;
-    }
-}
-
-ACE_INLINE TAO_MProfile *
-TAO_Stub::get_profiles (void)
-{
-  return new TAO_MProfile (base_profiles_);
-}
-
-ACE_INLINE TAO_Profile *
-TAO_Stub::next_forward_profile (void)
-{
-  TAO_Profile *pfile_next = 0;
-
-  while (this->forward_profiles_
-         && (pfile_next = forward_profiles_->get_next ()) == 0)
-    // that was the last profile.  Now we clean up our forward profiles.
-    // since we own the forward MProfiles, we must delete them when done.
-    forward_back_one ();
-
-  return pfile_next;
-}
-
-ACE_INLINE TAO_Profile *
-TAO_Stub::next_profile_i (void)
-{
-
-  TAO_Profile *pfile_next = 0;
-  if (forward_profiles_)
-    {
-      pfile_next = next_forward_profile ();
-      if (pfile_next == 0)
-        pfile_next = base_profiles_.get_next ();
-    }
-  else
-    pfile_next = base_profiles_.get_next ();
-
-  if (pfile_next == 0)
-    reset_base ();
-  else
-    set_profile_in_use_i (pfile_next);
-
-  return pfile_next;
-}
-
-ACE_INLINE TAO_Profile *
-TAO_Stub::next_profile (void)
-{
-
-  ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
-                            guard,
-                            *this->profile_lock_ptr_,
-                            0));
-  return next_profile_i ();
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_Stub::valid_forward_profile (void)
-{
-  return (profile_success_ && forward_profiles_);
-}
-
-ACE_INLINE void
-TAO_Stub::set_valid_profile (void)
-{
-  profile_success_ = 1;
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_Stub::valid_profile (void)
-{
-  return profile_success_;
-}
-
-ACE_INLINE TAO_Profile *
-TAO_Stub::set_base_profiles (const TAO_MProfile &mprofiles)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
-                            guard,
-                            *this->profile_lock_ptr_,
-                            0));
-
-  // first reset things so we start from scratch!
-  reset_forward ();
-  base_profiles_.set (mprofiles);
-  reset_base ();
-  return profile_in_use_;
-
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_Stub::next_profile_retry (void)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
-                            guard,
-                            *this->profile_lock_ptr_,
-                            0));
-
-  if (profile_success_ && forward_profiles_)
-    {
-      reset_profiles_i ();
-      return 1;
-    }
-  else if (next_profile_i ())
-    {
-      return 1;
-    }
-  else
-    {
-      reset_profiles_i ();
-      return 0;
-    }
-}
-
-ACE_INLINE const TAO_MProfile&
-TAO_Stub::get_base_profiles (void) const
-{
-  return this->base_profiles_;
-}
-
-ACE_INLINE TAO_ORB_Core*
-TAO_Stub::orb_core (void) const
-{
-  return this->orb_core_;
-}
-
-ACE_INLINE CORBA::ORB_var &
-TAO_Stub::servant_orb_var (void)
-{
-  // Simply pass back the ORB pointer for temporary use.
-  return this->servant_orb_;
-}
-
-ACE_INLINE CORBA::ORB_ptr
-TAO_Stub::servant_orb_ptr (void)
-{
-  // Simply pass back the ORB pointer for temporary use.
-  return CORBA::ORB::_duplicate (this->servant_orb_.in ());
-}
-
-ACE_INLINE void
-TAO_Stub::servant_orb (CORBA::ORB_ptr orb)
-{
-  this->servant_orb_ = CORBA::ORB::_duplicate (orb);
-}
-
-// Creator methods for TAO_Stub_Auto_Ptr (TAO_Stub Auto Pointer)
-ACE_INLINE
-TAO_Stub_Auto_Ptr::TAO_Stub_Auto_Ptr (TAO_Stub *p)
-  : p_ (p)
-{
-  ACE_TRACE ("TAO_Stub_Auto_Ptr::TAO_Stub_Auto_Ptr");
-}
-
-ACE_INLINE TAO_Stub *
-TAO_Stub_Auto_Ptr::get (void) const
-{
-  ACE_TRACE ("TAO_Stub_Auto_Ptr::get");
-  return this->p_;
-}
-
-ACE_INLINE TAO_Stub *
-TAO_Stub_Auto_Ptr::release (void)
-{
-  ACE_TRACE ("TAO_Stub_Auto_Ptr::release");
-  TAO_Stub *old = this->p_;
-  this->p_ = 0;
-  return old;
-}
-
-ACE_INLINE void
-TAO_Stub_Auto_Ptr::reset (TAO_Stub *p)
-{
-  ACE_TRACE ("TAO_Stub_Auto_Ptr::reset");
-  if (this->get () != p)
-    this->get ()->_decr_refcnt ();
-  this->p_ = p;
-}
-
-ACE_INLINE TAO_Stub *
-TAO_Stub_Auto_Ptr::operator-> () const
-{
-  ACE_TRACE ("auto_ptr::operator->");
-  return this->get ();
-}
-
-ACE_INLINE
-TAO_Stub_Auto_Ptr::TAO_Stub_Auto_Ptr (TAO_Stub_Auto_Ptr &rhs)
-  : p_ (rhs.release ())
-{
-  ACE_TRACE ("TAO_Stub_Auto_Ptr::TAO_Stub_Auto_Ptr");
-}
-
-ACE_INLINE TAO_Stub_Auto_Ptr &
-TAO_Stub_Auto_Ptr::operator= (TAO_Stub_Auto_Ptr &rhs)
-{
-  ACE_TRACE ("TAO_Stub_Auto_Ptr::operator=");
-  if (this != &rhs)
-    {
-      this->reset (rhs.release ());
-    }
-  return *this;
-}
-
-ACE_INLINE
-TAO_Stub_Auto_Ptr::~TAO_Stub_Auto_Ptr (void)
-{
-  ACE_TRACE ("TAO_Stub_Auto_Ptr::~TAO_Stub_Auto_Ptr");
-  this->get ()->_decr_refcnt ();
-}
-
-// Accessor methods to the underlying Stub Object
-
-ACE_INLINE TAO_Stub &
-TAO_Stub_Auto_Ptr::operator *() const
-{
-  ACE_TRACE ("TAO_Stub_Auto_Ptr::operator *()");
-  return *this->get ();
-}
diff --git a/TAO/tao/TAO.cpp b/TAO/tao/TAO.cpp
deleted file mode 100644
index 7c5b7bfcd31..00000000000
--- a/TAO/tao/TAO.cpp
+++ /dev/null
@@ -1,360 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tao
-//
-// = FILENAME
-//   tao_util.cpp
-//
-// = AUTHOR
-//    Sumedh Mungee <sumedh@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "tao/TAO.h"
-#include "tao/Environment.h"
-
-ACE_RCSID(tao, TAO, "$Id$")
-
-// constructor
-TAO_ORB_Manager::TAO_ORB_Manager (CORBA::ORB_ptr orb,
-                                  PortableServer::POA_ptr poa,
-                                  PortableServer::POAManager_ptr poa_manager)
-  : orb_ (orb),
-    poa_ (poa),
-    poa_manager_ (poa_manager)
-{
-}
-
-int
-TAO_ORB_Manager::init (int &argc,
-                       char **argv,
-                       CORBA::Environment &ACE_TRY_ENV)
-{
-  return this->init (argc,
-                     argv,
-                     0,
-                     ACE_TRY_ENV);
-}
-
-int
-TAO_ORB_Manager::init (int &argc,
-                       char **argv,
-                       const char *orb_name,
-                       CORBA::Environment &ACE_TRY_ENV)
-{
-  if (CORBA::is_nil (this->orb_.in ()))
-    {
-      this->orb_ = CORBA::ORB_init (argc,
-                                    argv,
-                                    orb_name,
-                                    ACE_TRY_ENV);
-      ACE_CHECK_RETURN (-1);
-    }
-
-  if (CORBA::is_nil (this->poa_.in ()))
-    {
-      // Get the POA from the ORB.
-      CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA);
-
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          -1);
-
-      // Get the POA object.
-      this->poa_ =
-        PortableServer::POA::_narrow (poa_object.in (),
-                                      ACE_TRY_ENV);
-
-      ACE_CHECK_RETURN (-1);
-    }
-
-  if (CORBA::is_nil (this->poa_manager_.in ()))
-    {
-      // Get the POA_Manager.
-      this->poa_manager_ =
-        this->poa_->the_POAManager (ACE_TRY_ENV);
-
-      ACE_CHECK_RETURN (-1);
-    }
-
-  return 0;
-}
-
-int
-TAO_ORB_Manager::init_child_poa (int& argc,
-                                 char **argv,
-                                 const char *poa_name,
-                                 CORBA_Environment &ACE_TRY_ENV)
-{
-  return this->init_child_poa (argc,
-                               argv,
-                               poa_name,
-                               0,
-                               ACE_TRY_ENV);
-}
-
-int
-TAO_ORB_Manager::init_child_poa (int& argc,
-                                 char **argv,
-                                 const char *poa_name,
-                                 const char *orb_name,
-                                 CORBA_Environment &ACE_TRY_ENV)
-{
-  int init_result;
-
-  // check to see if root poa has to be created.
-  init_result = this->init (argc,
-                            argv,
-                            orb_name,
-                            ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  if (init_result == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       " (%P|%t) Error in init.\n"),
-                      -1);
-
-  // Create the default policies - user-supplied ID, and persistent
-  // objects.
-  CORBA::PolicyList policies (2);
-  policies.length (2);
-
-  // Id Assignment policy
-  policies[0] =
-    this->poa_->create_id_assignment_policy (PortableServer::USER_ID,
-                                             ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  // Lifespan policy
-  policies[1] =
-    this->poa_->create_lifespan_policy (PortableServer::PERSISTENT,
-                                        ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  // We use a different POA, otherwise the user would have to change
-  // the object key each time it invokes the server.
-
-  this->child_poa_ =
-    this->poa_->create_POA (poa_name,
-                            this->poa_manager_.in (),
-                            policies,
-                            ACE_TRY_ENV);
-  // Warning!  If create_POA fails, then the policies won't be
-  // destroyed and there will be hell to pay in memory leaks!
-  ACE_CHECK_RETURN (-1);
-
-  // Creation of the new POAs over, so destroy the Policy_ptr's.
-  for (CORBA::ULong i = 0;
-       i < policies.length ();
-       ++i)
-    {
-      CORBA::Policy_ptr policy = policies[i];
-      policy->destroy (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (-1);
-    }
-
-  return 0;
-}
-
-// Activate POA manager.
-
-int
-TAO_ORB_Manager::activate_poa_manager (CORBA_Environment &ACE_TRY_ENV)
-{
-  this->poa_manager_->activate (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-  return 0;
-}
-
-// Activate servant in the POA.
-
-CORBA::String
-TAO_ORB_Manager::activate (PortableServer::Servant servant,
-                           CORBA_Environment &ACE_TRY_ENV)
-{
-  PortableServer::ObjectId_var id =
-    this->poa_->activate_object (servant,
-                                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Object_var obj =
-    this->poa_->id_to_reference (id.in (),
-                                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::String str =
-    this->orb_->object_to_string (obj.in (),
-                                  ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return str;
-}
-
-void
-TAO_ORB_Manager::deactivate (const char *id,
-                             CORBA_Environment &ACE_TRY_ENV)
-{
-  CORBA::Object_var object =
-    this->orb_->string_to_object (id,
-                                  ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::ObjectId_var object_id = this->poa_->reference_to_id (object.in (),
-                                                                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->poa_->deactivate_object (object_id.in (),
-                                 ACE_TRY_ENV);
-}
-
-// Activate the object with the object_name under the child POA.
-
-CORBA::String
-TAO_ORB_Manager::activate_under_child_poa (const char* object_name,
-                                           PortableServer::Servant servant,
-                                           CORBA_Environment& ACE_TRY_ENV)
-{
-  if (object_name == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "\n(%P|%t) TAO_ORB_Manager::register: "
-                       "object_name is null!"),
-                      0);
-
-  PortableServer::ObjectId_var id =
-    PortableServer::string_to_ObjectId (object_name);
-
-  this->child_poa_->activate_object_with_id (id.in (),
-                                             servant,
-                                             ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Object_var obj =
-    this->child_poa_->id_to_reference (id.in (),
-                                       ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::String str =
-    this->orb_->object_to_string (obj.in (),
-                                  ACE_TRY_ENV);
-
-  ACE_CHECK_RETURN (0);
-
-  return str;
-}
-
-void
-TAO_ORB_Manager::deactivate_under_child_poa (const char *id,
-                                             CORBA_Environment &ACE_TRY_ENV)
-{
-  CORBA::Object_var object =
-    this->orb_->string_to_object (id,
-                                  ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::ObjectId_var object_id = this->child_poa_->reference_to_id (object.in (),
-                                                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->child_poa_->deactivate_object (object_id.in (),
-                                       ACE_TRY_ENV);
-}
-
-// Enter the ORB event loop.
-
-int
-TAO_ORB_Manager::run (CORBA_Environment &ACE_TRY_ENV,
-                      ACE_Time_Value *tv)
-{
-  this->poa_manager_->activate (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  if (this->orb_->run (tv) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) TAO_ORB_Manager %p\n",
-                       "run"),
-                      -1);
-  return 0;
-}
-
-int
-TAO_ORB_Manager::run (ACE_Time_Value &tv,
-                      CORBA_Environment &ACE_TRY_ENV)
-{
-  this->poa_manager_->activate (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  if (this->orb_->run (tv) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) TAO_ORB_Manager %p\n",
-                       "run"),
-                      -1);
-  return 0;
-}
-
-int
-TAO_ORB_Manager::run (CORBA_Environment &ACE_TRY_ENV)
-{
-  this->poa_manager_->activate (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  if (this->orb_->run () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) TAO_ORB_Manager %p\n",
-                       "run"),
-                      -1);
-  return 0;
-}
-
-// Return the corba orb reference.
-
-CORBA::ORB_ptr
-TAO_ORB_Manager::orb (void)
-{
-  return CORBA_ORB::_duplicate (this->orb_.in ());
-}
-
-// Return the root POA reference
-PortableServer::POA_ptr
-TAO_ORB_Manager::root_poa (void)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-// Return the child POA reference
-PortableServer::POA_ptr
-TAO_ORB_Manager::child_poa (void)
-{
-  return PortableServer::POA::_duplicate (this->child_poa_.in ());
-}
-
-PortableServer::POAManager_ptr
-TAO_ORB_Manager::poa_manager (void)
-{
-  return PortableServer::POAManager::_duplicate (this->poa_manager_.in ());
-}
-
-// Destructor.
-
-TAO_ORB_Manager::~TAO_ORB_Manager (void)
-{
-  ACE_TRY_NEW_ENV
-    {
-      if (!CORBA::is_nil (this->poa_.in ()))
-        {
-          this->poa_->destroy (1,
-                               1,
-                               ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      // ignore any exceptions..
-    }
-  ACE_ENDTRY;
-}
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
deleted file mode 100644
index 0c3b29ec0af..00000000000
--- a/TAO/tao/TAO.dsp
+++ /dev/null
@@ -1,2963 +0,0 @@
-# Microsoft Developer Studio Project File - Name="TAO DLL" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

-# TARGTYPE "Win32 (ALPHA) Dynamic-Link Library" 0x0602

-

-CFG=TAO DLL - Win32 MFC Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "TAO.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "TAO.mak" CFG="TAO DLL - Win32 MFC Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "TAO DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "TAO DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "TAO DLL - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")

-!MESSAGE "TAO DLL - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")

-!MESSAGE "TAO DLL - Win32 MFC Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "TAO DLL - Win32 MFC Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath "Desktop"

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Release"

-# PROP BASE Intermediate_Dir ".\Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir ".\DLL\Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c

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

-# SUBTRACT CPP /YX

-MTL=midl.exe

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

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

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386

-# ADD LINK32 ace.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\bin\TAO.dll" /libpath:"..\..\ace"

-# SUBTRACT LINK32 /incremental:yes

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Debug"

-# PROP BASE Intermediate_Dir ".\Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "DLL\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c

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

-# SUBTRACT CPP /YX

-MTL=midl.exe

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

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

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386

-# ADD LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\bin\TAOd.dll" /libpath:"..\..\ace"

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /Gt0 /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD nologo MT Gt0 W3 GX O2 I "../../" /c

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

-MTL=midl.exe

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /machine:ALPHA /out:"..\..\bin\TAO.dll" /libpath:"..\..\ace"

-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /machine:ALPHA /out:"..\..\bin\TAO.dll" /libpath:"..\..\ace"

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /Gt0 /I "../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /MTd nologo Gt0 W3 GX Zi Od Gy I "../../" /c

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

-MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:ALPHA /out:"..\..\bin\TAOd.dll" /libpath:"..\..\ace"

-# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:ALPHA /out:"..\..\bin\TAOd.dll" /libpath:"..\..\ace"

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "TAO_DLL___Win32_MFC_Debug"

-# PROP BASE Intermediate_Dir "TAO_DLL___Win32_MFC_Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "DLL\MFC_Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

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

-# SUBTRACT BASE CPP /YX

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

-# SUBTRACT CPP /YX

-MTL=midl.exe

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

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

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\bin\TAOd.dll" /libpath:"..\..\ace"

-# ADD LINK32 acemfcd.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\bin\TAOmfcd.dll" /libpath:"..\..\ace"

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "TAO_DLL___Win32_MFC_Release"

-# PROP BASE Intermediate_Dir "TAO_DLL___Win32_MFC_Release"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "DLL\MFC_Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

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

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /I "../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /D ACE_HAS_MFC=1 /D ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER=1 /FD /c

-# SUBTRACT CPP /YX

-MTL=midl.exe

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

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

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 ace.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\bin\TAO.dll" /libpath:"..\..\ace"

-# SUBTRACT BASE LINK32 /incremental:yes

-# ADD LINK32 acemfc.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\bin\TAOmfc.dll" /libpath:"..\..\ace"

-# SUBTRACT LINK32 /incremental:yes

-

-!ENDIF 

-

-# Begin Target

-

-# Name "TAO DLL - Win32 Release"

-# Name "TAO DLL - Win32 Debug"

-# Name "TAO DLL - Win32 Alpha Release"

-# Name "TAO DLL - Win32 Alpha Debug"

-# Name "TAO DLL - Win32 MFC Debug"

-# Name "TAO DLL - Win32 MFC Release"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

-# Begin Source File

-

-SOURCE=.\Acceptor_Registry.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Active_Object_Map.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Any.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\append.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Asynch_Invocation.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\CDR.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\CDR_Interpreter.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Client_Strategy_Factory.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Connector_Registry.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Context.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\CONV_FRAMEC.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\CONV_FRAMES.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\corbafwd.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\CurrentC.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\CurrentS.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\debug.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\decode.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\deep_free.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\default_client.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\default_resource.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\default_server.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\DomainC.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\DomainS.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\DynAny_i.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\DynAnyC.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\DynAnyS.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\DynArray_i.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\DynEnum_i.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\DynSequence_i.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\DynStruct_i.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\DynUnion_i.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\encode.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Environment.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Exception.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Forwarding_Servant.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\GIOP.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\GIOP_Server_Request.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_Acceptor.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_Connect.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_Connector.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_Factory.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_Profile.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_Transport.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\InconsistentTypeCodeC.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Invocation.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\IOPC.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\IOPS.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\IOR_LookupTable.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\IORC.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\IORManipulation.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\IORS.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Key_Adapters.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Managed_Types.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Marshal.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Messaging_Policy_i.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\MessagingC.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\MessagingS.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\MProfile.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\NVList.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Object.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Object_Adapter.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Object_KeyC.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\ObjectIDList.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Operation_Table.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\ORB.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\ORB_Core.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\params.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Pluggable.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\POA.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\POAC.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\POAManager.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\POAS.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Policy_Manager.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\PolicyC.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\PolicyS.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\PollableC.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\PollableS.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Principal.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Protocol_Factory.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Reply_Dispatcher.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Request.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Resource_Factory.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Sequence.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Servant_Base.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Server_Request.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Server_Strategy_Factory.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Services.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\skip.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Stub.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Tagged_Components.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\TAO.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\TAO_Internal.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\TimeBaseC.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\TimeBaseS.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Transport_Mux_Strategy.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Typecode.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Typecode_Constants.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Acceptor.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Connect.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Connector.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Factory.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Profile.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Transport.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Union.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueBase.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueFactory.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueFactory_Map.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Wait_Strategy.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\WrongTransactionC.cpp

-

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

-

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

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

-# Begin Source File

-

-SOURCE=.\Acceptor_Registry.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Active_Object_Map.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\any.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\arg_shifter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Asynch_Invocation.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\cdr.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CDR_Interpreter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Client_Strategy_Factory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Connector_Registry.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Context.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CONV_FRAMEC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CONV_FRAMES.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\corba.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\corbafwd.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CurrentC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\debug.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\default_client.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\default_resource.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\default_server.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DomainC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DomainS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DynAny_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DynAnyC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DynArray_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DynEnum_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DynSequence_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DynStruct_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DynUnion_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Environment.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Exception.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Forwarding_Servant.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\giop.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\GIOP_Server_Request.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_Acceptor.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_Connect.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_Connector.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_Factory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_Profile.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_Transport.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\InconsistentTypeCodeC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Invocation.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IOPC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IOPS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IOR_LookupTable.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IORC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IORManipulation.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IORS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Managed_Types.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\marshal.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Messaging_Policy_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\MessagingC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\MessagingS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\MProfile.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\nvlist.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\object.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Object_Adapter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Object_KeyC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ObjectIDList.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Operation_Table.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\orb.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\orb_core.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ORB_Strategies_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\orbconf.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\params.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Pluggable.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\poa.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\POA_CORBA.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\poa_macros.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\poa_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\poaC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\POAManager.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\poaS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Policy_Manager.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\PolicyC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\PollableC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\PollableS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Principal.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Protocol_Factory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Reply_Dispatcher.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\request.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Resource_Factory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sequence.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Sequence_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\servant_base.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Server_Request.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Server_Strategy_Factory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Services.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\singletons.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\stub.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Tagged_Components.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\TAO.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\TAO_Internal.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Timeprobe.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Transport_Mux_Strategy.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\typecode.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Acceptor.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Connect.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Connector.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Factory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Profile.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Transport.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueBase.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueFactory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueFactory_Map.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\varout.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Wait_Strategy.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\WrongTransactionC.h

-# End Source File

-# End Group

-# Begin Group "Inline Files"

-

-# PROP Default_Filter "*.i"

-# Begin Source File

-

-SOURCE=.\Acceptor_Registry.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Active_Object_Map.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\any.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\cdr.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Context.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\CONV_FRAMEC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\CONV_FRAMES.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\corbafwd.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\default_client.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\default_resource.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\default_server.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\DomainC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\DomainS_T.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\DynAnyC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Environment.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Exception.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\giop.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\GIOP_Server_Request.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_Connect.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_ORB.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\IOPC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\IOPS.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Managed_Types.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\marshal.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Messaging_Policy_i.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\MessagingC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\MessagingS.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\NVList.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\object.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Object_KeyC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\ObjectIDList.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\ORB.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\orb_core.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\ORB_Strategies_T.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\params.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\poaC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\POAManager.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\poaS.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Policy_Manager.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\PolicyC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Request.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\sequence.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Sequence_T.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Server_Request.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Services.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\stub.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Tagged_Components.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\TAO_Internal.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Timeprobe.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\typecode.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Connect.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Profile.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueBase.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueFactory.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueFactory_Map.i

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tao/TAO.dsw b/TAO/tao/TAO.dsw
deleted file mode 100644
index 50ef1a477e4..00000000000
--- a/TAO/tao/TAO.dsw
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "TAO"=.\TAO.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "TAO_Static"=.\TAO_Static.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/tao/TAO.h b/TAO/tao/TAO.h
deleted file mode 100644
index de7782f00ab..00000000000
--- a/TAO/tao/TAO.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tao
-//
-// = FILENAME
-//   tao.h
-//
-// = DESCRIPTION
-//   Externally visible TAO extensions.
-//
-// = AUTHOR
-//    Chris Cleeland
-//
-// ============================================================================
-
-#ifndef TAO_H
-#define TAO_H
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/POAC.h"
-#include "tao/ORB.h"
-
-class TAO_Export TAO_ORB_Manager
-{
-  // = TITLE
-  //     Helper class for simple ORB/POA initialization and
-  //     registering servants with the POA.
-  //
-  // = DESCRIPTION
-  //     This class is a TAO extension that makes it easier to write
-  //     CORBA applications.  It's just a wrapper and doesn't do
-  //     anything special within the ORB itself.
-public:
-  // = Initialization and termination methods.
-  TAO_ORB_Manager (CORBA::ORB_ptr orb = 0,
-                   PortableServer::POA_ptr poa = 0,
-                   PortableServer::POAManager_ptr poa_manager = 0);
-  // Constructor.
-
-  ~TAO_ORB_Manager (void);
-  // Destructor.
-
-  int init (int &argc,
-            char *argv[],
-            CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // Initialize the ORB/root POA, using the supplied command line
-  // arguments or the default ORB components.  Returns -1 on failure.
-
-  int init (int &argc,
-            char *argv[],
-            const char *orb_name,
-            CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // Initialize the ORB/root POA, using the supplied command line
-  // arguments or the default ORB components.  Returns -1 on failure.
-
-  int init_child_poa (int &argc,
-                      char *argv[],
-                      const char *poa_name,
-                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // Creates a child poa under the root poa with PERSISTENT and
-  // USER_ID policies.  Call this if you want a <child_poa> with the
-  // above policies, otherwise call init.  Returns -1 on failure.
-
-  int init_child_poa (int &argc,
-                      char *argv[],
-                      const char *poa_name,
-                      const char *orb_name,
-                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // Creates a child poa under the root poa with PERSISTENT and
-  // USER_ID policies.  Call this if you want a <child_poa> with the
-  // above policies, otherwise call init.  Returns -1 on failure.
-
-  int activate_poa_manager (CORBA_Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-  //  Put POA manager into the <Active> state, so that incoming corba
-  //  requests are processed.  This method is useful for clients,
-  //  which are not going to enter "orb->run" loop, yet may want to
-  //  service incoming requests while waiting for a result of CORBA
-  //  call on a server.  Returns -1 on failure.
-
-  CORBA::String activate (PortableServer::Servant servant,
-                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // Activate <servant>, using the POA <activate_object> call.  Users
-  // can call this method multiple times to activate multiple objects.
-  // Returns 0 on failure.
-
-  void deactivate (const char *id,
-                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // Deactivate object in RootPOA.
-
-  CORBA::String activate_under_child_poa (const char *servant_name,
-                                          PortableServer::Servant servant,
-                                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // Precondition: init_child_poa has been called.  Activate <servant>
-  // using the POA <activate_object_with_id> created from the string
-  // servant_name. Users should call this to activate objects under
-  // the child_poa.
-
-  void deactivate_under_child_poa (const char *id,
-                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // Deactivate object in child POA.
-
-  int run (CORBA_Environment &ACE_TRY_ENV,
-           ACE_Time_Value *tv);
-  int run (ACE_Time_Value &tv,
-           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  int run (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // Run the ORB event loop with the specified <tv> time value Returns
-  // -1 on failure.
-
-  CORBA::ORB_ptr orb (void);
-  // Accessor which returns the ORB pointer.  Following the normal
-  // CORBA memory management rules of return values from functions,
-  // this function duplicates the orb return value before returning
-  // it.
-
-  PortableServer::POA_ptr root_poa (void);
-  // Accessor which returns the root poa. Following the normal CORBA
-  // memory management rules of return values from functions, this
-  // function duplicates the poa return value before returning it.
-
-  PortableServer::POA_ptr child_poa (void);
-  // Accessor which returns the child poa. Following the normal CORBA
-  // memory management rules of return values from functions, this
-  // function duplicates the poa return value before returning it.
-
-  PortableServer::POAManager_ptr poa_manager (void);
-  // Accessor which returns the poa manager. Following the normal
-  // CORBA memory management rules of return values from functions,
-  // this function duplicates the poa manager return value before
-  // returning it.
-
-protected:
-  CORBA::ORB_var orb_;
-  // The ORB.
-
-  PortableServer::POA_var poa_;
-  // The POA for this ORB.
-
-  PortableServer::POA_var child_poa_;
-  // Child poa under the root POA.
-
-  PortableServer::POAManager_var poa_manager_;
-  // The POA manager of poa_.
-};
-
-class TAO_Export TAO
-{
-  // = TITLE
-  //   Defines a namespace for externally visible TAO extensions.
-public:
-  // From Object_KeyC.h
-  typedef TAO_ObjectKey ObjectKey;
-  typedef TAO_ObjectKey_var ObjectKey_var;
-  typedef TAO_ObjectKey_out ObjectKey_out;
-
-  typedef TAO_ORB_Manager ORB_Manager;
-
-  ACE_CLASS_IS_NAMESPACE (TAO);
-};
-
-#endif /* TAO_H */
diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp
deleted file mode 100644
index c7cb3700372..00000000000
--- a/TAO/tao/TAO_Internal.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-// $Id$
-
-#include "tao/TAO_Internal.h"
-#include "ace/Service_Config.h"
-#include "ace/Service_Repository.h"
-#include "ace/Object_Manager.h"
-#include "tao/default_server.h"
-#include "tao/default_client.h"
-#include "tao/default_resource.h"
-#include "tao/IIOP_Factory.h"
-#include "tao/UIOP_Factory.h"
-
-ACE_RCSID(tao, TAO_Internal, "$Id$")
-
-int TAO_Internal::service_open_count_ = 0;
-#if defined (TAO_PLATFORM_SVC_CONF_FILE_NOTSUP)
-const char *TAO_Internal::resource_factory_args_ = TAO_DEFAULT_RESOURCE_FACTORY_ARGS;
-const char *TAO_Internal::server_strategy_args_ = TAO_DEFAULT_SERVER_STRATEGY_FACTORY_ARGS;
-const char *TAO_Internal::client_strategy_args_ = TAO_DEFAULT_CLIENT_STRATEGY_FACTORY_ARGS;
-#else
-const char *TAO_Internal::resource_factory_args_ = 0;
-const char *TAO_Internal::server_strategy_args_ = 0;
-const char *TAO_Internal::client_strategy_args_ = 0;
-#endif /* TAO_PLATFORM_SVC_CONF_FILE_NOTSUP */
-
-void
-TAO_Internal::default_svc_conf_entries (const char *resource_factory_args,
-                                        const char *server_strategy_args,
-                                        const char *client_strategy_args)
-{
-  TAO_Internal::resource_factory_args_ = resource_factory_args;
-  TAO_Internal::server_strategy_args_ = server_strategy_args;
-  TAO_Internal::client_strategy_args_ = client_strategy_args;
-}
-
-int
-TAO_Internal::open_services (int &argc,
-                             char **argv,
-                             int ignore_default_svc_conf_file,
-                             int skip_service_config_open)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, *ACE_Static_Object_Lock::instance (), -1));
-#if defined (TAO_PLATFORM_SVC_CONF_FILE_NOTSUP)
-  ignore_default_svc_conf_file = 1;
-#endif /* TAO_PLATFORM_SVC_CONF_FILE_NOTSUP */
-
-  if (TAO_Internal::service_open_count_++ == 0)
-    {
-      ACE_Service_Config::static_svcs ()->
-        insert (&ace_svc_desc_TAO_Default_Resource_Factory);
-      ACE_Service_Config::static_svcs ()->
-        insert (&ace_svc_desc_TAO_Default_Client_Strategy_Factory);
-      ACE_Service_Config::static_svcs ()->
-        insert (&ace_svc_desc_TAO_Default_Server_Strategy_Factory);
-      ACE_Service_Config::static_svcs ()->
-        insert (&ace_svc_desc_TAO_IIOP_Protocol_Factory);
-#if !defined(ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-      ACE_Service_Config::static_svcs ()->
-        insert (&ace_svc_desc_TAO_UIOP_Protocol_Factory);
-#endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
-      // add descriptor to list of static objects.
-
-      int result = 0;
-
-      if (skip_service_config_open == 0)
-        result = ACE_Service_Config::open (argc, argv,
-                                           ACE_DEFAULT_LOGGER_KEY,
-                                           0, // Don't ignore static services.
-                                           ignore_default_svc_conf_file);
-
-      // @@ What the heck do these things do and do we need to avoid
-      // calling them if we're not invoking the svc.conf file?
-      if (TAO_Internal::resource_factory_args_ != 0)
-        ACE_Service_Config::process_directive (TAO_Internal::resource_factory_args_);
-      if (TAO_Internal::client_strategy_args_ != 0)
-        ACE_Service_Config::process_directive (TAO_Internal::client_strategy_args_);
-      if (TAO_Internal::server_strategy_args_ != 0)
-        ACE_Service_Config::process_directive (TAO_Internal::server_strategy_args_);
-
-      return result;
-    }
-  else
-    return 0;
-}
-
-TAO_Internal::TAO_Internal (void)
-{
-}
-
-int
-TAO_Internal::close_services (void)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard,
-                            *ACE_Static_Object_Lock::instance (), -1));
-  --service_open_count_;
-  return 0;
-}
diff --git a/TAO/tao/TAO_Internal.h b/TAO/tao/TAO_Internal.h
deleted file mode 100644
index 672df0ec940..00000000000
--- a/TAO/tao/TAO_Internal.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    TAO_Internal.h
-//
-// = DESCRIPTION
-//    Structures and methods completely internal to TAO.
-//
-// = AUTHOR
-//    Chris Cleeland
-//
-// ============================================================================
-
-#ifndef TAO_INTERNAL_H
-#define TAO_INTERNAL_H
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_Export TAO_Internal
-  // = TITLE
-  //    This class encapsulates some private behaviors and global data
-  //    structures used internal to TAO.  No application should EVER
-  //    see this class.
-{
-public:
-  static int open_services (int &argc,
-                            char **argv,
-                            int ignore_default_svc_conf_file = 0,
-                            int skip_service_config_open = 0);
-  // Initialize the ACE Service Configurator.  This is a one-shot
-  // method, i.e., it can be called multiple times but it will only do
-  // its work once.  It does, however, track the number of times it's
-  // called (see <open_services>).  It is fully thread-safe.  Return 0
-  // if successful, -1 with errno set if failure.  You can provide
-  // your program a set of default <svc.conf> entries by setting
-  // <ignore_default_svc_conf_file> to non-zero and use
-  // <default_svc_conf_entries> before calling <open_services>.  In
-  // addition, you can <skip_service_config_open> altogether, which is
-  // important if the ORB is linked in via the
-  // <ACE_Service_Configuator>, which is non-reentrant.
-
-  static int close_services (void);
-  // The complement to <open_services>, this will perform appropriate
-  // ACE Service Configurator closure operations.  It should be called
-  // as many times as <open_services>, and will only actually close
-  // things down on the last call.  It is fully thread-safe.  Return 0
-  // if successful, -1 with errno set if failure.
-
-  static void default_svc_conf_entries (const char *resource_factory_args,
-                                        const char *server_strategy_args,
-                                        const char *client_strategy_args);
-  // Set default svc.conf content.  This call has no effect if This
-  // function must be called before first ORB initialization.
-
-private:
-  TAO_Internal (void);
-  // Private CTOR prevents this class from being instantiated.
-
-  static int service_open_count_;
-  // Number of times <open_services> has been called.  Incremented by
-  // <open_services>, and decremented by <close_services>.  Access to
-  // this is protected via the <ACE_Static_Object_Lock>.
-
-  static const char *resource_factory_args_;
-  static const char *server_strategy_args_;
-  static const char *client_strategy_args_;
-};
-
-#endif /* TAO_INTERNAL_H */
diff --git a/TAO/tao/TAO_Static.dsp b/TAO/tao/TAO_Static.dsp
deleted file mode 100644
index 1298298042c..00000000000
--- a/TAO/tao/TAO_Static.dsp
+++ /dev/null
@@ -1,1181 +0,0 @@
-# Microsoft Developer Studio Project File - Name="TAO LIB" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Static Library" 0x0104

-

-CFG=TAO LIB - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "TAO_Static.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "TAO_Static.mak" CFG="TAO LIB - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "TAO LIB - Win32 Release" (based on "Win32 (x86) Static Library")

-!MESSAGE "TAO LIB - Win32 Debug" (based on "Win32 (x86) Static Library")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath "Desktop"

-CPP=cl.exe

-

-!IF  "$(CFG)" == "TAO LIB - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "TAO_Stat"

-# PROP BASE Intermediate_Dir "TAO_Stat"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "LIB\Release"

-# PROP Target_Dir ""

-RSC=rc.exe

-# ADD BASE RSC /l 0x409

-# ADD RSC /l 0x409

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /I "../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D "ACE_NO_INLINE" /FD /c

-# SUBTRACT CPP /YX

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"TAOs.lib"

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "TAO_Sta0"

-# PROP BASE Intermediate_Dir "TAO_Sta0"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "LIB\Debug"

-# PROP Target_Dir ""

-RSC=rc.exe

-# ADD BASE RSC /l 0x409

-# ADD RSC /l 0x409

-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../" /I "../" /D TAO_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /YX /FD /c

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"TAOsd.lib"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "TAO LIB - Win32 Release"

-# Name "TAO LIB - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

-# Begin Source File

-

-SOURCE=.\Acceptor_Registry.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Active_Object_Map.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Any.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\append.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Asynch_Invocation.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CDR.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CDR_Interpreter.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Client_Strategy_Factory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Connector_Registry.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Context.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CONV_FRAMEC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CONV_FRAMES.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\corbafwd.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CurrentC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CurrentS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\debug.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\decode.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\deep_free.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\default_client.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\default_resource.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\default_server.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\DomainC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\DomainS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\DynAny_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\DynAnyC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\DynAnyS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\DynArray_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\DynEnum_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\DynSequence_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\DynStruct_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\DynUnion_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\encode.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Environment.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Exception.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Forwarding_Servant.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\GIOP.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\GIOP_Server_Request.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_Acceptor.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_Connect.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_Connector.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_Factory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_Profile.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_Transport.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\InconsistentTypeCodeC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Invocation.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\IOPC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\IOPS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\IOR_LookupTable.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\IORC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\IORManipulation.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\IORS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Key_Adapters.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Managed_Types.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Marshal.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Messaging_Policy_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\MessagingC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\MessagingS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\MProfile.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\NVList.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Object.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Object_Adapter.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Object_KeyC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ObjectIDList.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Operation_Table.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ORB.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ORB_Core.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\params.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Pluggable.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\POA.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\POAC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\POAManager.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\POAS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Policy_Manager.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\PolicyC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\PolicyS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\PollableC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\PollableS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Principal.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Protocol_Factory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Reply_Dispatcher.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Request.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Resource_Factory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Sequence.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Servant_Base.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Server_Request.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Server_Strategy_Factory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Services.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\skip.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Stub.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Tagged_Components.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\TAO.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\TAO_Internal.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\TimeBaseC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\TimeBaseS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Transport_Mux_Strategy.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Typecode.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Typecode_Constants.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Acceptor.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Connect.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Connector.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Factory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Profile.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Transport.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Union.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueBase.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueFactory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueFactory_Map.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Wait_Strategy.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\WrongTransactionC.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

-# Begin Source File

-

-SOURCE=.\Acceptor_Registry.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Active_Object_Map.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\any.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\arg_shifter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Asynch_Invocation.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\cdr.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CDR_Interpreter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Client_Strategy_Factory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Connector_Registry.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Context.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CONV_FRAMEC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CONV_FRAMES.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\corba.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\corbafwd.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CurrentC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\debug.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\default_client.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\default_resource.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\default_server.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DomainC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DomainS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DynAny_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DynAnyC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DynArray_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DynEnum_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DynSequence_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DynStruct_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DynUnion_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Environment.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Exception.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Forwarding_Servant.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\giop.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\GIOP_Server_Request.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_Acceptor.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_Connect.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_Connector.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_Factory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_Profile.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_Transport.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\InconsistentTypeCodeC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Invocation.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IOPC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IOPS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IOR_LookupTable.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IORC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IORManipulation.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IORS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Managed_Types.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\marshal.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Messaging_Policy_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\MessagingC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\MessagingS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\MProfile.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\nvlist.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\object.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Object_Adapter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Object_KeyC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ObjectIDList.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Operation_Table.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\orb.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\orb_core.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ORB_Strategies_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\orbconf.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\params.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Pluggable.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\poa.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\POA_CORBA.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\poa_macros.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\poa_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\poaC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\POAManager.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\poaS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Policy_Manager.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\PolicyC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\PollableC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\PollableS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Principal.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Protocol_Factory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Reply_Dispatcher.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\request.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Resource_Factory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sequence.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Sequence_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\servant_base.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Server_Request.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Server_Strategy_Factory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Services.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\singletons.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\stub.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Tagged_Components.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\TAO.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\TAO_Internal.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Timeprobe.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Transport_Mux_Strategy.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\typecode.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Acceptor.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Connect.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Connector.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Factory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Profile.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Transport.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueBase.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueFactory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueFactory_Map.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\varout.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Wait_Strategy.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\WrongTransactionC.h

-# End Source File

-# End Group

-# Begin Group "Inline Files"

-

-# PROP Default_Filter "*.i"

-# Begin Source File

-

-SOURCE=.\Acceptor_Registry.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Active_Object_Map.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\any.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\cdr.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Context.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\CONV_FRAMEC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\CONV_FRAMES.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\corbafwd.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\default_client.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\default_resource.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\default_server.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\DomainC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\DomainS_T.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\DynAnyC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Environment.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Exception.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\giop.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\GIOP_Server_Request.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_Connect.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_ORB.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\IOPC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\IOPS.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Managed_Types.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\marshal.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Messaging_Policy_i.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\MessagingC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\MessagingS.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\NVList.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\object.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Object_KeyC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\ObjectIDList.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\ORB.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\orb_core.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\ORB_Strategies_T.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\params.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\poaC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\POAManager.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\poaS.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Policy_Manager.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\PolicyC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Request.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\sequence.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Sequence_T.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Server_Request.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Services.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\stub.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Tagged_Components.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\TAO_Internal.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Timeprobe.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\typecode.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Connect.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\UIOP_Profile.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueBase.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueFactory.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueFactory_Map.i

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tao/Tagged_Components.cpp b/TAO/tao/Tagged_Components.cpp
deleted file mode 100644
index 1f69321af74..00000000000
--- a/TAO/tao/Tagged_Components.cpp
+++ /dev/null
@@ -1,293 +0,0 @@
-// $Id$
-
-#include "tao/Tagged_Components.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Tagged_Components.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, Tagged_Components, "$Id$")
-
-
-void
-TAO_Tagged_Components::set_orb_type (CORBA::ULong orb_type)
-{
-  this->orb_type_ = orb_type;
-  this->orb_type_set_ = 1;
-
-  TAO_OutputCDR cdr;
-  cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER);
-  cdr << this->orb_type_;
-
-  this->set_component_i (IOP::TAG_ORB_TYPE, cdr);
-}
-
-void
-TAO_Tagged_Components::set_code_sets (
-    const CONV_FRAME::CodeSetComponentInfo &ci)
-{
-  this->code_sets_ = ci;
-  this->code_sets_set_ = 1;
-
-  TAO_OutputCDR cdr;
-  cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER);
-  cdr << this->code_sets_;
-
-  this->set_component_i (IOP::TAG_CODE_SETS, cdr);
-}
-
-void
-TAO_Tagged_Components::set_code_sets (CONV_FRAME::CodeSetComponentInfo &ci)
-{
-  this->set_code_sets_i (this->code_sets_.ForCharData,
-                         ci.ForCharData);
-  this->set_code_sets_i (this->code_sets_.ForWcharData,
-                         ci.ForWcharData);
-  this->code_sets_set_ = 1;
-
-  TAO_OutputCDR cdr;
-  cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER);
-  cdr << this->code_sets_;
-
-  this->set_component_i (IOP::TAG_CODE_SETS, cdr);
-}
-
-void
-TAO_Tagged_Components::set_code_sets_i (
-    CONV_FRAME::CodeSetComponent &lhs,
-    CONV_FRAME::CodeSetComponent &rhs)
-{
-  lhs.native_code_set = rhs.native_code_set;
-  CORBA::ULong max = rhs.conversion_code_sets.maximum ();
-  CORBA::ULong len = rhs.conversion_code_sets.length ();
-  CONV_FRAME::CodeSetId *buffer = rhs.conversion_code_sets.get_buffer (1);
-  lhs.conversion_code_sets.replace (max, len, buffer, 1);
-}
-
-void
-TAO_Tagged_Components::set_tao_priority_range (CORBA::Short min_p,
-                                               CORBA::Short max_p)
-{
-  this->tao_priority_min_ = min_p;
-  this->tao_priority_max_ = max_p;
-  this->tao_priority_range_set_ = 1;
-
-  TAO_OutputCDR cdr;
-  cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER);
-  cdr << this->orb_type_;
-
-  cdr << this->tao_priority_min_;
-  cdr << this->tao_priority_max_;
-
-  this->set_component_i (TAO_TAG_PRIORITY_RANGE, cdr);
-}
-
-// ****************************************************************
-
-void
-TAO_Tagged_Components::set_component_i (IOP::ComponentId tag,
-                                        TAO_OutputCDR &cdr)
-{
-  IOP::TaggedComponent component;
-  component.tag = tag;
-
-  // Make a *copy* of the CDR stream...
-  CORBA::ULong length = cdr.total_length ();
-  component.component_data.length (length);
-  CORBA::Octet *buf = component.component_data.get_buffer ();
-
-  for (const ACE_Message_Block *i = cdr.begin ();
-       i != 0;
-       i = i->cont ())
-    {
-      ACE_OS::memcpy (buf, i->rd_ptr (), i->length ());
-      buf += i->length ();
-    }
-
-  this->set_component_i (component);
-}
-
-void
-TAO_Tagged_Components::set_component (const IOP::TaggedComponent& component)
-{
-  if (this->known_tag (component.tag))
-    this->set_known_component_i (component);
-  if (this->unique_tag (component.tag))
-    this->set_component_i (component);
-  else
-    this->add_component_i (component);
-}
-
-void
-TAO_Tagged_Components::set_component (IOP::TaggedComponent& component)
-{
-  if (this->known_tag (component.tag))
-    this->set_known_component_i (component);
-  if (this->unique_tag (component.tag))
-    this->set_component_i (component);
-  else
-    this->add_component_i (component);
-}
-
-void
-TAO_Tagged_Components::set_known_component_i (
-    const IOP::TaggedComponent& component)
-{
-  TAO_InputCDR cdr (ACE_reinterpret_cast (const char*,
-                                          component.component_data.get_buffer ()),
-                    component.component_data.length ());
-  CORBA::Octet byte_order;
-  if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) != 0)
-    return;
-  cdr.reset_byte_order (ACE_static_cast(int,byte_order));
-
-  if (component.tag == IOP::TAG_ORB_TYPE)
-    {
-      CORBA::ULong orb_type;
-      if ((cdr >> orb_type) != 0)
-        return;
-
-      this->orb_type_ = orb_type;
-      this->orb_type_set_ = 1;
-    }
-  else if (component.tag == IOP::TAG_CODE_SETS)
-    {
-      CONV_FRAME::CodeSetComponentInfo ci;
-      if ((cdr >> ci) != 0)
-        return;
-
-      this->set_code_sets_i (this->code_sets_.ForCharData,
-                             ci.ForCharData);
-      this->set_code_sets_i (this->code_sets_.ForWcharData,
-                             ci.ForWcharData);
-      this->code_sets_set_ = 1;
-    }
-  else if (component.tag == TAO_TAG_PRIORITY_RANGE)
-    {
-      CORBA::Short min_p, max_p;
-
-      if ((cdr >> min_p) != 0
-          || (cdr >> max_p) != 0
-          || min_p > max_p)
-        return;
-
-      this->tao_priority_min_ = min_p;
-      this->tao_priority_max_ = max_p;
-      this->tao_priority_range_set_ = 1;
-    }
-}
-
-void
-TAO_Tagged_Components::set_component_i (const IOP::TaggedComponent& component)
-{
-  // @@ TODO Some components can show up multiple times, others
-  //    can't find out and take appropiate action.
-  for (CORBA::ULong i = 0; i != this->components_.length (); ++i)
-    {
-      if (component.tag == this->components_[i].tag)
-        {
-          this->components_[i] = component;
-          return;
-        }
-    }
-  this->add_component_i (component);
-}
-
-void
-TAO_Tagged_Components::set_component_i (IOP::TaggedComponent& component)
-{
-  for (CORBA::ULong i = 0; i != this->components_.length (); ++i)
-    {
-      if (component.tag == this->components_[i].tag)
-        {
-          CORBA::ULong max = component.component_data.maximum ();
-          CORBA::ULong len = component.component_data.length ();
-          CORBA::Octet* buf = component.component_data.get_buffer (1);
-          this->components_[i].component_data.replace (max, len, buf, 1);
-          return;
-        }
-    }
-  this->add_component_i (component);
-}
-
-void
-TAO_Tagged_Components::add_component_i (IOP::TaggedComponent& component)
-{
-  // @@ TODO Some components can show up multiple times, others
-  //    can't find out and take appropiate action.
-  CORBA::ULong l = this->components_.length ();
-  this->components_.length (l + 1);
-  this->components_[l].tag = component.tag;
-  CORBA::ULong max = component.component_data.maximum ();
-  CORBA::ULong len = component.component_data.length ();
-  CORBA::Octet* buf = component.component_data.get_buffer (1);
-  this->components_[l].component_data.replace (max, len, buf, 1);
-}
-
-void
-TAO_Tagged_Components::add_component_i (const IOP::TaggedComponent& component)
-{
-  // @@ TODO Some components can show up multiple times, others
-  //    can't find out and take appropiate action.
-  CORBA::ULong l = this->components_.length ();
-  this->components_.length (l + 1);
-  this->components_[l] = component;
-}
-
-int
-TAO_Tagged_Components::get_component (IOP::TaggedComponent& component) const
-{
-  for (CORBA::ULong i = 0; i != this->components_.length (); ++i)
-    {
-      if (component.tag == this->components_[i].tag)
-        {
-          component = this->components_[i];
-          return 1;
-        }
-    }
-  return 0;
-}
-
-// ****************************************************************
-
-int
-TAO_Tagged_Components::encode (TAO_OutputCDR& cdr) const
-{
-  return (cdr << this->components_);
-}
-
-int
-TAO_Tagged_Components::decode (TAO_InputCDR& cdr)
-{
-  // Mark the well-known components as removed
-  this->orb_type_set_ = 0;
-  this->code_sets_set_ = 0;
-  this->tao_priority_range_set_ = 0;
-
-  if ((cdr >> this->components_) == 0)
-    return 0;
-
-  CORBA::ULong l = this->components_.length ();
-  for (CORBA::ULong i = 0; i != l; ++i)
-    {
-      const IOP::TaggedComponent &component =
-        this->components_[i];
-      if (this->known_tag (component.tag))
-        this->set_known_component_i (component);
-    }
-  return 1;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO_Unbounded_Sequence<IOP::TaggedComponent>;
-template class TAO_Unbounded_Sequence<IOP::TaggedProfile>;
-template class TAO_Unbounded_Sequence<IOP::ServiceContext>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_Unbounded_Sequence<IOP::TaggedComponent>
-#pragma instantiate TAO_Unbounded_Sequence<IOP::TaggedProfile>
-#pragma instantiate TAO_Unbounded_Sequence<IOP::ServiceContext>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Tagged_Components.h b/TAO/tao/Tagged_Components.h
deleted file mode 100644
index b3517be0db2..00000000000
--- a/TAO/tao/Tagged_Components.h
+++ /dev/null
@@ -1,153 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   Tagged_Components.h
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
-
-#ifndef TAO_TAGGED_COMPONENTS_H
-#define TAO_TAGGED_COMPONENTS_H
-
-#include "tao/IOPC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CONV_FRAMEC.h"
-
-class TAO_Export TAO_Tagged_Components
-{
-  //
-  // = TITLE
-  //   The policy manager implementation.
-  //
-  // = DESCRIPTION
-  //   This class is used to manipulate and access the <components>
-  //   field of an IIOP profile (and other GIOP profiles).
-  //   The definition for that field is simply a sequence of the
-  //   following structures:
-  //
-  //   typedef unsigned long ComponentId;
-  //   struct TaggedComponent {
-  //   ComponentId     tag;
-  //   sequence<octet> component_data;
-  //   };
-  //
-  //   the real motivation is to minimize the marshaling and
-  //   demarshaling of the <component_data> field for certain critical
-  //   components.
-  //
-public:
-  TAO_Tagged_Components (void);
-  // Constructor
-
-  // = Standard OMG that require fast access.
-  void set_orb_type (CORBA::ULong orb_type);
-  // The the IOP::TAG_ORB_TYPE component value
-
-  int get_orb_type (CORBA::ULong& orb_type) const;
-  // Gets the IOP::TAG_ORB_TYPE component value, return 0 if the
-  // component is not present.
-
-  void set_code_sets (const CONV_FRAME::CodeSetComponentInfo &);
-  void set_code_sets (CONV_FRAME::CodeSetComponentInfo &);
-  // The the IOP::TAG_CODE_SETS component value, the first version
-  // copies the data, the second version steal all the sequence
-  // buffers.
-
-  int get_code_sets (const CONV_FRAME::CodeSetComponentInfo* &) const;
-  // Gets a reference of the IOP::TAG_CODE_SETS component value,
-  // return 0 if the component is not present.
-
-  int get_code_sets (CONV_FRAME::CodeSetComponentInfo &) const;
-  // Gets a copy of the IOP::TAG_CODE_SETS component value, return 0
-  // if the component is not present.
-
-  // = TAO specific components
-  void set_tao_priority_range (CORBA::Short min_priority,
-                               CORBA::Short max_priority);
-  // The the TAO_TAG_PRIORITY_RANGE component value.
-
-  int get_tao_priority_range (CORBA::Short& min_priority,
-                              CORBA::Short& max_priority) const;
-  // Gets the TAO_TAG_PRIORITY_RANGE component value.
-
-  // = Generic components
-
-  void set_component (const IOP::TaggedComponent& component);
-  // Insert the component into the list, making a copy of the octet
-  // sequence.
-
-  void set_component (IOP::TaggedComponent& component);
-  // Insert the component into the list, but efficiently stealing the
-  // contents of the octet sequence.
-
-  int get_component (IOP::TaggedComponent& component) const;
-  // Get a copy of the component identified by <component.tag>, return
-  // 0 if the component is not present.
-
-  // = Marshaling and demarshaling
-
-  int encode (TAO_OutputCDR& cdr) const;
-  int decode (TAO_InputCDR& cdr);
-  // Marshal and demarshal the list.
-
-private:
-  void set_code_sets_i (CONV_FRAME::CodeSetComponent &lhs,
-                        CONV_FRAME::CodeSetComponent &rhs);
-  // Helper method to implement set_code_sets()
-
-  void set_known_component_i (const IOP::TaggedComponent& component);
-  void set_component_i (const IOP::TaggedComponent& component);
-  void set_component_i (IOP::TaggedComponent& component);
-  void add_component_i (const IOP::TaggedComponent& component);
-  void add_component_i (IOP::TaggedComponent& component);
-  void set_component_i (IOP::ComponentId tag, TAO_OutputCDR &cdr);
-  // Helper methods to implement set_component()
-
-  int get_known_component_i (IOP::TaggedComponent& component) const;
-  int get_component_i (IOP::TaggedComponent& component) const;
-  // Helper methods to implement set_component()
-
-  int known_tag (IOP::ComponentId tag) const;
-  // Is <tag> a well-known component?
-
-  int unique_tag (IOP::ComponentId tag) const;
-  // Does <tag> show up only once?
-
-private:
-  CORBA::ULong orb_type_;
-  // The ORB_TYPE component value
-
-  CONV_FRAME::CodeSetComponentInfo code_sets_;
-  // The ORB_TYPE component value
-
-  CORBA::Short tao_priority_min_;
-  CORBA::Short tao_priority_max_;
-  // The TAO_PRIORITY_RANGE priorities
-
-  IOP::MultipleComponentProfile components_;
-  // The rest of the components, to be compliant we cannot drop a
-  // bunch of them.
-
-  // A flag for each component...
-  unsigned int orb_type_set_  : 1;
-  unsigned int code_sets_set_ : 1;
-  unsigned int tao_priority_range_set_ : 1;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Tagged_Components.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_TAGGED_COMPONENTS_H */
diff --git a/TAO/tao/Tagged_Components.i b/TAO/tao/Tagged_Components.i
deleted file mode 100644
index d876667d609..00000000000
--- a/TAO/tao/Tagged_Components.i
+++ /dev/null
@@ -1,84 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_Tagged_Components::TAO_Tagged_Components (void)
-  :  orb_type_ (0),
-     tao_priority_min_ (0),
-     tao_priority_max_ (0),
-     orb_type_set_ (0),
-     code_sets_set_ (0),
-     tao_priority_range_set_ (0)
-{
-}
-
-ACE_INLINE int
-TAO_Tagged_Components::get_orb_type (CORBA::ULong& orb_type) const
-{
-  if (this->orb_type_set_ == 1)
-    orb_type = this->orb_type_;
-  return this->orb_type_set_;
-}
-
-ACE_INLINE int
-TAO_Tagged_Components::get_tao_priority_range (CORBA::Short& min_p,
-                                               CORBA::Short& max_p) const
-{
-  if (this->tao_priority_range_set_ == 1)
-    {
-      min_p = this->tao_priority_min_;
-      max_p = this->tao_priority_max_;
-    }
-  return this->tao_priority_range_set_;
-}
-
-ACE_INLINE int
-TAO_Tagged_Components::get_code_sets (const CONV_FRAME::CodeSetComponentInfo* &ci) const
-{
-  if (this->code_sets_set_ == 1)
-    ci = &this->code_sets_;
-  return this->code_sets_set_;
-}
-
-ACE_INLINE int
-TAO_Tagged_Components::get_code_sets (CONV_FRAME::CodeSetComponentInfo &ci) const
-{
-  if (this->code_sets_set_ == 1)
-    ci = this->code_sets_;
-  return this->code_sets_set_;
-}
-
-ACE_INLINE int
-TAO_Tagged_Components::known_tag (IOP::ComponentId tag) const
-{
-  return (tag == IOP::TAG_ORB_TYPE
-          || tag == IOP::TAG_CODE_SETS
-          || tag == TAO_TAG_PRIORITY_RANGE);
-}
-
-ACE_INLINE int
-TAO_Tagged_Components::unique_tag (IOP::ComponentId tag) const
-{
-  return (tag == IOP::TAG_ORB_TYPE
-          || tag == IOP::TAG_CODE_SETS
-          || tag == TAO_TAG_PRIORITY_RANGE
-          || tag == IOP::TAG_POLICIES
-          // || tag == IOP::TAG_ALTERNATE_IIOP_ADDRESS
-          || tag == IOP::TAG_ASSOCIATION_OPTIONS
-          || tag == IOP::TAG_SEC_NAME
-          || tag == IOP::TAG_SPKM_1_SEC_MECH
-          || tag == IOP::TAG_SPKM_2_SEC_MECH
-          || tag == IOP::TAG_KerberosV5_SEC_MECH
-          || tag == IOP::TAG_CSI_ECMA_Secret_SEC_MECH
-          || tag == IOP::TAG_CSI_ECMA_Hybrid_SEC_MECH
-          || tag == IOP::TAG_SSL_SEC_TRANS
-          || tag == IOP::TAG_CSI_ECMA_Public_SEC_MECH
-          || tag == IOP::TAG_GENERIC_SEC_MECH
-
-          || tag == IOP::TAG_COMPLETE_OBJECT_KEY
-          || tag == IOP::TAG_ENDPOINT_ID_POSITION
-          || tag == IOP::TAG_LOCATION_POLICY
-          || tag == IOP::TAG_DCE_STRING_BINDING
-          || tag == IOP::TAG_DCE_BINDING_NAME
-          || tag == IOP::TAG_DCE_NO_PIPES
-          || tag == IOP::TAG_DCE_SEC_MECH);
-}
diff --git a/TAO/tao/TimeBase.pidl b/TAO/tao/TimeBase.pidl
deleted file mode 100644
index d3fd6a84b42..00000000000
--- a/TAO/tao/TimeBase.pidl
+++ /dev/null
@@ -1,67 +0,0 @@
-// $Id$
-
-#ifndef TIME_BASE_PIDL
-#define TIME_BASE_PIDL
-
-#pragma prefix "omg.org"
-
-module TimeBase
-{
-  // = TITLE
-  //   COS Time Service basic types.
-  //
-  // = DESCRIPTION
-  //   The standard CORBA Time Service defines a number of data
-  //   structures to manipulate and express time.
-
-  typedef unsigned long long TimeT;
-  // Time in TimeT is expressed in units of 100 nano seconds (in
-  // other words 10^-7 seconds), and are relative to October 15, 1582;
-  // please read the spec for further details.
-
-  typedef TimeT InaccuracyT;
-  // To express an error estimate for time.
-
-  typedef short TdfT;
-  // Minutes of displacement from the Greenwich time.
-
-  struct UtcT
-  {
-    // = TITLE
-    //   Structure of the time value.  The inaccuracy is packed into
-    //   inacclo & inacchi.  The tdf holds the time displacement
-    //   factor.
-    //
-    // = DESCRIPTION
-    //   There is a total of 16 octets in this struct.
-
-    TimeT time;
-    // 8 octets
-
-    unsigned long inacclo;
-    // 4 octets
-
-    unsigned short inacchi;
-    // 2 octets
-
-    TdfT tdf;
-    // 2 octets
-
-  };
-
-  struct IntervalT
-  {
-    // = TITLE
-    // This type holds a time interval represented as two TimeT values
-    // corresponding to the lower and upper bound of the interval.
-
-    TimeT lower_bound;
-    // Lower bound of the interval.
-
-    TimeT upper_bound;
-    // Upper bound of the interval.
-  };
-
-};
-
-#endif /* TIME_BASE_PIDL */
diff --git a/TAO/tao/TimeBaseC.cpp b/TAO/tao/TimeBaseC.cpp
deleted file mode 100644
index 3a74a4c8045..00000000000
--- a/TAO/tao/TimeBaseC.cpp
+++ /dev/null
@@ -1,264 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   TimeBaseC.cpp
-//
-// = DESCRIPTION
-//   Generated from TimeBase.pidl
-//
-// ================================================================
-
-#include "TimeBaseC.h"
-
-#include "TimeBaseS.h"
-
-#if !defined (__ACE_INLINE__)
-#include "TimeBaseC.i"
-#endif /* !defined INLINE */
-
-ACE_RCSID(tao, TimeBaseC, "$Id$")
-
-static const CORBA::Long _oc_TimeBase_TimeT[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x42617365), ACE_NTOHL (0x2f54696d), ACE_NTOHL (0x65543a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-  6, ACE_NTOHL (0x54696d65), ACE_NTOHL (0x54000000),  // name = TimeT
-  CORBA::tk_ulonglong,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_TimeBase_TimeT (CORBA::tk_alias, sizeof (_oc_TimeBase_TimeT), (char *) &_oc_TimeBase_TimeT, 0, sizeof (TimeBase::TimeT));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (TimeBase)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TimeT, &_tc_TAO_tc_TimeBase_TimeT)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_TimeBase_InaccuracyT[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x42617365), ACE_NTOHL (0x2f496e61), ACE_NTOHL (0x63637572), ACE_NTOHL (0x61637954), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/TimeBase/InaccuracyT:1.0
-  12, ACE_NTOHL (0x496e6163), ACE_NTOHL (0x63757261), ACE_NTOHL (0x63795400),  // name = InaccuracyT
-  CORBA::tk_alias, // typecode kind for typedefs
-  56, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x42617365), ACE_NTOHL (0x2f54696d), ACE_NTOHL (0x65543a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-    6, ACE_NTOHL (0x54696d65), ACE_NTOHL (0x54000000),  // name = TimeT
-    CORBA::tk_ulonglong,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_TimeBase_InaccuracyT (CORBA::tk_alias, sizeof (_oc_TimeBase_InaccuracyT), (char *) &_oc_TimeBase_InaccuracyT, 0, sizeof (TimeBase::InaccuracyT));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (TimeBase)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_InaccuracyT, &_tc_TAO_tc_TimeBase_InaccuracyT)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_TimeBase_TdfT[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x42617365), ACE_NTOHL (0x2f546466), ACE_NTOHL (0x543a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/TimeBase/TdfT:1.0
-  5, ACE_NTOHL (0x54646654), ACE_NTOHL (0x0),  // name = TdfT
-  CORBA::tk_short,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_TimeBase_TdfT (CORBA::tk_alias, sizeof (_oc_TimeBase_TdfT), (char *) &_oc_TimeBase_TdfT, 0, sizeof (TimeBase::TdfT));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (TimeBase)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TdfT, &_tc_TAO_tc_TimeBase_TdfT)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_TimeBase_UtcT[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x42617365), ACE_NTOHL (0x2f557463), ACE_NTOHL (0x543a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/TimeBase/UtcT:1.0
-  5, ACE_NTOHL (0x55746354), ACE_NTOHL (0x0),  // name = UtcT
-  4, // member count
-    5, ACE_NTOHL (0x74696d65), ACE_NTOHL (0x0),  // name = time
-    CORBA::tk_alias, // typecode kind for typedefs
-    56, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x42617365), ACE_NTOHL (0x2f54696d), ACE_NTOHL (0x65543a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-      6, ACE_NTOHL (0x54696d65), ACE_NTOHL (0x54000000),  // name = TimeT
-      CORBA::tk_ulonglong,
-
-    8, ACE_NTOHL (0x696e6163), ACE_NTOHL (0x636c6f00),  // name = inacclo
-    CORBA::tk_ulong,
-
-    8, ACE_NTOHL (0x696e6163), ACE_NTOHL (0x63686900),  // name = inacchi
-    CORBA::tk_ushort,
-
-    4, ACE_NTOHL (0x74646600),  // name = tdf
-    CORBA::tk_alias, // typecode kind for typedefs
-    56, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x42617365), ACE_NTOHL (0x2f546466), ACE_NTOHL (0x543a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/TimeBase/TdfT:1.0
-      5, ACE_NTOHL (0x54646654), ACE_NTOHL (0x0),  // name = TdfT
-      CORBA::tk_short,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_TimeBase_UtcT (CORBA::tk_struct, sizeof (_oc_TimeBase_UtcT), (char *) &_oc_TimeBase_UtcT, 0, sizeof (TimeBase::UtcT));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (TimeBase)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UtcT, &_tc_TAO_tc_TimeBase_UtcT)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_TimeBase_IntervalT[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x42617365), ACE_NTOHL (0x2f496e74), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6c543a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/IntervalT:1.0
-  10, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x7276616c), ACE_NTOHL (0x54000000),  // name = IntervalT
-  2, // member count
-    12, ACE_NTOHL (0x6c6f7765), ACE_NTOHL (0x725f626f), ACE_NTOHL (0x756e6400),  // name = lower_bound
-    CORBA::tk_alias, // typecode kind for typedefs
-    56, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x42617365), ACE_NTOHL (0x2f54696d), ACE_NTOHL (0x65543a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-      6, ACE_NTOHL (0x54696d65), ACE_NTOHL (0x54000000),  // name = TimeT
-      CORBA::tk_ulonglong,
-
-    12, ACE_NTOHL (0x75707065), ACE_NTOHL (0x725f626f), ACE_NTOHL (0x756e6400),  // name = upper_bound
-    CORBA::tk_alias, // typecode kind for typedefs
-    56, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x42617365), ACE_NTOHL (0x2f54696d), ACE_NTOHL (0x65543a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-      6, ACE_NTOHL (0x54696d65), ACE_NTOHL (0x54000000),  // name = TimeT
-      CORBA::tk_ulonglong,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_TimeBase_IntervalT (CORBA::tk_struct, sizeof (_oc_TimeBase_IntervalT), (char *) &_oc_TimeBase_IntervalT, 0, sizeof (TimeBase::IntervalT));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (TimeBase)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IntervalT, &_tc_TAO_tc_TimeBase_IntervalT)
-TAO_NAMESPACE_END
-void operator<<= (CORBA::Any &_tao_any, const TimeBase::UtcT &_tao_elem) // copying
-{
-  TimeBase::UtcT *_any_val;
-  ACE_NEW (_any_val, TimeBase::UtcT (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (TimeBase::_tc_UtcT, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, TimeBase::UtcT *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (TimeBase::_tc_UtcT, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TimeBase::UtcT *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (TimeBase::_tc_UtcT, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (TimeBase::UtcT *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, TimeBase::UtcT, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (TimeBase::_tc_UtcT, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (TimeBase::_tc_UtcT, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const TimeBase::IntervalT &_tao_elem) // copying
-{
-  TimeBase::IntervalT *_any_val;
-  ACE_NEW (_any_val, TimeBase::IntervalT (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (TimeBase::_tc_IntervalT, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, TimeBase::IntervalT *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (TimeBase::_tc_IntervalT, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TimeBase::IntervalT *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (TimeBase::_tc_IntervalT, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (TimeBase::IntervalT *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, TimeBase::IntervalT, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (TimeBase::_tc_IntervalT, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (TimeBase::_tc_IntervalT, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tao/TimeBaseC.h b/TAO/tao/TimeBaseC.h
deleted file mode 100644
index 4f21b84929a..00000000000
--- a/TAO/tao/TimeBaseC.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   TimeBaseC.h
-//
-// = DESCRIPTION
-//   Generated from TimeBase.pidl, the common time representation for
-//   Time in CORBA.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#ifndef TAO_IDL_TIMEBASEC_H
-#define TAO_IDL_TIMEBASEC_H
-
-#include "tao/Any.h"
-#include "tao/CDR.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-TAO_NAMESPACE  TimeBase
-{
-  typedef CORBA::ULongLong TimeT;
-  typedef CORBA::ULongLong_out TimeT_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TimeT;
-
-  typedef TimeT InaccuracyT;
-  typedef TimeT_out InaccuracyT_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_InaccuracyT;
-
-  typedef CORBA::Short TdfT;
-  typedef CORBA::Short_out TdfT_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TdfT;
-
-  struct TAO_Export UtcT
-  {
-    TimeT time;
-    CORBA::ULong inacclo;
-    CORBA::UShort inacchi;
-    TdfT tdf;
-  };
-
-  class TAO_Export UtcT_var
-  {
-  public:
-    UtcT_var (void); // default constructor
-    UtcT_var (UtcT *);
-    UtcT_var (const UtcT_var &); // copy constructor
-    ~UtcT_var (void); // destructor
-
-    UtcT_var &operator= (UtcT *);
-    UtcT_var &operator= (const UtcT_var &);
-    UtcT *operator-> (void);
-    const UtcT *operator-> (void) const;
-
-    operator const UtcT &() const;
-    operator UtcT &();
-    operator UtcT &() const;
-    // in, inout, out, _retn
-    const UtcT &in (void) const;
-    UtcT &inout (void);
-    UtcT &out (void);
-    UtcT _retn (void);
-    UtcT *ptr (void) const;
-
-  private:
-    UtcT *ptr_;
-  };
-
-  typedef UtcT &UtcT_out;
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UtcT;
-
-  struct TAO_Export IntervalT
-  {
-    TimeT lower_bound;
-    TimeT upper_bound;
-  };
-
-  class TAO_Export IntervalT_var
-  {
-  public:
-    IntervalT_var (void); // default constructor
-    IntervalT_var (IntervalT *);
-    IntervalT_var (const IntervalT_var &); // copy constructor
-    ~IntervalT_var (void); // destructor
-
-    IntervalT_var &operator= (IntervalT *);
-    IntervalT_var &operator= (const IntervalT_var &);
-    IntervalT *operator-> (void);
-    const IntervalT *operator-> (void) const;
-
-    operator const IntervalT &() const;
-    operator IntervalT &();
-    operator IntervalT &() const;
-    // in, inout, out, _retn
-    const IntervalT &in (void) const;
-    IntervalT &inout (void);
-    IntervalT &out (void);
-    IntervalT _retn (void);
-    IntervalT *ptr (void) const;
-
-  private:
-    IntervalT *ptr_;
-  };
-
-  typedef IntervalT &IntervalT_out;
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IntervalT;
-
-
-}; // module TimeBase
-
-void TAO_Export operator<<= (CORBA::Any &, const TimeBase::UtcT &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, TimeBase::UtcT*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, TimeBase::UtcT *&);
-void TAO_Export operator<<= (CORBA::Any &, const TimeBase::IntervalT &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, TimeBase::IntervalT*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, TimeBase::IntervalT *&);
-
-#if defined (__ACE_INLINE__)
-#include "TimeBaseC.i"
-#else
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const TimeBase::UtcT &);
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, TimeBase::UtcT &);
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const TimeBase::IntervalT &);
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, TimeBase::IntervalT &);
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_IDL_TIMEBASEC_H */
diff --git a/TAO/tao/TimeBaseC.i b/TAO/tao/TimeBaseC.i
deleted file mode 100644
index b319880585e..00000000000
--- a/TAO/tao/TimeBaseC.i
+++ /dev/null
@@ -1,271 +0,0 @@
-// $Id$
-
-// *************************************************************
-// Inline operations for class TimeBase::UtcT_var
-// *************************************************************
-
-ACE_INLINE
-TimeBase::UtcT_var::UtcT_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-TimeBase::UtcT_var::UtcT_var (TimeBase::UtcT *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-TimeBase::UtcT_var::UtcT_var (const TimeBase::UtcT_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new TimeBase::UtcT(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-TimeBase::UtcT_var::~UtcT_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE TimeBase::UtcT_var &
-TimeBase::UtcT_var::operator= (TimeBase::UtcT *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE TimeBase::UtcT_var &
-TimeBase::UtcT_var::operator= (const TimeBase::UtcT_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new TimeBase::UtcT (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const TimeBase::UtcT *
-TimeBase::UtcT_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TimeBase::UtcT *
-TimeBase::UtcT_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TimeBase::UtcT_var::operator const TimeBase::UtcT &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-TimeBase::UtcT_var::operator TimeBase::UtcT &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-TimeBase::UtcT_var::operator TimeBase::UtcT &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const TimeBase::UtcT &
-TimeBase::UtcT_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TimeBase::UtcT &
-TimeBase::UtcT_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for fixed size
-ACE_INLINE TimeBase::UtcT &
-TimeBase::UtcT_var::out (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TimeBase::UtcT
-TimeBase::UtcT_var::_retn (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TimeBase::UtcT *
-TimeBase::UtcT_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class TimeBase::IntervalT_var
-// *************************************************************
-
-ACE_INLINE
-TimeBase::IntervalT_var::IntervalT_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-TimeBase::IntervalT_var::IntervalT_var (TimeBase::IntervalT *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-TimeBase::IntervalT_var::IntervalT_var (const TimeBase::IntervalT_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new TimeBase::IntervalT(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-TimeBase::IntervalT_var::~IntervalT_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE TimeBase::IntervalT_var &
-TimeBase::IntervalT_var::operator= (TimeBase::IntervalT *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE TimeBase::IntervalT_var &
-TimeBase::IntervalT_var::operator= (const TimeBase::IntervalT_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new TimeBase::IntervalT (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const TimeBase::IntervalT *
-TimeBase::IntervalT_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TimeBase::IntervalT *
-TimeBase::IntervalT_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TimeBase::IntervalT_var::operator const TimeBase::IntervalT &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-TimeBase::IntervalT_var::operator TimeBase::IntervalT &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-TimeBase::IntervalT_var::operator TimeBase::IntervalT &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const TimeBase::IntervalT &
-TimeBase::IntervalT_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TimeBase::IntervalT &
-TimeBase::IntervalT_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for fixed size
-ACE_INLINE TimeBase::IntervalT &
-TimeBase::IntervalT_var::out (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TimeBase::IntervalT
-TimeBase::IntervalT_var::_retn (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TimeBase::IntervalT *
-TimeBase::IntervalT_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TimeBase::UtcT &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.time) &&
-    (strm << _tao_aggregate.inacclo) &&
-    (strm << _tao_aggregate.inacchi) &&
-    (strm << _tao_aggregate.tdf)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TimeBase::UtcT &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.time) &&
-    (strm >> _tao_aggregate.inacclo) &&
-    (strm >> _tao_aggregate.inacchi) &&
-    (strm >> _tao_aggregate.tdf)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TimeBase::IntervalT &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.lower_bound) &&
-    (strm << _tao_aggregate.upper_bound)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TimeBase::IntervalT &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.lower_bound) &&
-    (strm >> _tao_aggregate.upper_bound)
-  )
-    return 1;
-  else
-    return 0;
-
-}
diff --git a/TAO/tao/TimeBaseS.cpp b/TAO/tao/TimeBaseS.cpp
deleted file mode 100644
index 668cc8c6ae9..00000000000
--- a/TAO/tao/TimeBaseS.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   TimeBaseS.cpp
-//
-// = DESCRIPTION
-//   Generated from TimeBase.pidl
-//
-// ================================================================
-
-#include "TimeBaseS.h"
-
-#if !defined (__ACE_INLINE__)
-#include "TimeBaseS.i"
-#endif /* !defined INLINE */
-
-ACE_RCSID(tao, TimeBaseS, "$Id$")
diff --git a/TAO/tao/TimeBaseS.h b/TAO/tao/TimeBaseS.h
deleted file mode 100644
index dc854c5a681..00000000000
--- a/TAO/tao/TimeBaseS.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   TimeBaseS.h
-//
-// = DESCRIPTION
-//   Generated from TimeBase.pidl
-//   The file is almost empty and only present to keep other IDL files
-//   that include TimeBase.pidl happy.
-//
-// ================================================================
-
-#ifndef TAO_IDL_TIMEBASES_H
-#define TAO_IDL_TIMEBASES_H
-
-#include "TimeBaseC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "TimeBaseS_T.h"
-
-#if defined (__ACE_INLINE__)
-#include "TimeBaseS.i"
-#endif /* defined INLINE */
-
-#endif /* TAO_IDL_TIMEBASES_H */
diff --git a/TAO/tao/TimeBaseS.i b/TAO/tao/TimeBaseS.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/TimeBaseS.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/TimeBaseS_T.cpp b/TAO/tao/TimeBaseS_T.cpp
deleted file mode 100644
index fb85a396231..00000000000
--- a/TAO/tao/TimeBaseS_T.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   TimeBaseS_T.cpp
-//
-// = DESCRIPTION
-//   Generated from TimeBase.pidl
-//
-// ================================================================
-
-#ifndef TAO_IDL_TIMEBASES_T_CPP
-#define TAO_IDL_TIMEBASES_T_CPP
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#include "TimeBaseS_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "TimeBaseS_T.i"
-#endif /* !defined INLINE */
-
-
-#endif /* TAO_IDL_TIMEBASES_T_CPP */
diff --git a/TAO/tao/TimeBaseS_T.h b/TAO/tao/TimeBaseS_T.h
deleted file mode 100644
index ea740cb51e3..00000000000
--- a/TAO/tao/TimeBaseS_T.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   TimeBaseS_T.cpp
-//
-// = DESCRIPTION
-//   Generated from TimeBase.pidl
-//
-// ================================================================
-
-#ifndef TAO_IDL_TIMEBASES_T_H
-#define TAO_IDL_TIMEBASES_T_H
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-#if defined (__ACE_INLINE__)
-#include "TimeBaseS_T.i"
-#endif /* defined INLINE */
-
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "TimeBaseS_T.cpp"
-#endif /* defined REQUIRED SOURCE */
-
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("TimeBaseS_T.cpp")
-#endif /* defined REQUIRED PRAGMA */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_IDL_TIMEBASES_T_H */
diff --git a/TAO/tao/TimeBaseS_T.i b/TAO/tao/TimeBaseS_T.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/TimeBaseS_T.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/Timeprobe.h b/TAO/tao/Timeprobe.h
deleted file mode 100644
index 2967a794ebb..00000000000
--- a/TAO/tao/Timeprobe.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// $Id$
-
-#ifndef TAO_TIMEPROBE_H
-#define TAO_TIMEPROBE_H
-
-// Please see ace/Timeprobe.h for details on these #defines.
-
-//#define ACE_ENABLE_TIMEPROBES
-//#define ACE_MT_TIMEPROBES
-//#define ACE_TSS_TIMEPROBES
-
-#include "ace/Timeprobe.h"
-
-// The macro for turning off all timeprobes except
-// the ones that are pertinent to pluggable protocols.
-//#define TAO_SELECT_PP_TIMEPROBES
-
-// The macro for turning off all timeprobes except
-// four - 2 to measure client send time and 2 to measure
-// server upcall processing and return time.
-// NOTE: If both this and the pluggable protocols macro
-// above are defined, code below will undefine this macro.
-// They should not both be defined at the same time.
-//#define TAO_SELECT_MINIMAL_TIMEPROBES
-
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-
-# define TAO_PP_TIMEPROBE(id) \
-         ACE_TIMEPROBE_SINGLETON::instance ()->timeprobe (id)
-# define TAO_FUNCTION_PP_TIMEPROBE(X) \
-         ACE_Function_Timeprobe<ACE_TIMEPROBE_WITH_LOCKING> \
-         function_timeprobe (*ACE_TIMEPROBE_SINGLETON::instance (), X)
-# define TAO_MINIMAL_TIMEPROBE(id)
-
-# if defined (TAO_SELECT_PP_TIMEPROBES)
-#   if defined TAO_SELECT_MINIMAL_TIMEPROBES
-#     undef TAO_SELECT_MINIMIAL_TIMEPROBES
-#   endif /* TAO_SELECT_MINIMAL_TIMEPROBES */
-#   undef ACE_TIMEPROBE
-#   define ACE_TIMEPROBE(id)
-#   undef ACE_FUNCTION_TIMEPROBE
-#   define ACE_FUNCTION_TIMEPROBE(X)
-#   define TAO_MINIMAL_TIMEPROBE(id)
-# endif /* TAO_SELECT_PP_TIMEPROBES */
-
-# if defined (TAO_SELECT_MINIMAL_TIMEPROBES)
-#   undef TAO_MINIMAL_TIMEPROBE
-#   define TAO_MINIMAL_TIMEPROBE(id) \
-           ACE_TIMEPROBE_SINGLETON::instance ()->timeprobe (id)
-#   undef ACE_TIMEPROBE
-#   define ACE_TIMEPROBE(id)
-#   undef ACE_FUNCTION_TIMEPROBE
-#   define ACE_FUNCTION_TIMEPROBE(X)
-#   undef TAO_PP_TIMEPROBE
-#   define TAO_PP_TIMEPROBE(id)
-#   undef TAO_FUNCTION_PP_TIMEPROBE
-#   define TAO_FUNCTION_PP_TIMEPROBE(X)
-# endif /* TAO_SELECT_MINIMAL_TIMEPROBES */   
-
-#else /* ACE_ENABLE_TIMEPROBES */
-
-# define TAO_PP_TIMEPROBE(id)
-# define TAO_FUNCTION_PP_TIMEPROBE(X)
-# define TAO_MINIMAL_TIMEPROBE(id)
-
-#endif /* ACE_ENABLE_TIMEPROBES */
-
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#endif /* TAO_TIMEPROBE_H */
diff --git a/TAO/tao/Transport_Mux_Strategy.cpp b/TAO/tao/Transport_Mux_Strategy.cpp
deleted file mode 100644
index e5d3492cebf..00000000000
--- a/TAO/tao/Transport_Mux_Strategy.cpp
+++ /dev/null
@@ -1,324 +0,0 @@
-// $Id$
-
-#include "tao/Transport_Mux_Strategy.h"
-#include "tao/Reply_Dispatcher.h"
-#include "tao/debug.h"
-#include "tao/Pluggable.h"
-
-TAO_Transport_Mux_Strategy::TAO_Transport_Mux_Strategy (void)
-{
-}
-
-TAO_Transport_Mux_Strategy::~TAO_Transport_Mux_Strategy (void)
-{
-}
-
-// *********************************************************************
-
-TAO_Exclusive_TMS::TAO_Exclusive_TMS (TAO_ORB_Core *orb_core)
-  : request_id_generator_ (0),
-    request_id_ (0),
-    rd_ (0),
-    message_state_ (orb_core)
-{
-}
-
-TAO_Exclusive_TMS::~TAO_Exclusive_TMS (void)
-{
-}
-
-// Generate and return an unique request id for the current
-// invocation. We can actually return a predecided ULong, since we
-// allow only one invocation over this connection at a time.
-CORBA::ULong
-TAO_Exclusive_TMS::request_id (void)
-{
-  return this->request_id_generator_++;
-}
-
-// Bind the handler with the request id.
-int
-TAO_Exclusive_TMS::bind_dispatcher (CORBA::ULong request_id,
-                                    TAO_Reply_Dispatcher *rd)
-{
-  this->request_id_ = request_id;
-  this->rd_ = rd;
-
-  // @@ Carlos: This method marks the <start> of an invocation. This
-  //    should be the correct place to <reset> the message state. Do I
-  //    make sense? (Alex).
-
-  // If there was a previous reply, cleanup its state first.
-  if (this->message_state_.message_size != 0)
-    this->message_state_.reset ();
-
-  return 0;
-}
-
-int
-TAO_Exclusive_TMS::dispatch_reply (CORBA::ULong request_id,
-                                   CORBA::ULong reply_status,
-                                   const TAO_GIOP_Version& version,
-                                   TAO_GIOP_ServiceContextList& reply_ctx,
-                                   TAO_GIOP_Message_State* message_state)
-{
-  // There can be only one message state possible. Just do a sanity
-  // check here.
-  ACE_ASSERT (message_state == &(this->message_state_));
-
-  // Check the ids.
-  if (this->request_id_ != request_id)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Exclusive_TMS::dispatch_reply - <%d != %d>\n",
-                    this->request_id_, request_id));
-      return -1;
-    }
-
-  TAO_Reply_Dispatcher *rd = this->rd_;
-  this->request_id_ = 0xdeadbeef; // @@ What is a good value???
-  this->rd_ = 0;
-
-  return rd->dispatch_reply (reply_status,
-                             version,
-                             reply_ctx,
-                             message_state);
-}
-
-TAO_GIOP_Message_State *
-TAO_Exclusive_TMS::get_message_state (void)
-{
-  if (this->rd_ == 0)
-    return 0;
-
-  return &(this->message_state_);
-}
-
-void
-TAO_Exclusive_TMS::destroy_message_state (TAO_GIOP_Message_State *)
-{
-  // No Op.
-}
-
-int
-TAO_Exclusive_TMS::idle_after_send (TAO_Transport *)
-{
-  // No op.
-  return 0;
-}
-
-int
-TAO_Exclusive_TMS::idle_after_reply (TAO_Transport *transport)
-{
-  if (transport != 0)
-    return transport->idle ();
-
-  return 0;
-}
-
-int
-TAO_Exclusive_TMS::reply_received (const CORBA::ULong request_id)
-{
-  if (this->rd_ == 0)
-    {
-      // Reply should have been dispatched already.
-      return 1;
-    }
-  else if (this->request_id_ == request_id)
-    {
-      // Reply dispatcher is still here.
-      return 0;
-    }
-  else
-    {
-      // Error. Request id is not matching.
-
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "(%P | %t):TAO_Exclusive_TMS::reply_received:"
-                      "Invalid request_id \n"));
-        }
-      return -1;
-    }
-}
-
-// *********************************************************************
-
-TAO_Muxed_TMS::TAO_Muxed_TMS (TAO_ORB_Core *orb_core)
-  : request_id_generator_ (0),
-    orb_core_ (orb_core),
-    message_state_ (0)
-{
-}
-
-TAO_Muxed_TMS::~TAO_Muxed_TMS (void)
-{
-}
-
-// Generate and return an unique request id for the current
-// invocation.
-CORBA::ULong
-TAO_Muxed_TMS::request_id (void)
-{
-  // @@ What is a good error return value?
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon,
-                    this->request_id_lock_, 0);
-  return this->request_id_generator_++;
-}
-
-// Bind the dispatcher with the request id.
-int
-TAO_Muxed_TMS::bind_dispatcher (CORBA::ULong request_id,
-                                TAO_Reply_Dispatcher *rd)
-{
-  int result = this->dispatcher_table_.bind (request_id, rd);
-
-  if (result != 0)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "(%P | %t):TAO_Muxed_TMS::bind_dispatcher: "
-                    "bind dispatcher failed: result = %d\n",
-                    result));
-
-      return -1;
-    }
-  return 0;
-}
-
-int
-TAO_Muxed_TMS::dispatch_reply (CORBA::ULong request_id,
-                               CORBA::ULong reply_status,
-                               const TAO_GIOP_Version &version,
-                               TAO_GIOP_ServiceContextList &reply_ctx,
-                               TAO_GIOP_Message_State *message_state)
-{
-  // This message state should be the same as the one we have here,
-  // which we gave to the Transport to read the message. Just a sanity
-  // check here.
-  ACE_ASSERT (message_state == this->message_state_);
-
-  int result = 0;
-  TAO_Reply_Dispatcher *rd = 0;
-
-  // Grab the reply dispatcher for this id.
-  result = this->dispatcher_table_.unbind (request_id, rd);
-
-  if (result != 0)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "(%P | %t):TAO_Muxed_TMS::dispatch_reply: "
-                    "unbind dispatcher failed: result = %d\n",
-                    result));
-
-      return -1;
-    }
-
-  // @@ Carlos : We could save the <messagee_state> somehow and then
-  //    signal some other thread to go ahead read the incoming message
-  //    if any. Is this what you were telling me before? (Alex).
-
-  // Dispatch the reply.
-  return rd->dispatch_reply (reply_status,
-                             version,
-                             reply_ctx,
-                             message_state);
-}
-
-TAO_GIOP_Message_State *
-TAO_Muxed_TMS::get_message_state (void)
-{
-  if (this->message_state_ == 0)
-    {
-      // Create the next message state.
-      ACE_NEW_RETURN (this->message_state_,
-                      TAO_GIOP_Message_State (this->orb_core_),
-                      0);
-    }
-
-  return this->message_state_;
-}
-
-void
-TAO_Muxed_TMS::destroy_message_state (TAO_GIOP_Message_State *)
-{
-  delete this->message_state_;
-  this->message_state_ = 0;
-}
-
-int
-TAO_Muxed_TMS::idle_after_send (TAO_Transport *transport)
-{
-  if (transport != 0)
-    return transport->idle ();
-
-  return 0;
-}
-
-int
-TAO_Muxed_TMS::idle_after_reply (TAO_Transport *)
-{
-  return 0;
-}
-
-int
-TAO_Muxed_TMS::reply_received (const CORBA::ULong request_id)
-{
-  if (this->dispatcher_table_.find (request_id) == -1)
-    {
-      // Reply should have been dispatched already.
-      return 1;
-    }
-  else
-    {
-      // Reply dispatcher is still here.
-      return 0;
-    }
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Hash_Map_Manager_Ex <CORBA::ULong,
-                                        TAO_Reply_Dispatcher *,
-                                        ACE_Hash <CORBA::ULong>,
-                                        ACE_Equal_To <CORBA::ULong>,
-                                        ACE_SYNCH_MUTEX>;
-
-template class ACE_Hash_Map_Entry<CORBA::ULong,
-                                  TAO_Reply_Dispatcher *>;
-
-template class ACE_Hash_Map_Iterator_Base_Ex<CORBA::ULong,
-                                             TAO_Reply_Dispatcher *,
-                                             ACE_Hash<unsigned int>,
-                                             ACE_Equal_To<unsigned int>,
-                                             ACE_SYNCH_MUTEX>;
-
-template class ACE_Hash_Map_Iterator_Ex<CORBA::ULong,
-                                        TAO_Reply_Dispatcher*,
-                                        ACE_Hash<CORBA::ULong>,
-                                        ACE_Equal_To<CORBA::ULong>,
-                                        ACE_SYNCH_MUTEX>;
-
-template class ACE_Hash_Map_Reverse_Iterator_Ex<CORBA::ULong,
-                                                TAO_Reply_Dispatcher*,
-                                                ACE_Hash<CORBA::ULong>,
-                                                ACE_Equal_To<CORBA::ULong>,
-                                                ACE_SYNCH_MUTEX>;
-template class ACE_Equal_To <CORBA::ULong>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Manager_Ex <CORBA::ULong, TAO_Reply_Dispatcher *, ACE_Hash <CORBA::ULong>, ACE_Equal_To <CORBA::ULong>, ACE_SYNCH_MUTEX>
-
-#pragma instantiate ACE_Hash_Map_Entry<CORBA::ULong, TAO_Reply_Dispatcher *>
-
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<unsigned int, TAO_Reply_Dispatcher *, ACE_Hash<unsigned int>, ACE_Equal_To<unsigned int>, ACE_SYNCH_MUTEX>
-
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<CORBA::ULong, TAO_Reply_Dispatcher*, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_SYNCH_MUTEX>
-
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<CORBA::ULong, TAO_Reply_Dispatcher*, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_SYNCH_MUTEX>
-
-#pragma instantiate ACE_Equal_To <CORBA::ULong>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Transport_Mux_Strategy.h b/TAO/tao/Transport_Mux_Strategy.h
deleted file mode 100644
index 6c13a03e73d..00000000000
--- a/TAO/tao/Transport_Mux_Strategy.h
+++ /dev/null
@@ -1,246 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     Transport_Mux_Strategy.h
-//
-// = DESCRIPTION
-//     IIOP Transport Mux Strategies.
-//
-// = AUTHOR
-//     Alexander Babu Arulanthu <alex@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_TRANSPORT_MUX_STRATEGY_H
-#define TAO_TRANSPORT_MUX_STRATEGY_H
-
-#include "tao/GIOP.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Functor.h"
-#include "ace/Hash_Map_Manager.h"
-
-class TAO_Reply_Dispatcher;
-
-class TAO_Export TAO_Transport_Mux_Strategy
-{
-  // = TITLE
-  //
-  //     Strategy to determine whether the connection should be
-  //     multiplexed for multiple requests or it is exclusive for a
-  //     single request at a time.
-  //
-  // = DESCRIPTION
-  //
-  
-public:
-  TAO_Transport_Mux_Strategy (void);
-  // Base class constructor.
-
-  virtual ~TAO_Transport_Mux_Strategy (void);
-  // Base class destructor.
-
-  virtual CORBA::ULong request_id (void)  = 0;
-  // Generate and return an unique request id for the current
-  // invocation.
-
-  // = Bind and Find methods for the <Request ID, ReplyDispatcher>
-  //   pairs.
-
-  virtual int bind_dispatcher (CORBA::ULong request_id,
-                               TAO_Reply_Dispatcher *rd) = 0;
-  // Bind the dispatcher with the request id.
-  
-  virtual int dispatch_reply (CORBA::ULong request_id,
-                              CORBA::ULong reply_status,
-                              const TAO_GIOP_Version& version,
-                              TAO_GIOP_ServiceContextList& reply_ctx,
-                              TAO_GIOP_Message_State* message_state) = 0;
-  // Dispatch the reply for <request_id>, cleanup any resources
-  // allocated for that request.
-
-  // = "Factory methods" to obtain the CDR stream, in the Muxed case
-  //    the factory simply allocates a new one, in the Exclusive case
-  //    the factory returns a pointer to the pre-allocated CDR.
-
-  virtual TAO_GIOP_Message_State *get_message_state (void) = 0;
-  // Get a CDR stream.
-
-  virtual void destroy_message_state (TAO_GIOP_Message_State *) = 0;
-  // Destroy a CDR stream.
-
-  virtual int idle_after_send (TAO_Transport *) = 0;
-  // Request has been just sent, but the reply is not received. Idle
-  // the transport now.
-  
-  virtual int idle_after_reply (TAO_Transport *) = 0;
-  // Request is sent and the reply is received. Idle the transport
-  // now. 
-
-  virtual int reply_received (const CORBA::ULong request_id) = 0;
-  // Check whether the reply has been receieved for the request with
-  // <request_id>. Return 0 if no, 1 on yes and -1 if the request_id
-  // is invalid or there are some errors.
-};
-
-// *********************************************************************
-
-class TAO_Export TAO_Exclusive_TMS : public TAO_Transport_Mux_Strategy
-{
-  // = TITLE
-  //
-  //    Connection exclusive for the request.
-  //
-  // = DESCRIPTION
-  //
-
-public:
-  TAO_Exclusive_TMS (TAO_ORB_Core *orb_core);
-  // Constructor.
-
-  virtual ~TAO_Exclusive_TMS (void);
-  // Destructor.
-
-  virtual CORBA::ULong request_id (void);
-  // Generate and return an unique request id for the current
-  // invocation.
-
-  virtual int bind_dispatcher (CORBA::ULong request_id,
-                               TAO_Reply_Dispatcher *rh);
-  // Bind the dispatcher with the request id.
-
-  virtual int dispatch_reply (CORBA::ULong request_id,
-                              CORBA::ULong reply_status,
-                              const TAO_GIOP_Version& version,
-                              TAO_GIOP_ServiceContextList& reply_ctx,
-                              TAO_GIOP_Message_State* message_state);
-  // Dispatch the reply for <request_id>, cleanup any resources
-  // allocated for that request.
-
-  virtual TAO_GIOP_Message_State *get_message_state (void);
-  // Return the pre-allocated message state.
-
-  virtual void destroy_message_state (TAO_GIOP_Message_State *);
-  // No op in this strategy.
-
-  virtual int idle_after_send (TAO_Transport *transport);
-  // Request has been just sent, but the reply is not received. Idle
-  // the transport now.
-  
-  virtual int idle_after_reply (TAO_Transport *transport);
-  // Request is sent and the reply is received. Idle the transport
-  // now. 
-  
-  virtual int reply_received (const CORBA::ULong request_id);
-  // Check whether the reply has been receieved for the request with
-  // <request_id>. Return 0 if no, 1 on yes and -1 if the request_id
-  // is invalid or there are errors.
-
-protected:
-  CORBA::ULong request_id_generator_;
-  // Used to generate a different request_id on each call to
-  // request_id().
-
-  CORBA::ULong request_id_;
-  // Request id for the current request.
-
-  TAO_Reply_Dispatcher *rd_;
-  // Reply Dispatcher corresponding to the request.
-
-  TAO_GIOP_Message_State message_state_;
-  // Message state to read the incoming message. 
-};
-
-// *********************************************************************
-
-class TAO_Export TAO_Muxed_TMS : public  TAO_Transport_Mux_Strategy
-{
-  // = TITLE
-  //
-  //    Connection is multiplexed for many requests.
-  //
-  // = DESCRIPTION
-  //
-
-public:
-  TAO_Muxed_TMS (TAO_ORB_Core *orb_core);
-  // Constructor.
-
-  virtual ~TAO_Muxed_TMS (void);
-  // Destructor.
-
-  virtual CORBA::ULong request_id (void);
-  // Generate and return an unique request id for the current
-  // invocation.
-  
-  virtual int bind_dispatcher (CORBA::ULong request_id,
-                               TAO_Reply_Dispatcher *rh);
-  // Bind the dispatcher with the request id.
-
-  virtual int dispatch_reply (CORBA::ULong request_id,
-                              CORBA::ULong reply_status,
-                              const TAO_GIOP_Version& version,
-                              TAO_GIOP_ServiceContextList& reply_ctx,
-                              TAO_GIOP_Message_State* message_state);
-  // Dispatch the reply for <request_id>, cleanup any resources
-  // allocated for that request.
-
-  virtual TAO_GIOP_Message_State *get_message_state (void);
-  // Return the message state.
-
-  virtual void destroy_message_state (TAO_GIOP_Message_State *);
-  // No op in this strategy.
-
-  virtual int idle_after_send (TAO_Transport *transport);
-  // Request has been just sent, but the reply is not received. Idle
-  // the transport now.
-  
-  virtual int idle_after_reply (TAO_Transport *transport);
-  // Request is sent and the reply is received. Idle the transport
-  // now. 
-
-  virtual int reply_received (const CORBA::ULong request_id);
-  // Check whether the reply has been receieved for the request with
-  // <request_id>. Return 0 if no, 1 on yes and -1 if the request_id
-  // is invalid or there are errors.
-
-protected:
-  CORBA::ULong request_id_generator_;
-  // Used to generate a different request_id on each call to
-  // request_id().
-
-  ACE_SYNCH_MUTEX request_id_lock_;
-  // Lock to protect the state of the request id generator. 
-
-  typedef ACE_Hash_Map_Manager_Ex <CORBA::ULong,
-                                   TAO_Reply_Dispatcher *,
-                                   ACE_Hash <CORBA::ULong>,
-                                   ACE_Equal_To <CORBA::ULong>,
-                                   ACE_SYNCH_MUTEX> REQUEST_DISPATCHER_TABLE;
-
-  REQUEST_DISPATCHER_TABLE dispatcher_table_;
-  // Table of <Request ID, Reply Dispatcher> pairs.
-
-  TAO_ORB_Core *orb_core_;
-  // Keep track of the orb core pointer. We need to this to create the
-  // Reply Dispatchers.
-
-  TAO_GIOP_Message_State *message_state_;
-  // Message state where the current input message is being read. This
-  // is created at start of each incoming message. When that message
-  // is read, the message is processed and for the next message a new
-  // message state is created.
-};
-
-// *********************************************************************
-
-#endif /* TRANSPORT_MUX_STRATEGY_H */
diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp
deleted file mode 100644
index 4da4a8c7526..00000000000
--- a/TAO/tao/Typecode.cpp
+++ /dev/null
@@ -1,2173 +0,0 @@
-// $Id$
-
-// Typecodes essentially consist of just the CDR octets that get
-// marshaled and unmarshaled, and this code knows how to parse those
-// octets and answer questions CORBA's TypeCode APIs require.
-//
-// NOTE: This isn't well tuned performance-wise.  Given how much is
-// variable (byte order, alignment) it's clear tuning has its limits
-// with respect to CDR bytecode interpretation.
-//
-// THREADING NOTE: Typecodes are readonly data structures, and the
-// only mutual exclusion relates to reference counting and
-// construction.
-
-#include "tao/Typecode.h"
-#include "tao/Environment.h"
-#include "tao/Any.h"
-#include "tao/Exception.h"
-#include "tao/CDR_Interpreter.h"
-#include "tao/Principal.h"
-#include "tao/debug.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Typecode.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, Typecode, "$Id$")
-
-CORBA_TypeCode::Bounds::Bounds (void)
-  : CORBA_UserException (CORBA::TypeCode::_tc_Bounds)
-{
-}
-
-void
-CORBA_TypeCode::Bounds::_raise (void)
-{
-  TAO_RAISE(*this);
-}
-
-CORBA_TypeCode::Bounds*
-CORBA_TypeCode::Bounds::_narrow (CORBA_Exception *ex)
-{
-  if (ex->_is_a ("IDL:omg.orb/CORBA/TypeCode/Bounds:1.0"))
-    return ACE_dynamic_cast (CORBA_TypeCode::Bounds*, ex);
-  return 0;
-}
-
-int
-CORBA_TypeCode::Bounds::_is_a (const char* interface_id) const
-{
-  return ((ACE_OS::strcmp (interface_id,
-			  "IDL:omg.orb/CORBA/TypeCode/Bounds:1.0") ==
-	   0)
-	  || CORBA_UserException::_is_a (interface_id));
-}
-
-CORBA_TypeCode::BadKind::BadKind (void)
-  : CORBA_UserException (CORBA::TypeCode::_tc_BadKind)
-{
-}
-
-void
-CORBA_TypeCode::BadKind::_raise (void)
-{
-  TAO_RAISE(*this);
-}
-
-CORBA_TypeCode::BadKind*
-CORBA_TypeCode::BadKind::_narrow (CORBA_Exception *ex)
-{
-  if (ex->_is_a ("IDL:omg.orb/CORBA/TypeCode/BadKind:1.0"))
-    return ACE_dynamic_cast (CORBA_TypeCode::BadKind*, ex);
-  return 0;
-}
-
-int
-CORBA_TypeCode::BadKind::_is_a (const char* interface_id) const
-{
-  return ((ACE_OS::strcmp (interface_id,
-			  "IDL:omg.orb/CORBA/TypeCode/BadKind:1.0") ==
-	   0)
-	  || CORBA_UserException::_is_a (interface_id));
-}
-
-// decreases the refcount and deletes when refcount reaches 0
-
-// Constructor for CONSTANT typecodes with empty parameter lists.
-// These are only created once, and those constants are shared.
-
-CORBA_TypeCode::CORBA_TypeCode (CORBA::TCKind kind)
-  : length_ (0),
-    buffer_ (0),
-    byte_order_ (0),
-    kind_ (kind),
-    parent_ (0),
-    tc_base_ (0),
-    root_tc_base_ (0),
-    refcount_ (1),
-    orb_owns_ (1),
-    private_state_ (new TC_Private_State (kind)),
-    non_aligned_buffer_ (0)
-{
-  // all these are simple typecodes and the comparison is based solely on
-  this->private_state_->tc_size_known_ = 1;
-  switch (this->kind_)
-    {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-      this->private_state_->tc_size_ = 0;
-      break;
-    case CORBA::tk_short:
-      this->private_state_->tc_size_ = sizeof (CORBA::Short);
-      break;
-    case CORBA::tk_ushort:
-      this->private_state_->tc_size_ = sizeof (CORBA::UShort);
-      break;
-    case CORBA::tk_long:
-      this->private_state_->tc_size_ = sizeof (CORBA::Long);
-      break;
-    case CORBA::tk_ulong:
-      this->private_state_->tc_size_ = sizeof (CORBA::ULong);
-      break;
-    case CORBA::tk_float:
-      this->private_state_->tc_size_ = sizeof (CORBA::Float);
-      break;
-    case CORBA::tk_double:
-      this->private_state_->tc_size_ = sizeof (CORBA::Double);
-      break;
-    case CORBA::tk_longlong:
-      this->private_state_->tc_size_ = sizeof (CORBA::LongLong);
-      break;
-    case CORBA::tk_ulonglong:
-      this->private_state_->tc_size_ = sizeof (CORBA::ULongLong);
-      break;
-    case CORBA::tk_longdouble:
-      this->private_state_->tc_size_ = sizeof (CORBA::LongDouble);
-      break;
-    case CORBA::tk_boolean:
-      this->private_state_->tc_size_ = sizeof (CORBA::Boolean);
-      break;
-    case CORBA::tk_octet:
-      this->private_state_->tc_size_ = sizeof (CORBA::Octet);
-      break;
-    case CORBA::tk_char:
-      this->private_state_->tc_size_ = sizeof (CORBA::Char);
-      break;
-    case CORBA::tk_wchar:
-      this->private_state_->tc_size_ = sizeof (CORBA::WChar);
-      break;
-    case CORBA::tk_TypeCode:
-      this->private_state_->tc_size_ = sizeof (CORBA::TypeCode_ptr);
-      break;
-    case CORBA::tk_Principal:
-      this->private_state_->tc_size_ = sizeof (CORBA::Principal);
-      break;
-    case CORBA::tk_any:
-      this->private_state_->tc_size_ = sizeof (CORBA::Any);
-      break;
-    default:
-      // we should never be here
-      this->private_state_->tc_size_known_ = 0;
-      break;
-    }
-}
-
-// Constructor for all other typecodes, including constants with
-// non-empty parameter lists.  See "corba.hh" for details.
-
-CORBA_TypeCode::CORBA_TypeCode (CORBA::TCKind kind,
-                                size_t length,
-                                const char *buffer,
-                                CORBA::Boolean orb_owns_tc,
-                                CORBA::ULong size,
-                                CORBA::TypeCode_ptr parent)
-  //  : length_ (length - 4),
-  : length_ (length),
-    kind_ (kind),
-    parent_ (parent),
-    refcount_ (1),
-    orb_owns_ (orb_owns_tc),
-    private_state_ (new TC_Private_State (kind)),
-    non_aligned_buffer_ (0)
-{
-  // The CDR code used to interpret TypeCodes requires in-memory
-  // alignments to match the "on-the-wire" alignments, simplifying
-  // algorithms used to marshal/unmarshal.
-  //
-  // However, it's often hard to get compilers (in particular) to
-  // generate data that's so aligned, since C++ doesn't provide
-  // primitives giving control at that low a level.  Although there
-  // are ways to get that alignment which work in almost all cases, we
-  // need to ensure adequate alignment in _all_ cases.
-  //
-  // This code exists to ensure such alignment; since the constructor
-  // is intended only for use by an IDL compiler or ORB code, it's not
-  // currently a priority to ensure the allocated code is freed.
-
-  // TAO comments:
-
-  // For free standing typecodes, we choose to always make a copy of
-  // the buffer passed in. That way, our destructor doesn't have to
-  // deal with the case where the buffer was either allocated in which
-  // case it must be freed or the case where our buffer just points to
-  // the buffer passed in.
-
-  if (this->parent_ == 0)
-    {
-      // Allocate a buffer to hold the encapsulated stream. We
-      // allocate extra space since we need a buffer that is aligned
-      // on a 4 byte word boundary. As a result, it is quite possible
-      // that we may start accessing the buffer from a position
-      // shifted to the right in the allocated buffer. As a result,
-      // during destruction, we do not want part of the allocated heap
-      // to remain dangling. Hence we save a handle to the original
-      // allocated buffer.
-
-      // *NOTE* that the buffer parameter is simply our encapsulation. It does
-      // not contain our TypeCode::kind () and the length. These are passed as
-      // separate parameters. However, in case of indirected typecodes, the
-      // offset value for the indirection will effectively point to the tk_kind
-      // field in our CDR representation. Hence, we introduce a new field
-      // called tc_base_ which represents the start of our CDR
-      // representation. The buffer_ data member will point to our
-      // encapsulation.
-
-      // @@ The typecode buffer contain the encapsulation byte order
-      // in the first byte...
-      const CORBA::Octet *ptr =
-        ACE_reinterpret_cast (const CORBA::Octet *,
-                              buffer);
-      this->byte_order_ = *ptr;
-
-      // allocate a buffer which will accomodate our entire encapsulation plus
-      // 4 bytes for our tk_kind value and 4 bytes for our encapsulation
-      // length. The extra MAX_ALIGNMENT bytes are necessary to ensure that we
-      // will get a properly aligned buffer.
-
-      ACE_NEW (this->non_aligned_buffer_,
-               char [this->length_ + 4 + 4 + ACE_CDR::MAX_ALIGNMENT]);
-
-      char* start = ptr_align_binary (this->non_aligned_buffer_,
-                                      ACE_CDR::MAX_ALIGNMENT);
-
-      (void) ACE_OS::memcpy (start, &this->kind_, 4);
-      (void) ACE_OS::memcpy (start + 4, &this->length_, 4);
-      (void) ACE_OS::memcpy (start + 8, buffer, this->length_);
-      // we are the topmost level typecode and hence our typecode base is
-      // the start whereas the buffer_ which represents the encapsulation is 8
-      // bytes ahead of the typecode base
-      this->tc_base_ = start;
-      // since we do not have any parents, we are the root
-      this->root_tc_base_ = start;
-      this->buffer_ = start + 4 + 4;
-      this->private_state_->tc_size_known_ = 1;
-      this->private_state_->tc_size_ = size;
-    }
-  else
-    {
-      // We are a child. We do not allocate a new buffer, but share it
-      // with our parent. We know that our parent's buffer was
-      // properly aligned.
-      const CORBA::Octet *ptr =
-        ACE_reinterpret_cast (const CORBA::Octet *, buffer);
-      this->byte_order_ = *ptr;
-
-      this->buffer_ = buffer;
-      // our typecode base is 8 bytes prior to our encapsulation and our root
-      // base is the same as that of our parent's
-      this->tc_base_ = this->buffer_ - 8;
-      this->root_tc_base_ = parent->root_tc_base_;
-    }
-}
-
-// Destructor.  For "indirected" typecodes and children, the typecode
-// reuses the buffer owned by its parent.
-
-CORBA_TypeCode::~CORBA_TypeCode (void)
-{
-  // Delete the original, possibly nonaligned, buffer.
-  if (this->non_aligned_buffer_ != 0)
-    {
-      delete [] this->non_aligned_buffer_;
-      this->non_aligned_buffer_ = 0;
-    }
-  this->buffer_ = 0;
-
-  // Free up our private state (if any)
-  if (this->private_state_)
-    {
-      delete this->private_state_;
-      this->private_state_ = 0;
-    }
-}
-
-// Returns true if the two unaliased typecodes are equal.
-CORBA::Boolean
-CORBA_TypeCode::equivalent (CORBA::TypeCode_ptr tc,
-			    CORBA::Environment &ACE_TRY_ENV) const
-{
-  const CORBA::TypeCode* rcvr = this;
-  CORBA::Boolean status = 0;
-
-  if (this->kind_ == CORBA::tk_alias)
-    {
-      rcvr = this->content_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      status = (rcvr->kind (ACE_TRY_ENV) == CORBA::tk_alias);
-      ACE_CHECK_RETURN (0);
-
-      while (status)
-        {
-          rcvr = rcvr->content_type (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-          status = (rcvr->kind (ACE_TRY_ENV) == CORBA::tk_alias);
-          ACE_CHECK_RETURN (0);
-        }
-    }
-
-  status = (tc->kind (ACE_TRY_ENV) == CORBA::tk_alias);
-  ACE_CHECK_RETURN (0);
-
-  while (status)
-    {
-      tc = tc->content_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      status = (tc->kind (ACE_TRY_ENV) == CORBA::tk_alias);
-      ACE_CHECK_RETURN (0);
-    }
-
-  return rcvr->equal (tc, ACE_TRY_ENV);
-}
-
-// Return the i-th member typecode if it exists, else raise an
-// exception. Possible exceptions are BadKind and Bounds.
-//
-// Applicable only to struct, union, and except
-
-CORBA::TypeCode_ptr
-CORBA_TypeCode::member_type (CORBA::ULong slot,
-                             CORBA::Environment &ACE_TRY_ENV) const
-{
-  if (this->private_state_->tc_member_count_known_
-      && this->private_state_->tc_member_type_list_known_)
-    {
-      if (slot < this->private_state_->tc_member_count_)
-        return this->private_state_->tc_member_type_list_[slot];
-      else
-        ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-    }
-  else
-    return this->private_member_type (slot, ACE_TRY_ENV);
-}
-
-// Applicable only to struct, union, and except
-
-const char *
-CORBA_TypeCode::member_name (CORBA::ULong slot,
-                             CORBA::Environment &ACE_TRY_ENV) const
-{
-  if (this->private_state_->tc_member_count_known_
-      && this->private_state_->tc_member_name_list_known_)
-    {
-      if (slot < this->private_state_->tc_member_count_)
-        return this->private_state_->tc_member_name_list_[slot];
-      else
-        ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-    }
-  else
-    return this->private_member_name (slot, ACE_TRY_ENV);
-}
-
-// Return the label of the i-th member.  Applicable only to CORBA::tk_union
-CORBA::Any_ptr
-CORBA_TypeCode::member_label (CORBA::ULong slot,
-                              CORBA::Environment &ACE_TRY_ENV) const
-{
-  if (this->private_state_->tc_member_count_known_
-      && this->private_state_->tc_member_label_list_known_)
-    {
-      if (slot < this->private_state_->tc_member_count_)
-        return this->private_state_->tc_member_label_list_[slot];
-      else
-        ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-    }
-  else
-    return this->private_member_label (slot, ACE_TRY_ENV);
-}
-
-// only applicable to CORBA::tk_unions
-CORBA::TypeCode_ptr
-CORBA_TypeCode::discriminator_type (CORBA::Environment &ACE_TRY_ENV) const
-{
-  if (this->kind_ != CORBA::tk_union)
-    ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), (CORBA::TypeCode_ptr)0);
-
-  if (this->private_state_->tc_discriminator_type_known_)
-    return this->private_state_->tc_discriminator_type_;
-  else
-    return this->private_discriminator_type (ACE_TRY_ENV);
-}
-
-// only applicable to CORBA::tk_unions
-CORBA::Long
-CORBA_TypeCode::default_index (CORBA::Environment &ACE_TRY_ENV) const
-{
-  if (this->kind_ != CORBA::tk_union)
-    ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
-
-  if (this->private_state_->tc_default_index_used_known_)
-    return this->private_state_->tc_default_index_used_;
-  else
-    return this->private_default_index (ACE_TRY_ENV);
-}
-
-// returns the length. Applicable only to string, sequence, and arrays
-CORBA::ULong
-CORBA_TypeCode::length (CORBA::Environment &ACE_TRY_ENV) const
-{
-  // a switch stmt, unfortunately, doesn't get inlined
-  if (this->kind_ == CORBA::tk_sequence
-      || this->kind_ == CORBA::tk_array
-      || this->kind_ == CORBA::tk_string
-      || this->kind_ == CORBA::tk_wstring)
-    {
-      if (this->private_state_->tc_length_known_)
-        return this->private_state_->tc_length_;
-      else
-        return this->private_length (ACE_TRY_ENV);
-    }
-  else
-    ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
-}
-
-// returns the typecode. Applicable only to string, sequence, and arrays
-CORBA::TypeCode_ptr
-CORBA_TypeCode::content_type (CORBA::Environment &ACE_TRY_ENV) const
-{
-  if (this->kind_ == CORBA::tk_sequence
-      || this->kind_ == CORBA::tk_array
-      || this->kind_ == CORBA::tk_alias)
-    {
-      if (this->private_state_->tc_content_type_known_)
-        return this->private_state_->tc_content_type_;
-      else
-        return this->private_content_type (ACE_TRY_ENV);
-    }
-  else
-    ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
-}
-
-// compute the padded size of the discriminant
-CORBA::ULong
-CORBA_TypeCode::TAO_discrim_pad_size (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (this->kind_ != CORBA::tk_union)
-    ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
-
-  if (this->private_state_->tc_discrim_pad_size_known_)
-    return this->private_state_->tc_discrim_pad_size_;
-  else
-    return this->private_discrim_pad_size (ACE_TRY_ENV);
-}
-
-// skip a typecode encoding in a given CDR stream
-// This is just a helper function
-CORBA::Boolean
-CORBA_TypeCode::skip_typecode (TAO_InputCDR &stream)
-{
-  CORBA::ULong kind;
-  CORBA::ULong temp;
-
-  if (stream.read_ulong (kind)
-      && (kind < CORBA::TC_KIND_COUNT || kind == ~0u))
-    {
-
-      switch (kind)
-        {
-          // Most TypeCodes have empty parameter lists, nothing to skip
-        default:
-          break;
-
-          // Some have single integer parameters, easy to skip.  Some have
-          // preallocated constants that could be used.
-        case CORBA::tk_string:
-        case CORBA::tk_wstring:
-        case ~0u:
-          return stream.read_ulong (temp);
-
-          // The rest have "complex" parameter lists that are
-          // encoded as bulk octets ... just skip them.
-        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:
-          return (stream.read_ulong (temp) != 0
-                  && stream.skip_bytes (temp) != 0);
-        }
-
-      return 1;
-    }
-  else
-    return 0;
-}
-
-// constructor for the private state
-TC_Private_State::TC_Private_State (CORBA::TCKind kind)
-  : tc_kind_ (kind),
-    tc_id_known_ (0),
-    tc_name_known_ (0),
-    tc_member_count_known_ (0),
-    tc_member_type_list_known_ (0),
-    tc_member_name_list_known_ (0),
-    tc_member_label_list_known_ (0),
-    tc_discriminator_type_known_ (0),
-    tc_default_index_used_known_ (0),
-    tc_length_known_ (0),
-    tc_content_type_known_ (0),
-    tc_size_known_ (0),
-    tc_alignment_known_ (0),
-    tc_discrim_pad_size_known_ (0),
-    tc_id_ (0),
-    tc_name_ (0),
-    tc_member_count_ (0),
-    tc_member_type_list_ (0),
-    tc_member_name_list_ (0),
-    tc_member_label_list_ (0),
-    tc_discriminator_type_ (0),
-    tc_default_index_used_ (0),
-    tc_length_ (0),
-    tc_content_type_ (0),
-    tc_size_ (0),
-    tc_alignment_ (0),
-    tc_discrim_pad_size_ (0)
-{
-}
-
-// destructor for the private state. In effect, this cleans up all the children
-// and the subtree we hold.
-TC_Private_State::~TC_Private_State (void)
-{
-  // the following just point into the buffer. So we just make it
-  // point to 0
-  this->tc_id_ = 0;
-
-  if (this->tc_name_ != 0)
-    {
-      CORBA::string_free (this->tc_name_);
-      this->tc_name_ = 0;
-    }
-
-  // determine what kind of children we may have and free the space accordingly
-  switch (this->tc_kind_)
-    {
-      case CORBA::tk_enum:
-          // free up the member name list
-          if (this->tc_member_name_list_known_)
-            {
-              for (CORBA::ULong i = 0;
-                   i < this->tc_member_count_;
-                   i++)
-	              {
-		              CORBA::string_free (this->tc_member_name_list_ [i]);
-		              this->tc_member_name_list_ [i] = 0;
-	              }
-
-              delete [] this->tc_member_name_list_;
-	            this->tc_member_name_list_ = 0;
-            }
-          break;
-
-      case CORBA::tk_struct:
-      case CORBA::tk_except:
-        {
-          // free up the member name list
-          if (this->tc_member_name_list_known_)
-            {
-              for (CORBA::ULong i = 0;
-                   i < this->tc_member_count_;
-                   i++)
-	              {
-		              CORBA::string_free (this->tc_member_name_list_ [i]);
-		              this->tc_member_name_list_ [i] = 0;
-	              }
-
-              delete [] this->tc_member_name_list_;
-	            this->tc_member_name_list_ = 0;
-            }
-
-          // free up member type list
-          if (this->tc_member_type_list_known_)
-            {
-              for (CORBA::ULong i = 0;
-                   i < this->tc_member_count_;
-                   i++)
-	              {
-		              CORBA::release (this->tc_member_type_list_[i]);
-	              }
-
-              // Now free up the array.
-              delete [] this->tc_member_type_list_;
-	            this->tc_member_type_list_ = 0;
-            }
-          this->tc_member_count_ = 0;
-        }
-        break;
-
-      case CORBA::tk_sequence:
-      case CORBA::tk_array:
-      case CORBA::tk_alias:
-        // Delete the content type only if it has a parent i.e., if it
-        // is not acquired from the pool of constant or predefined
-        // typecodes.
-        if (this->tc_content_type_known_ && this->tc_content_type_ != 0)
-	        {
-	          CORBA::release (this->tc_content_type_);
-	          this->tc_content_type_ = 0;
-	        }
-        break;
-
-      case CORBA::tk_union:
-        {
-          // free up the member name list
-          if (this->tc_member_name_list_known_)
-            {
-              for (CORBA::ULong i = 0;
-                   i < this->tc_member_count_;
-                   i++)
-	              {
-		              CORBA::string_free (this->tc_member_name_list_ [i]);
-		              this->tc_member_name_list_ [i] = 0;
-	              }
-
-              delete [] this->tc_member_name_list_;
-            }
-
-          // Free up type list, label list, and finally the discriminator
-          if (this->tc_member_type_list_known_)
-            {
-              for (CORBA::ULong i = 0;
-                   i < this->tc_member_count_;
-                   i++)
-	              {
-                  CORBA::release (this->tc_member_type_list_[i]);
-	              }
-
-              // Now free up the array.
-              delete [] this->tc_member_type_list_;
-	            this->tc_member_type_list_ = 0;
-            }
-          if (this->tc_member_label_list_known_)
-            {
-              for (CORBA::ULong i = 0;
-                   i < this->tc_member_count_;
-                   i++)
-                // Free up the label (Any_ptr).
-                delete this->tc_member_label_list_[i];
-
-              delete [] this->tc_member_label_list_;
-	            this->tc_member_label_list_ = 0;
-            }
-          this->tc_member_count_ = 0;
-
-          // Discriminator must come last b/c it will be inside the Any
-          // in each element of the label list.
-          CORBA::release (this->tc_discriminator_type_);
-	        this->tc_discriminator_type_ = 0;
-        }
-        break;
-
-      default:
-        // nothing to do
-        break;
-    }
-}
-
-// check if typecodes are equal. Equality is based on a mix of structural and
-// name equivalence i.e., if names are provided, we also check for name
-// equivalence, else resort simply to structural equivalence.
-CORBA::Boolean
-CORBA_TypeCode::private_equal (CORBA::TypeCode_ptr tc,
-                               CORBA::Environment &ACE_TRY_ENV) const
-{
-  // We come in here only if the typecode kinds of both are same
-  // Handle each complex typecode separately.
-  switch (this->kind_)
-    {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-    case CORBA::tk_longdouble:
-    case CORBA::tk_boolean:
-    case CORBA::tk_octet:
-    case CORBA::tk_char:
-    case CORBA::tk_wchar:
-    case CORBA::tk_TypeCode:
-    case CORBA::tk_Principal:
-    case CORBA::tk_any:
-      // all these are simple typecodes and the comparison is based solely on
-      // the kind_ field
-      return 1;
-    case CORBA::tk_objref:
-      return this->private_equal_objref (tc, ACE_TRY_ENV);
-    case CORBA::tk_struct:
-      return this->private_equal_struct (tc, ACE_TRY_ENV);
-    case CORBA::tk_union:
-      return this->private_equal_union (tc, ACE_TRY_ENV);
-    case CORBA::tk_enum:
-      return this->private_equal_enum (tc, ACE_TRY_ENV);
-    case CORBA::tk_string:
-      return this->private_equal_string (tc, ACE_TRY_ENV);
-    case CORBA::tk_wstring:
-      return this->private_equal_wstring (tc, ACE_TRY_ENV);
-    case CORBA::tk_sequence:
-      return this->private_equal_sequence (tc, ACE_TRY_ENV);
-    case CORBA::tk_array:
-      return this->private_equal_array (tc, ACE_TRY_ENV);
-    case CORBA::tk_alias:
-      return this->private_equal_alias (tc, ACE_TRY_ENV);
-    case CORBA::tk_except:
-      return this->private_equal_except (tc, ACE_TRY_ENV);
-    case ~0u: // indirection
-      {
-        // indirection offset must be same
-        return 1;
-      }
-      ACE_NOTREACHED (break);
-    default:
-      return 0;
-    }
-}
-
-CORBA::Boolean
-CORBA_TypeCode::private_equal_objref (CORBA::TypeCode_ptr tc,
-                                      CORBA::Environment &ACE_TRY_ENV) const
-{
-  // compare the repoID and name, of which the name is optional as per GIOP
-  // spec. However, the repoID is mandatory.
-  const char *my_id = this->id (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  const char *tc_id = tc->id (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  if (!ACE_OS::strcmp (my_id, tc_id))
-    {
-      // same repository IDs. Now check their names
-      const char *myname = this->name (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      const char *tcname = tc->name (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if ((ACE_OS::strlen (myname) > 1) &&
-          (ACE_OS::strlen (tcname) > 1))
-        {
-          // both of them specify names, compare them
-          if (!ACE_OS::strcmp (myname, tcname))
-            return 1; // success
-          else
-            return 0; // failed
-        }
-      return 1; // equal (success)
-    }
-  return 0; // failed
-}
-
-CORBA::Boolean
-CORBA_TypeCode::private_equal_struct (CORBA::TypeCode_ptr tc,
-                                      CORBA::Environment &ACE_TRY_ENV) const
-{
-  // for structs the repoID and names are optional. However, if provided, we
-  // must compare them
-  const char *my_id = this->id (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  const char *tc_id = tc->id (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  const char *my_name = this->name (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  const char *tc_name = tc->name (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  // compare repoIDs if they exist
-  if (ACE_OS::strlen (my_id) > 1
-      && ACE_OS::strlen (tc_id) > 1
-      && ACE_OS::strcmp (my_id, tc_id)) // not same
-    return 0;
-
-  // Compare names if they exist.
-  if (ACE_OS::strlen (my_name) > 1
-      && ACE_OS::strlen (tc_name) > 1
-      && ACE_OS::strcmp (my_name, tc_name)) // not same
-    return 0;
-
-  // Check if the member count is same.
-  CORBA::ULong my_count = this->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::ULong tc_count = tc->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  if (my_count != tc_count)
-    return 0; // number of members don't match
-
-  for (CORBA::ULong i=0; i < my_count; i++)
-    {
-      const char *my_member_name =
-        this->member_name (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      const char *tc_member_name =
-        tc->member_name (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (ACE_OS::strlen (my_member_name) > 1
-          && ACE_OS::strlen (tc_member_name) > 1
-          && ACE_OS::strcmp (my_member_name, tc_member_name)) // not same
-        return 0;
-
-      // now compare the typecodes of the members
-      CORBA::TypeCode_ptr my_member_tc = this->member_type (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TypeCode_ptr tc_member_tc = tc->member_type (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::Boolean flag =
-        my_member_tc->equal (tc_member_tc, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-      if (!flag)
-        return 0;
-    }
-
-  return 1; // success (equal)
-}
-
-CORBA::Boolean
-CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
-                                     CORBA::Environment &ACE_TRY_ENV) const
-{
-  // For unions the repoID and names are optional. However, if
-  // provided, we must compare them.
-  const char *my_id = this->id (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  const char *tc_id = tc->id (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  const char *my_name = this->name (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  const char *tc_name = tc->name (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  // compare repoIDs if they exist
-  if (ACE_OS::strlen (my_id) > 1
-      && ACE_OS::strlen (tc_id) > 1
-      && ACE_OS::strcmp (my_id, tc_id)) // not same
-    return 0;
-
-  // compare names if they exist
-  if (ACE_OS::strlen (my_name) > 1
-      && ACE_OS::strlen (tc_name) > 1
-      && ACE_OS::strcmp (my_name, tc_name)) // not same
-    return 0;
-
-  // check if the discriminant type is same
-  CORBA::TypeCode_ptr my_discrim = this->discriminator_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::TypeCode_ptr tc_discrim = tc->discriminator_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  int status = my_discrim->equal (tc_discrim, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  if (!status)
-    return 0;
-
-  // check the default used
-  CORBA::Long my_default = this->default_index (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Long tc_default = tc->default_index (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  if (my_default != tc_default)
-    return 0;
-
-  // check if the member count is same
-  CORBA::ULong my_count = this->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::ULong tc_count = tc->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  if (my_count != tc_count)
-    return 0; // number of members don't match
-
-  for (CORBA::ULong i=0; i < my_count; i++)
-    {
-      // First check if labels are same.
-
-      // check if member names are same
-      const char *my_member_name = this->member_name (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      const char *tc_member_name = tc->member_name (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (ACE_OS::strlen (my_member_name) > 1 && ACE_OS::strlen
-          (tc_member_name) > 1)
-        // both specify member names
-        if (ACE_OS::strcmp (my_member_name, tc_member_name)) // not same
-          return 0;
-
-      // now compare the typecodes of the members
-      CORBA::TypeCode_ptr my_member_tc = this->member_type (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TypeCode_ptr tc_member_tc = tc->member_type (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::Boolean flag = my_member_tc->equal (tc_member_tc, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-      if (!flag)
-        return 0;
-    }
-
-  return 1; // success (equal)
-}
-
-CORBA::Boolean
-CORBA_TypeCode::private_equal_enum (CORBA::TypeCode_ptr tc,
-                                    CORBA::Environment &ACE_TRY_ENV) const
-{
-  // for enum the repoID and names are optional. However, if provided, we
-  // must compare them
-  const char *my_id = this->id (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  const char *tc_id = tc->id (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  const char *my_name = this->name (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  const char *tc_name = tc->name (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  // compare repoIDs if they exist
-  if (ACE_OS::strlen (my_id) > 1 && ACE_OS::strlen (tc_id) > 1)
-    if (ACE_OS::strcmp (my_id, tc_id)) // not same
-      return 0;
-
-  // compare names if they exist
-  if (ACE_OS::strlen (my_name) > 1 && ACE_OS::strlen (tc_name) > 1)
-    if (ACE_OS::strcmp (my_name, tc_name)) // not same
-      return 0;
-
-  // check if the member count is same
-  CORBA::ULong my_count = this->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::ULong tc_count = tc->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  if (my_count != tc_count)
-    return 0; // number of members don't match
-
-  for (CORBA::ULong i=0; i < my_count; i++)
-    {
-      // now check if the member names are same
-      const char *my_member_name = this->member_name (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      const char *tc_member_name = tc->member_name (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (ACE_OS::strlen (my_member_name) > 1 && ACE_OS::strlen
-          (tc_member_name) > 1)
-        // both specify member names
-        if (ACE_OS::strcmp (my_member_name, tc_member_name)) // not same
-          return 0;
-    }
-
-  return 1; // success (equal)
-}
-
-CORBA::Boolean
-CORBA_TypeCode::private_equal_string (CORBA::TypeCode_ptr tc,
-                                      CORBA::Environment &ACE_TRY_ENV) const
-{
-  // compare the lengths
-  CORBA::ULong my_len = this->length (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::ULong tc_len = tc->length (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return (my_len == tc_len);
-}
-
-CORBA::Boolean
-CORBA_TypeCode::private_equal_wstring (CORBA::TypeCode_ptr tc,
-                                       CORBA::Environment &ACE_TRY_ENV) const
-{
-  // compare the lengths
-  CORBA::ULong my_len = this->length (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::ULong tc_len = tc->length (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return (my_len == tc_len);
-}
-
-CORBA::Boolean
-CORBA_TypeCode::private_equal_sequence (CORBA::TypeCode_ptr tc,
-                                        CORBA::Environment &ACE_TRY_ENV) const
-{
-  // this involves comparing the typecodes of the element type as well as the
-  // bounds
-  CORBA::TypeCode_ptr my_elem = this->content_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::TypeCode_ptr tc_elem = tc->content_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  int status = my_elem->equal (tc_elem, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  if (!status)
-    return 0;
-
-  // now check if bounds are same
-  CORBA::ULong my_len = this->length (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::ULong tc_len = tc->length (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return (my_len == tc_len);
-}
-
-CORBA::Boolean
-CORBA_TypeCode::private_equal_array (CORBA::TypeCode_ptr tc,
-                                     CORBA::Environment &ACE_TRY_ENV) const
-{
-  // exactly like sequence
-  return this->private_equal_sequence (tc, ACE_TRY_ENV);
-}
-
-CORBA::Boolean
-CORBA_TypeCode::private_equal_alias (CORBA::TypeCode_ptr tc,
-                                     CORBA::Environment &ACE_TRY_ENV) const
-{
-  // for structs the repoID and names are optional. However, if provided, we
-  // must compare them
-  const char *my_id = this->id (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  const char *tc_id = tc->id (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  const char *my_name = this->name (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  const char *tc_name = tc->name (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  // compare repoIDs if they exist
-  if (ACE_OS::strlen (my_id) > 1 && ACE_OS::strlen (tc_id) > 1)
-    if (ACE_OS::strcmp (my_id, tc_id)) // not same
-      return 0;
-
-  // compare names if they exist
-  if (ACE_OS::strlen (my_name) > 1 && ACE_OS::strlen (tc_name) > 1)
-    if (ACE_OS::strcmp (my_name, tc_name)) // not same
-      return 0;
-
-  // now compare element typecodes
-  CORBA::TypeCode_ptr my_elem = this->content_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::TypeCode_ptr tc_elem = tc->content_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return my_elem->equal (tc_elem, ACE_TRY_ENV);
-}
-
-CORBA::Boolean
-CORBA_TypeCode::private_equal_except (CORBA::TypeCode_ptr tc,
-                                      CORBA::Environment &ACE_TRY_ENV) const
-{
-  // exactly similar to structs, except that the repository ID is mandatory
-
-  const char *my_id = this->id (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  const char *tc_id = tc->id (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  if (ACE_OS::strcmp (my_id, tc_id))
-    return 0; // failed
-
-  // now compare names. They may be optional
-  const char *my_name = this->name (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  const char *tc_name = tc->name (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  // compare names if they exist
-  if (ACE_OS::strlen (my_name) > 1 && ACE_OS::strlen (tc_name) > 1)
-    if (ACE_OS::strcmp (my_name, tc_name)) // not same
-      return 0;
-
-  // check if the member count is same
-  CORBA::ULong my_count = this->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::ULong tc_count = tc->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  if (my_count != tc_count)
-    return 0; // number of members don't match
-
-  for (CORBA::ULong i=0; i < my_count; i++)
-    {
-      const char *my_member_name = this->member_name (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      const char *tc_member_name = tc->member_name (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (ACE_OS::strlen (my_member_name) > 1 && ACE_OS::strlen
-          (tc_member_name) > 1)
-        // both specify member names
-        if (ACE_OS::strcmp (my_member_name, tc_member_name)) // not same
-          return 0;
-
-      // now compare the typecodes of the members
-      CORBA::TypeCode_ptr my_member_tc = this->member_type (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TypeCode_ptr tc_member_tc = tc->member_type (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::Boolean flag = my_member_tc->equal (tc_member_tc, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-      if (!flag)
-        return 0;
-    }
-
-  return 1; // success (equal)
-}
-
-// Return the type ID (RepositoryId) for the TypeCode; it may be empty.
-//
-// NOTE the string returned here is owned by the typecode!!
-//
-// Valid only for objref, struct, union, enum, alias, and except. Raises
-// BadKind exception for the rest of the cases.
-const char *
-CORBA_TypeCode::private_id (CORBA::Environment &ACE_TRY_ENV) const
-{
-  switch (this->kind_)
-    {
-      // These are all complex typecodes, which have as their first
-      // parameter (number zero) a repository/type ID string encoded
-      // per CDR rules.  That means we can just return a pointer to
-      // that string directly!
-
-    case CORBA::tk_objref:
-    case CORBA::tk_struct:
-    case CORBA::tk_union:
-    case CORBA::tk_enum:
-    case CORBA::tk_alias:
-    case CORBA::tk_except:
-      {
-        // Double checked locking...
-        ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard,
-                          this->private_state_->mutex_, 0);
-        if (this->private_state_->tc_id_known_)
-          return this->private_state_->tc_id_;
-
-        this->private_state_->tc_id_known_ = 1;
-        this->private_state_->tc_id_ = (CORBA::String) (buffer_
-                                                 + 4    // skip byte order flag
-                                                        // and padding
-                                                 + 4);  // skip (strlen + 1)
-        return this->private_state_->tc_id_; // this is OK because the strings in the
-                                       // CDR stream are NULL terminated
-      }
-    // No other typecodes ever have type IDs
-    default:
-      ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
-    }
-}
-
-// return the name. The string is owned by the typecode
-const char *
-CORBA_TypeCode::private_name (CORBA::Environment &ACE_TRY_ENV) const
-{
-  switch (this->kind_)
-    {
-      // These are all complex typecodes, which have as their second
-      // parameter (number one) a name string encoded per CDR rules.
-      // That means we can just return a pointer to that string
-      // directly!
-
-    case CORBA::tk_objref:
-    case CORBA::tk_struct:
-    case CORBA::tk_union:
-    case CORBA::tk_enum:
-    case CORBA::tk_alias:
-    case CORBA::tk_except:
-      {
-        // Double checked locking...
-        ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard,
-                          this->private_state_->mutex_, 0);
-        if (this->private_state_->tc_name_known_)
-          return this->private_state_->tc_name_;
-
-        // setup an encapsulation.
-        TAO_InputCDR stream (this->buffer_ + 4,
-                             this->length_ - 4,
-                             this->byte_order_);
-
-        // skip the typecode ID
-        if (stream.skip_string ())  // ID
-          {
-            this->private_state_->tc_name_known_ = 1;
-
-            // "Read" the string without copying.
-            stream.read_string (this->private_state_->tc_name_);
-
-            return this->private_state_->tc_name_;
-          }
-        else
-          ACE_THROW_RETURN (CORBA::INTERNAL (), (CORBA::String)0);
-      }
-    // No other typecodes ever have type IDs.
-    default:
-      ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), (CORBA::String)0);
-    }
-  ACE_NOTREACHED (return 0);
-}
-
-// Return the number of members defined by this typecode
-//
-// Applicable to struct, union, enum, alias, and except
-// For the rest of the cases, raises the BadKind exception.
-
-CORBA::ULong
-CORBA_TypeCode::private_member_count (CORBA::Environment &ACE_TRY_ENV) const
-{
-  switch (kind_)
-    {
-    case CORBA::tk_alias:
-      return 1;
-
-    case CORBA::tk_enum:
-    case CORBA::tk_except:
-    case CORBA::tk_struct:
-      {
-        // Double checked locking...
-        ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard,
-                          this->private_state_->mutex_, 0);
-        if (this->private_state_->tc_member_count_known_)
-          return this->private_state_->tc_member_count_;
-
-        CORBA::ULong members;
-        // setup an encapsulation
-        TAO_InputCDR stream (this->buffer_+4, this->length_-4,
-                             this->byte_order_);
-
-        // skip rest of header (type ID and name) and collect the
-        // number of struct members
-        if (!stream.skip_string ()          // ID
-            || !stream.skip_string ()       // struct name
-            || !stream.read_ulong (members))
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-
-        this->private_state_->tc_member_count_known_ = 1;
-        this->private_state_->tc_member_count_ = members;
-        return this->private_state_->tc_member_count_;
-      }
-    case CORBA::tk_union:
-      {
-        // Double checked locking...
-        ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard,
-                          this->private_state_->mutex_, 0);
-        if (this->private_state_->tc_member_count_known_)
-          return this->private_state_->tc_member_count_;
-
-        CORBA::ULong members;
-        // setup an encapsulation
-        TAO_InputCDR stream (this->buffer_+4, this->length_-4,
-                             this->byte_order_);
-
-        // skip rest of header (type ID, name, etc...) and collect the
-        // number of struct members
-        if (!stream.skip_string ()              // ID
-            || !stream.skip_string ()           // struct name
-            || !skip_typecode (stream)          // discriminant TC
-            || !stream.read_ulong (members)      // default used
-            || !stream.read_ulong (members))     // real member count
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-
-        this->private_state_->tc_member_count_known_ = 1;
-        this->private_state_->tc_member_count_ = members;
-        return this->private_state_->tc_member_count_;
-      }
-    default:
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-    }
-  ACE_NOTREACHED (return 0);
-}
-
-// NOTE special calling convention for stream.decode () when we're
-// potentially deencapsulating an indirected typecode: the "data2"
-// value indicates that this typecode is the parent.  See comments at
-// stream.decode () for further details.
-//
-// Applicable only to struct, union, and except
-//
-
-CORBA::TypeCode_ptr
-CORBA_TypeCode::private_member_type (CORBA::ULong slot,
-                                     CORBA::Environment &ACE_TRY_ENV) const
-{
-  CORBA::ULong temp, mcount;
-
-  // Build the de-encapsulating CDR stream, bypassing the stringent
-  // alignment tests (we're a bit looser in what we need here, and we
-  // _know_ we're OK).  Then skip the byte order code.
-  TAO_InputCDR stream (this->buffer_+4, this->length_-4,
-                       this->byte_order_);
-  CORBA::TypeCode_ptr tc = 0;
-
-  switch (kind_)
-    {
-    case CORBA::tk_except:
-    case CORBA::tk_struct:              // index from 0
-      mcount = this->member_count (ACE_TRY_ENV);
-      ACE_CHECK_RETURN ((CORBA::TypeCode_ptr)0);
-
-      {
-        // Double checked locking...
-        ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard,
-                          this->private_state_->mutex_, 0);
-        if (this->private_state_->tc_member_type_list_known_)
-          if (slot < mcount)
-            return  this->private_state_->tc_member_type_list_[slot];
-          else
-            ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                              CORBA::TypeCode::_nil ());
-
-        // the first time in. Precompute and store types of all members
-
-        // Allocate a list to hold the member typecodes
-        ACE_NEW_THROW_EX (this->private_state_->tc_member_type_list_,
-                          CORBA::TypeCode_ptr [mcount],
-                          CORBA::NO_MEMORY ());
-        ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-        // skip the id, name, and member_count part
-        if (!stream.skip_string ()        // type ID, hidden
-            || !stream.skip_string ()     // typedef name
-            || !stream.read_ulong (temp))  // member count
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), (CORBA::TypeCode_ptr)0);
-
-        // compute the typecodes for all the members and
-        // return the required one.
-        for (CORBA::ULong i = 0; i < mcount; i++)
-          // the ith entry will have the typecode of the ith guy
-          {
-            if (!stream.skip_string ())  // skip the name
-              ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-            CORBA::TypeCode::traverse_status status =
-              stream.decode (CORBA::_tc_TypeCode,
-                             // the typecode will be
-                             // retrieved at the i-th
-                             // location. The decode
-                             // routine will allocate the
-                             // storage to hold a
-                             // typecode
-                             &this->private_state_->
-                             tc_member_type_list_[i],
-                             this,
-                             // pass ourselves since we
-                             // will be the parent. This
-                             // is the case where the 3rd
-                             // parameter is used in a
-                             // decode method
-                             ACE_TRY_ENV);
-            ACE_CHECK_RETURN (0);
-
-            if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
-              ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-          }
-
-        this->private_state_->tc_member_type_list_known_ = 1;
-
-        if (slot < mcount)
-          return this->private_state_->tc_member_type_list_[slot];
-        else
-          ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), (CORBA::TypeCode_ptr)0);
-      }
-      ACE_NOTREACHED (break;)
-
-    case CORBA::tk_union:            // index from 0
-      mcount = this->member_count (ACE_TRY_ENV);
-      ACE_CHECK_RETURN ((CORBA::TypeCode_ptr)0);
-
-      {
-        // Double checked locking...
-        ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard,
-                          this->private_state_->mutex_, 0);
-        if (this->private_state_->tc_member_type_list_known_)
-          if (slot < mcount)
-            return  this->private_state_->tc_member_type_list_[slot];
-          else
-            ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), CORBA::TypeCode::_nil ());
-
-        // the first time in. Precompute and store types of all members
-        ACE_NEW_THROW_EX (this->private_state_->tc_member_type_list_,
-                          CORBA::TypeCode_ptr [mcount],
-                          CORBA::NO_MEMORY ());
-        ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-      // skip the id, name, and discrimant type part
-        if (!stream.skip_string ()        // type ID, hidden
-            || !stream.skip_string ()     // typedef name
-            || !skip_typecode (stream))   // skip typecode for discriminant
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), (CORBA::TypeCode_ptr)0);
-        else if (!stream.read_ulong (temp)     // default used
-                 || !stream.read_ulong (temp)) // member count
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-        // Always big enough because labels can only be of a
-        // few different types of which "long" has the
-        // largest size.
-        CORBA::Long scratch;
-
-      // get the typecode for the discriminator
-        tc = this->discriminator_type (ACE_TRY_ENV);
-        // compute the typecodes for all the members and return the
-        // required one
-        ACE_CHECK_RETURN (0);
-
-        for (CORBA::ULong i = 0; i < mcount; i++)
-          // the ith entry will have the typecode of the ith guy
-          {
-            CORBA::TypeCode::traverse_status status =
-              stream.decode (tc, &scratch, this,  ACE_TRY_ENV);
-            // member label
-            ACE_CHECK_RETURN (0);
-
-            if (status != CORBA::TypeCode::TRAVERSE_CONTINUE
-                || !stream.skip_string ())  // skip the name
-              ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-
-            status =  stream.decode (CORBA::_tc_TypeCode,  // get the typecode
-                                     &private_state_->tc_member_type_list_[i],
-                                     this,
-                                     ACE_TRY_ENV);
-            ACE_CHECK_RETURN (0);
-
-            if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
-              ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-          }
-        this->private_state_->tc_member_type_list_known_ = 1;
-
-        if (slot < mcount)
-          return this->private_state_->tc_member_type_list_[slot];
-        else
-          ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), (CORBA::TypeCode_ptr)0);
-      }
-      ACE_NOTREACHED (break);
-
-    default:
-      // bad kind
-      ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), (CORBA::TypeCode_ptr)0);
-    }
-}
-
-// Return the name for the nth member
-// Applicable only to CORBA::tk_struct, CORBA::tk_union, CORBA::tk_enum, and
-// CORBA::tk_except
-const char *
-CORBA_TypeCode::private_member_name (CORBA::ULong slot,
-                                     CORBA::Environment &ACE_TRY_ENV) const
-{
-  CORBA::ULong temp, mcount;
-
-  // Build the de-encapsulating CDR stream, bypassing the stringent
-  // alignment tests (we're a bit looser in what we need here, and we
-  // _know_ we're OK).  Then skip the byte order code.
-  TAO_InputCDR stream (this->buffer_+4, this->length_-4,
-                       this->byte_order_);
-  CORBA::TypeCode_ptr tc = 0;
-
-  switch (kind_)
-    {
-    case CORBA::tk_enum:
-      mcount = this->member_count (ACE_TRY_ENV);
-      // out of bounds
-      ACE_CHECK_RETURN ((char *)0);
-
-      {
-        // Double checked locking...
-        ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard,
-                          this->private_state_->mutex_, 0);
-        if (this->private_state_->tc_member_name_list_known_)
-          if (slot < mcount)
-            return this->private_state_->tc_member_name_list_[slot];
-          else
-            ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-      // the first time in. Precompute and store names of all members
-      // Allocate a list to hold the member names
-        this->private_state_->tc_member_name_list_ = new char* [mcount];
-
-        if (this->private_state_->tc_member_name_list_ == 0)
-          // no memory for the member_list
-          ACE_THROW_RETURN (CORBA::NO_MEMORY (), (char *)0);
-
-        // skip the id, name, and member_count part
-        if (!stream.skip_string ()     // type ID, hidden
-            || !stream.skip_string ()     // enum name
-            || !stream.read_ulong (temp)) // member count
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), (char *)0);
-
-      // compute the typecodes for all the members and
-      // return the required one.
-        for (CORBA::ULong i = 0; i < mcount; i++)
-          // now skip this name
-          if (!stream.read_string (this->private_state_->tc_member_name_list_ [i]))
-            ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), (char *)0);
-
-        this->private_state_->tc_member_name_list_known_ = 1;
-
-        if (slot < mcount)
-          return this->private_state_->tc_member_name_list_[slot];
-        else
-          ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), (char *)0);
-      }
-      ACE_NOTREACHED (break);
-
-    case CORBA::tk_except:
-    case CORBA::tk_struct:              // index from 0
-      mcount = this->member_count (ACE_TRY_ENV);
-      // out of bounds
-      ACE_CHECK_RETURN ((char *)0);
-
-      {
-        // Double checked locking...
-        ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard,
-                          this->private_state_->mutex_, 0);
-        if (this->private_state_->tc_member_name_list_known_)
-          if (slot < mcount)
-            return this->private_state_->tc_member_name_list_[slot];
-          else
-            ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-      // the first time in. Precompute and store names of all members
-      // Allocate a list to hold the member names
-        this->private_state_->tc_member_name_list_ = new char* [mcount];
-
-        if (this->private_state_->tc_member_name_list_ == 0)
-          // no memory for the member_list
-          ACE_THROW_RETURN (CORBA::NO_MEMORY (), (char *)0);
-
-        // skip the id, name, and member_count part
-        if (!stream.skip_string ()     // type ID, hidden
-            || !stream.skip_string ()     // struct/except name
-            || !stream.read_ulong (temp)) // member count
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), (char *)0);
-
-          // compute the typecodes for all the members and
-          // return the required one.
-        for (CORBA::ULong i = 0; i < mcount; i++)
-          if (!stream.read_string (this->private_state_->tc_member_name_list_ [i])
-              || !skip_typecode (stream))
-            ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-
-        this->private_state_->tc_member_name_list_known_ = 1;
-
-        if (slot < mcount)
-          return this->private_state_->tc_member_name_list_[slot];
-        else
-          ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), (char *)0);
-      }
-      ACE_NOTREACHED (break;)
-
-    case CORBA::tk_union:            // index from 0
-      mcount = this->member_count (ACE_TRY_ENV);
-      // out of bounds
-      ACE_CHECK_RETURN ((char *)0);
-
-      {
-        // Double checked locking...
-        ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard,
-                          this->private_state_->mutex_, 0);
-        if (this->private_state_->tc_member_name_list_known_)
-          if (slot < mcount)
-            return this->private_state_->tc_member_name_list_[slot];
-          else
-            ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-      // the first time in. Precompute and store names of all members
-      // Allocate a list to hold the member names
-        this->private_state_->tc_member_name_list_ = new char* [mcount];
-
-        if (this->private_state_->tc_member_name_list_ == 0)
-          // no memory for the member_list
-          ACE_THROW_RETURN (CORBA::NO_MEMORY (), 0);
-
-        // skip the id, name, and discrimant type part
-        if (!stream.skip_string ()        // type ID, hidden
-            || !stream.skip_string ()     // typedef name
-            || !skip_typecode (stream))   // skip typecode for discriminant
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), (char *)0);
-        else if (!stream.read_ulong (temp)     // default used
-                 || !stream.read_ulong (temp)) // member count
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-        else
-          {
-            CORBA::Long scratch; // always big enough because labels can
-            // only be of a few different types of
-            // which "long" has the largest size
-
-            // get the typecode for the discriminator
-            tc = this->discriminator_type (ACE_TRY_ENV);
-            // compute the name for all the members and return the
-            // required one
-            ACE_CHECK_RETURN (0);
-
-            for (CORBA::ULong i = 0; i < mcount; i++)
-              {
-                // the ith entry will have the name of the ith member
-                CORBA::TypeCode::traverse_status status =
-                  stream.decode (tc, &scratch, this,  ACE_TRY_ENV); // member label
-                ACE_CHECK_RETURN (0);
-
-                if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
-                  ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-
-                // skip typecode for member
-                if (!stream.read_string (this->private_state_->tc_member_name_list_ [i])
-                    || (!skip_typecode (stream))) // skip typecode
-                  ACE_THROW_RETURN ( CORBA::BAD_TYPECODE (), 0);
-              }
-
-            this->private_state_->tc_member_name_list_known_ = 1;
-
-            if (slot < mcount)
-              return this->private_state_->tc_member_name_list_[slot];
-            else
-              ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), (char *)0);
-          }
-      }
-      ACE_NOTREACHED (break;)
-
-    default:
-      // bad kind
-      ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), (char *)0);
-    }
-  ACE_NOTREACHED (return (char *)0;)
-}
-
-// Return member labels for CORBA::tk_union typecodes.
-CORBA::Any_ptr
-CORBA_TypeCode::private_member_label (CORBA::ULong n,
-                                      CORBA::Environment &ACE_TRY_ENV) const
-{
-  // this function is only applicable to the CORBA::tk_union TC
-  if (this->kind_ != CORBA::tk_union)
-    ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
-
-  TAO_InputCDR stream (this->buffer_+4,
-                       this->length_-4,
-                       this->byte_order_);
-
-  // skip ID and name
-  if (!stream.skip_string ()       // type ID, hidden
-      || !stream.skip_string ()    // typedef name
-      || !skip_typecode (stream))  // skip discriminant typecode
-    ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
-
-      // skip default used, and get member count
-  CORBA::ULong member_count;
-
-  if (!stream.read_ulong (member_count)      // default used
-      || !stream.read_ulong (member_count))  // member count
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TypeCode::private_member_label -- "
-                  "error reading from stream"));
-    ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-    }
-
-  // Double checked locking...
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard,
-                    this->private_state_->mutex_, 0);
-  if (this->private_state_->tc_member_label_list_known_)
-    if (n < member_count)
-      return this->private_state_->tc_member_label_list_[n];
-    else
-      ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-  // member labels are of type Any. However, the actual types are
-  // restricted to simple types
-
-
-  // @@EXC@@ We should use Auto_Ptr_Array to make this exception
-  // safe.
-  CORBA::Any_ptr* label_list;
-  ACE_NEW_THROW_EX (label_list,
-                    CORBA::Any_ptr [member_count],
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  // get the discriminant TC
-  CORBA::TypeCode_ptr tc = this->discriminator_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  for (CORBA::ULong i = 0; i < member_count; i++)
-    {
-      // Create an any from the portion of the CDR stream created
-      // above.....
-
-      // @@ This code assumes that the stream is a single message
-      //    block, this is perfectly OK [the stream is created from a
-      //    single buffer], but we may need to change this is the
-      //    stream creation changes. [Carlos]
-      TAO_InputCDR temp (stream);
-
-      char *begin = stream.rd_ptr ();
-      int retval = temp.skip (tc, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
-        return 0;
-
-      char* end = temp.rd_ptr ();
-
-      // We need to allocate more memory than in the original
-      // stream, first to guarantee that the buffer is aligned in
-      // memory and next because the realignment may introduce
-      // extra padding. 2*MAX_ALIGNMENT should be enough.
-      // @@EXC@@ This doesn't seem to be exception safe.
-      TAO_OutputCDR out (end - begin + 2 * ACE_CDR::MAX_ALIGNMENT,
-                         ACE_CDR_BYTE_ORDER,
-                         ACE_Allocator::instance (),
-                         ACE_Allocator::instance ());
-
-      retval = out.append (tc, &stream, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-      if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
-        return 0;
-
-      ACE_NEW_THROW_EX (label_list[i],
-                        CORBA::Any (tc, 0, out.begin ()),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (0);
-
-      if (stream.skip_string () == 0
-          || this->skip_typecode (stream) == 0)
-        {
-          if (TAO_debug_level > 0)
-            ACE_ERROR ((LM_ERROR,
-                        "TypeCode::private_member_label "
-                        "error getting typecode for member %d\n",
-                        i));
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                            0);
-        }
-    }
-
-  this->private_state_->tc_member_label_list_ = label_list;
-  this->private_state_->tc_member_label_list_known_ = 1;
-
-  // If caller asked for the label for a nonexistent member, they get
-  // an error report!
-  if (n >= member_count)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-  return this->private_state_->tc_member_label_list_[n];
-}
-
-CORBA::TypeCode_ptr
-CORBA_TypeCode::private_discriminator_type (CORBA::Environment &ACE_TRY_ENV) const
-{
-  // Double checked locking...
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard,
-                    this->private_state_->mutex_, 0);
-  if (this->private_state_->tc_discriminator_type_known_)
-    return this->private_state_->tc_discriminator_type_;
-
-  TAO_InputCDR stream (this->buffer_+4, this->length_-4,
-                       this->byte_order_);
-
-  // skip ID and name, and then get the discriminant TC
-
-  if (!stream.skip_string () // type ID, hidden
-      || !stream.skip_string () // typedef name
-      || stream.decode (CORBA::_tc_TypeCode,
-                        &this->private_state_->tc_discriminator_type_, this,
-                        ACE_TRY_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE)
-    ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-
-  this->private_state_->tc_discriminator_type_known_ = 1;
-  return this->private_state_->tc_discriminator_type_;
-}
-
-CORBA::Long
-CORBA_TypeCode::private_default_index (CORBA::Environment &ACE_TRY_ENV) const
-{
-  // Double checked locking...
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard,
-                    this->private_state_->mutex_, 0);
-  if (this->private_state_->tc_default_index_used_known_)
-    return this->private_state_->tc_default_index_used_;
-
-  TAO_InputCDR stream (this->buffer_+4, this->length_-4,
-                       this->byte_order_);
-
-  // skip ID and name, and then get the discriminant TC
-
-  if (!stream.skip_string ()            // type ID, hidden
-      || !stream.skip_string ()         // typedef name
-      || !skip_typecode (stream)        // skip discriminant
-      || !stream.read_long (this->private_state_->tc_default_index_used_))
-    ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-
-  this->private_state_->tc_default_index_used_known_ = 1;
-  return this->private_state_->tc_default_index_used_;
-}
-
-CORBA::Long
-CORBA_TypeCode::private_length (CORBA::Environment &ACE_TRY_ENV) const
-{
-  TAO_InputCDR stream (this->buffer_+4, this->length_-4,
-                       this->byte_order_);
-  switch (this->kind_)
-    {
-    case CORBA::tk_sequence:
-    case CORBA::tk_array:
-      {
-        // Double checked locking...
-        ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard,
-                          this->private_state_->mutex_, 0);
-        if (this->private_state_->tc_length_known_)
-          return this->private_state_->tc_length_;
-
-        // skip the typecode of the element and get the bounds
-        if (!skip_typecode (stream) // skip typecode
-            || !stream.read_ulong (this->private_state_->tc_length_))
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
-        else
-          {
-            this->private_state_->tc_length_known_ = 1;
-            return this->private_state_->tc_length_;
-          }
-      }
-      ACE_NOTREACHED (break);
-
-    case CORBA::tk_string:
-    case CORBA::tk_wstring:
-      {
-        // Double checked locking...
-        ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard,
-                          this->private_state_->mutex_, 0);
-        if (this->private_state_->tc_length_known_)
-          return this->private_state_->tc_length_;
-
-        if (stream.read_ulong (this->private_state_->tc_length_))
-          {
-            this->private_state_->tc_length_known_ = 1;
-            return this->private_state_->tc_length_;
-          }
-        else
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
-      }
-      ACE_NOTREACHED (break);
-
-    default:
-      ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
-    }
-  ACE_NOTREACHED (return 0);
-}
-
-CORBA::TypeCode_ptr
-CORBA_TypeCode::private_content_type (CORBA::Environment &ACE_TRY_ENV) const
-{
-  TAO_InputCDR stream (this->buffer_+4, this->length_-4,
-                       this->byte_order_);
-  CORBA::TypeCode::traverse_status status = CORBA::TypeCode::TRAVERSE_STOP;
-
-  switch (kind_)
-    {
-    case CORBA::tk_sequence:
-    case CORBA::tk_array:
-      {
-        // Double checked locking...
-        ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard,
-                          this->private_state_->mutex_, 0);
-        if (this->private_state_->tc_content_type_known_)
-          return this->private_state_->tc_content_type_;
-
-        // retrieve the content type
-        status = stream.decode (CORBA::_tc_TypeCode,
-                           &this->private_state_->tc_content_type_,
-                           this,  ACE_TRY_ENV);
-        ACE_CHECK_RETURN (0);
-
-        if (status != CORBA::TypeCode::TRAVERSE_CONTINUE) // element type
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
-        else
-          {
-            this->private_state_->tc_content_type_known_ = 1;
-            return this->private_state_->tc_content_type_;
-          }
-      }
-      ACE_NOTREACHED (break);
-
-    case CORBA::tk_alias:
-      {
-        // Double checked locking...
-        ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard,
-                          this->private_state_->mutex_, 0);
-        if (this->private_state_->tc_content_type_known_)
-          return this->private_state_->tc_content_type_;
-
-        if (!stream.skip_string ()  // typeID
-            || !stream.skip_string ()) // name
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
-
-        status = stream.decode (CORBA::_tc_TypeCode,
-                                &this->private_state_->tc_content_type_, this,
-                                ACE_TRY_ENV);
-        ACE_CHECK_RETURN (0);
-
-        if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
-        else
-          {
-            this->private_state_->tc_content_type_known_ = 1;
-            return this->private_state_->tc_content_type_;
-          }
-      }
-      /*NOTREACHED*/
-
-    default:
-      ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
-    }
-  ACE_NOTREACHED (return 0);
-}
-
-CORBA::ULong
-CORBA_TypeCode::private_discrim_pad_size (CORBA::Environment &ACE_TRY_ENV)
-{
-  // Double checked locking...
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard,
-                    this->private_state_->mutex_, 0);
-  if (this->private_state_->tc_discrim_pad_size_known_)
-    return this->private_state_->tc_discrim_pad_size_;
-
-  TAO_InputCDR stream (this->buffer_+4, this->length_-4,
-                       this->byte_order_);
-
-  size_t discrim_size;
-  size_t overall_align;
-
- (void) TAO_CDR_Interpreter::calc_key_union_attributes (&stream,
-                                                         overall_align,
-                                                         discrim_size,
-                                                         ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
- this->private_state_->tc_discrim_pad_size_known_ = 1;
- this->private_state_->tc_discrim_pad_size_ = discrim_size;
- return discrim_size;
-}
-// ************ The following are deprecated ****************
-
-// say how many parameters this typecode has; normally a fixed number,
-// some are variable length.
-//
-// NOTE: This refers to "real" parameters, not what shows up in the
-// IFR spec !!  That is, "hidden" parameters are counted here, this
-// doesn't strictly comply with what CORBA says "param_count"
-// provides.
-
-CORBA::ULong
-CORBA_TypeCode::param_count (CORBA::Environment &ACE_TRY_ENV) const
-{
-  switch (this->kind_)
-    {
-    default:
-      return 0;
-
-    case CORBA::tk_string:
-    case CORBA::tk_wstring:
-      return 1;
-
-    case CORBA::tk_objref:
-    case CORBA::tk_sequence:
-    case CORBA::tk_array:
-      return 2;
-
-    case CORBA::tk_alias:
-      return 3;
-
-    case CORBA::tk_except:
-    case CORBA::tk_struct:
-      {
-        CORBA::ULong members;
-        TAO_InputCDR stream (this->buffer_+4, this->length_-4,
-                             this->byte_order_);
-
-        // skip rest of header (type ID and name) and collect the
-        // number of struct members
-        if (!stream.skip_string ()                  // ID
-            || !stream.skip_string ()       // struct name
-            || !stream.read_ulong (members))
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-
-        return 3 + 2 * members;
-      }
-
-    case CORBA::tk_enum:
-      {
-        CORBA::ULong members;
-        TAO_InputCDR stream (this->buffer_+4, this->length_-4,
-                             this->byte_order_);
-
-        // skip rest of header (type ID and name) and collect the
-        // number of struct members
-        if (!stream.skip_string ()                      // ID
-            || !stream.skip_string ()           // typedef name
-            || !stream.read_ulong (members))
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-
-        return 3 + members;
-      }
-
-    case CORBA::tk_union:
-      {
-        CORBA::ULong members;
-        TAO_InputCDR stream (this->buffer_+4, this->length_-4,
-                             this->byte_order_);
-
-        // skip rest of header (type ID, name, etc...) and collect the
-        // number of struct members
-        if (!stream.skip_string ()                      // ID
-            || !stream.skip_string ()           // struct name
-            || !skip_typecode (stream)          // discriminant TC
-            || !stream.read_ulong (members)      // default used
-            || !stream.read_ulong (members))     // real member count
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-
-        return 5 + 3 * members;
-      }
-    }
-}
-
-CORBA::Any_ptr
-CORBA_TypeCode::parameter (const CORBA::Long /* slot */,
-                           CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                         CORBA::COMPLETED_NO),
-                    0);
-}
-
-// Tell user the size of an instance of the data type described by
-// this typecode ... typically used to allocate memory.
-
-size_t
-CORBA::TypeCode::private_size (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (kind_ >= CORBA::TC_KIND_COUNT)
-    ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-
-  // Double checked locking...
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard,
-                    this->private_state_->mutex_, 0);
-  if (this->private_state_->tc_size_known_)
-    return this->private_state_->tc_size_;
-
-  if (TAO_CDR_Interpreter::table_[kind_].calc_ == 0)
-    {
-      private_state_->tc_size_known_ = 1;
-      private_state_->tc_size_ =
-        TAO_CDR_Interpreter::table_[kind_].size_;
-      return private_state_->tc_size_;
-    }
-
-  size_t alignment;
-  TAO_InputCDR stream (this->buffer_+4, this->length_-4,
-                       this->byte_order_);
-
-  private_state_->tc_size_known_ = 1;
-  private_state_->tc_size_ =
-    TAO_CDR_Interpreter::table_[kind_].calc_ (&stream, alignment, ACE_TRY_ENV);
-  return private_state_->tc_size_;
-}
-
-// Tell user the alignment restriction for the data type described by
-// an instance of this data type.  Rarely used; provided for
-// completeness.
-
-size_t
-CORBA::TypeCode::private_alignment (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (kind_ >= CORBA::TC_KIND_COUNT)
-    ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
-
-  // Double checked locking...
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard,
-                    this->private_state_->mutex_, 0);
-  if (this->private_state_->tc_alignment_known_)
-    return this->private_state_->tc_alignment_;
-
-  if (TAO_CDR_Interpreter::table_[kind_].calc_ == 0)
-    {
-      private_state_->tc_alignment_known_ = 1;
-      private_state_->tc_alignment_ =
-        TAO_CDR_Interpreter::table_[kind_].alignment_;
-      return private_state_->tc_alignment_;
-    }
-
-  size_t alignment;
-  TAO_InputCDR stream (this->buffer_+4, this->length_-4,
-                       this->byte_order_);
-
-  (void) TAO_CDR_Interpreter::table_[kind_].calc_ (&stream,
-                                                    alignment,
-                                                    ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  private_state_->tc_alignment_known_ = 1;
-  private_state_->tc_alignment_ = alignment;
-  return alignment;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO_Pseudo_Object_Manager<CORBA_TypeCode,CORBA_TypeCode_var>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_Pseudo_Object_Manager<CORBA_TypeCode,CORBA_TypeCode_var>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Typecode.h b/TAO/tao/Typecode.h
deleted file mode 100644
index 92d596b63ed..00000000000
--- a/TAO/tao/Typecode.h
+++ /dev/null
@@ -1,567 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Typecode.h
-//
-// = DESCRIPTION
-//    Header file CORBA's "TypeCode" type.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems, Inc.
-//
-// ============================================================================
-
-#ifndef TAO_TYPECODE_H
-#define TAO_TYPECODE_H
-
-#include "ace/Synch.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Exception.h"
-
-// Forward decl.
-class TAO_InputCDR;
-
-// A TypeCode describes data.  This one's as thin a wrapper around CDR
-// octet sequences as is practical.  There are guesses here about how
-// the OMG C++ mapping and CORBA 2.0 IFR specification will interact.
-//
-// NOTE: Use TypeCode_ptr, except in code (e.g. output of and OMG-IDL
-// compiler) that needs to create typecodes from their octet-sequence
-// encodings.
-
-class TC_Private_State;
-
-class TAO_Export CORBA_TypeCode
-{
-  // = TITLE
-  //   The CORBA TypeCode class. It maintains the in-memory
-  //   representation of any OMG CORBA IDL data type.
-  //
-  // = DESCRIPTION
-  //   Implements the CORBA::TypeCode interface specified by CORBA 2.0
-  //   spec.  Typecodes essentially consist of just the CDR octets
-  //   that get marshaled and unmarshaled, and this code knows how to
-  //   parse those octets and answer questions CORBA's TypeCode APIs
-  //   require.
-  //
-  //   NOTE: This isn't well tuned performance-wise.  Given how much
-  //   is variable (byte order, alignment) it's clear tuning has its
-  //   limits with respect to CDR bytecode interpretation.
-  //
-  //   THREADING NOTE: Typecodes are readonly data structures, and the
-  //   only mutual exclusion relates to reference counting and
-  //   construction.
-public:
-
-  // Two "user exceptions" are defined for manipulating TypeCodes. These
-  // two classes are defined inside the TypeCode class.
-  class TAO_Export Bounds : public CORBA_UserException
-  {
-  public:
-    Bounds (void);
-
-    virtual void _raise (void);
-    static Bounds* _narrow (CORBA_Exception *ex);
-    virtual int _is_a (const char* interface_id) const;
-  };
-
-  class TAO_Export BadKind : public CORBA_UserException
-  {
-  public:
-    BadKind (void);
-
-    virtual void _raise (void);
-    static BadKind* _narrow (CORBA_Exception *ex);
-    virtual int _is_a (const char* interface_id) const;
-  };
-
-  static CORBA::TypeCode_ptr _tc_Bounds;
-  static CORBA::TypeCode_ptr _tc_BadKind;
-
-  static CORBA::TypeCode_ptr _duplicate (CORBA::TypeCode_ptr tc);
-  // Duplicates i.e., increments ref count.
-
-  static CORBA::TypeCode_ptr _nil (void);
-  // Returns a NULL typecode.
-
-  CORBA::Boolean equal (const CORBA::TypeCode_ptr,
-                        CORBA_Environment &ACE_TRY_ENV =
-                          TAO_default_environment ()) const;
-  // Compares two typecodes.
-
-  CORBA::Boolean equivalent (CORBA::TypeCode_ptr,
-                             CORBA_Environment &ACE_TRY_ENV =
-                               TAO_default_environment ()) const;
-  // Unaliases receiver and argument before comparing.
-
-  CORBA::TCKind kind (CORBA_Environment &ACE_TRY_ENV =
-                        TAO_default_environment ()) const;
-  // For all TypeCode kinds, returns the "kind" of the typecode.
-
-  const char *id (CORBA_Environment &ACE_TRY_ENV =
-                    TAO_default_environment ()) const;
-  // For tk_{objref,struct,union,enum,alias,except}. Returns the
-  // repository ID, raises BadKind.
-
-  const char *name (CORBA_Environment &ACE_TRY_ENV =
-                      TAO_default_environment ()) const;
-  // Returns name (), raises (BadKind).
-
-  CORBA::ULong member_count (CORBA_Environment &ACE_TRY_ENV =
-                               TAO_default_environment ()) const;
-  // Returns member_count (), raises (BadKind). Useful for tk_struct,
-  // tk_union, tk_enum, tk_alias, and tk_except.
-
-  const char *member_name (CORBA::ULong slot,
-                           CORBA_Environment &ACE_TRY_ENV =
-                             TAO_default_environment ()) const;
-  // Returns member_name (...), raises (BadKind, Bounds); Useful for
-  // tk_struct, tk_union, tk_enum, tk_alias, and tk_except.
-
-  CORBA::TypeCode_ptr member_type (CORBA::ULong slot,
-                                   CORBA_Environment &ACE_TRY_ENV =
-                                     TAO_default_environment ()) const;
-  // Returns member_type (...), raises (BadKind, Bounds); Useful for
-  // tk_struct, tk_union, and tk_except.
-
-  CORBA::Any_ptr member_label (CORBA::ULong n,
-                               CORBA_Environment &ACE_TRY_ENV =
-                                 TAO_default_environment ()) const;
-  // For tk_union. Returns the label. Raises BadKind, Bounds.
-
-  CORBA::TypeCode_ptr discriminator_type (CORBA_Environment &ACE_TRY_ENV =
-                                            TAO_default_environment ()) const;
-  // Returns the discriminator type for tk_union. raises (BadKind).
-
-  CORBA::Long default_index (CORBA_Environment &ACE_TRY_ENV =
-                               TAO_default_environment ()) const;
-  // Returns the default slot for the tk_union. Raises (BadKind).
-
-  CORBA::ULong length (CORBA_Environment &ACE_TRY_ENV =
-                         TAO_default_environment ()) const;
-  // Returns length, raises (BadKind). Used for tk_string,
-  // tk_sequence, and tk_array.
-
-  CORBA::TypeCode_ptr content_type (CORBA_Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ()) const;
-  // Returns the content type (element type). Raises (BadKind); Useful
-  // for tk_sequence, tk_array, and tk_alias.
-
-  CORBA::ULong TAO_discrim_pad_size (CORBA_Environment &ACE_TRY_ENV =
-                                       TAO_default_environment ());
-  // Calculates the padded size of discriminant type TAO Extension.
-
-  // = Creation/refcounting
-
-  // These aren't really public APIs, but an IDL compiler will need to
-  // be able to create TypeCodes as part of creating stubs.
-
-  CORBA_TypeCode (CORBA::TCKind kind);
-  // This constructor is used only for built-in TypeCode constants,
-  // with no parameters.
-
-  CORBA_TypeCode (CORBA::TCKind kind,
-                  size_t length,
-                  const char *buffer,
-                  CORBA::Boolean orb_owns_tc,
-                  CORBA::ULong size,
-                  CORBA::TypeCode_ptr parent = 0);
-  // This constructor is used both for typecode constants and for
-  // heap-allocated TypeCodes.  The two are distinguished by the
-  // orb_owns_tc flag passed in by the creator.
-  //
-  // For simple param lists with a single numeric parameter, only
-  // 'length' matters.
-  //
-  // For complex param lists, or simple param lists for which the
-  // parameter is a string or typecode, length _and_ buffer matter.
-  //
-  // For typecodes that are precomputed from the encapsulation stream
-  // of the parent, even the "parent" argument matters because this
-  // implies that all children will share the octet buffers of its
-  // parent
-
-  ~CORBA_TypeCode (void);
-  // destructor
-
-  enum traverse_status
-  {
-    TRAVERSE_STOP,
-    TRAVERSE_CONTINUE
-  };
-  // these are used to indicate the status of marshaling
-
-  size_t size (CORBA_Environment &ACE_TRY_ENV =
-                 TAO_default_environment ());
-  // returns the size. Used by the IIOP marshaling engine.
-
-  size_t alignment (CORBA_Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
-  // returns the alignment requirements for this typecode.
-  // used by the IIOP marshaling engine.
-
-  // Reference counting operations.
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
-
-  // = Following three are deprecated
-
-  // The following are deprecated in the CORBA 2.2 spec and are
-  // missing altogether from 2.3a (98-12-04), but they are included
-  // here as no-ops so legacy apps won't completely break. They
-  // throw CORBA::NO_IMPLEMENT.
-
-  CORBA::Any_ptr parameter (const CORBA::Long slot,
-                            CORBA_Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  // Deprecated in the CORBA 2.2 spec and
-  // missing altogether from 2.3a (98-12-04),
-
-  CORBA::ULong param_count (CORBA_Environment &ACE_TRY_ENV =
-                              TAO_default_environment ()) const;
-  // Deprecated, CORBA 1.2, not fully usable. Returns the number of
-  // parameters that the typecode takes.
-
-  // private:
-  //
-  // = The guts of the typecode implementation class
-
-  // This is implemented as a counted set of bytes, in marshaled CDR
-  // format.
-
-  size_t length_;
-  // length of the encapsulated stream
-
-  const char* buffer_;
-  // the encapsulated stream
-
-  CORBA::Long byte_order_;
-  // The byte order in the encapsulated stream.
-
-  CORBA::TCKind kind_;
-  // the TypeCode kind
-
-  CORBA::TypeCode_ptr parent_;
-  // Indirected typecodes share "buffer" with a parent, and hold a
-  // reference to that parent to ensure its memory is not freed
-  // inappropriately.
-
-  const char *tc_base_;
-  // my typecode base. Notice that the buffer_ member points to my
-  // encapsulation. However, for indirected typecodes, the offsets will point
-  // to my tk_kind field which should be pointed to be tc_base_
-
-  const char *root_tc_base_;
-  // base of the topmost level typecode. Applicable only if I have any parents,
-  // else it is the same as tc_base. This helps in case we have indirections
-  // and we need to traverse beyond encapsulation boundaries
-
-  static CORBA::Boolean skip_typecode (TAO_InputCDR &stream);
-  // skip a typecode encoding in a given CDR stream.  This is just a
-  // helper function.
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_TypeCode_ptr _ptr_type;
-  typedef CORBA_TypeCode_var _var_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
-private:
-  // = All the private/helper methods
-
-  CORBA::Boolean private_equal (CORBA::TypeCode_ptr tc,
-                                CORBA_Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ()) const;
-  // Compares the typecodes.
-
-  const char *private_id (CORBA_Environment &ACE_TRY_ENV =
-                            TAO_default_environment ()) const;
-  // For tk_{objref,struct,union,enum,alias,except}. Returns the
-  // repository ID, raises BadKind.
-
-  const char *private_name (CORBA_Environment &ACE_TRY_ENV =
-                              TAO_default_environment ()) const;
-  // returns name (), raises (BadKind)
-
-  CORBA::ULong private_member_count (CORBA_Environment &ACE_TRY_ENV =
-                                       TAO_default_environment ()) const;
-  // returns member_count (), raises (BadKind). Useful for tk_struct,
-  // tk_union, tk_enum, tk_alias, and tk_except.
-
-  CORBA::TypeCode_ptr private_member_type (CORBA::ULong slot,
-                                           CORBA_Environment &ACE_TRY_ENV =
-                                             TAO_default_environment ()) const;
-  // returns member_type (...), raises (BadKind, Bounds); Useful for
-  // tk_struct, tk_union, and tk_except
-
-  const char *private_member_name (CORBA::ULong slot,
-                                   CORBA_Environment &ACE_TRY_ENV =
-                                     TAO_default_environment ()) const;
-  // returns member_name (...), raises (BadKind, Bounds); Useful for tk_union,
-  // tk_struct, tk_except, and tk_enum
-
-  CORBA::Any_ptr private_member_label (CORBA::ULong n,
-                                       CORBA_Environment &ACE_TRY_ENV =
-                                         TAO_default_environment ()) const;
-  // For tk_union. Returns the label. Raises BadKind, Bounds.
-
-  CORBA::TypeCode_ptr private_discriminator_type (CORBA_Environment &ACE_TRY_ENV =
-                                                    TAO_default_environment ()) const;
-  // returns the discriminator type for tk_union. raises (BadKind);
-
-  CORBA::Long private_default_index (CORBA_Environment &ACE_TRY_ENV =
-                                       TAO_default_environment ()) const;
-  // returns the default slot for the tk_union. Raises (BadKind);
-
-  CORBA::Long private_length (CORBA_Environment &ACE_TRY_ENV =
-                                TAO_default_environment ()) const;
-  // returns length, raises (BadKind). Used for tk_string,
-  // tk_sequence, and tk_array
-
-  CORBA::TypeCode_ptr private_content_type (CORBA_Environment &ACE_TRY_ENV =
-                                              TAO_default_environment ()) const;
-  // returns the content type (element type). Raises (BadKind); Useful
-  // for tk_sequence, tk_array, and tk_alias
-
-  size_t private_size (CORBA_Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
-  // returns the size. Used by the IIOP marshaling engine.
-
-  size_t private_alignment (CORBA_Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  // returns the alignment requirements for this typecode. used by the
-  // IIOP marshaling engine.
-
-  CORBA::ULong private_discrim_pad_size (CORBA_Environment &ACE_TRY_ENV =
-                                           TAO_default_environment ());
-  // Calculates the padded size of discriminant type TAO Extension
-
-  // = All the private helpers testing for equality of typecodes
-
-  CORBA::Boolean private_equal_objref (CORBA::TypeCode_ptr tc,
-                                       CORBA_Environment &ACE_TRY_ENV =
-                                         TAO_default_environment ()) const;
-  // test equality for typecodes of objrefs
-
-  CORBA::Boolean private_equal_struct (CORBA::TypeCode_ptr tc,
-                                       CORBA_Environment &ACE_TRY_ENV =
-                                         TAO_default_environment ()) const;
-  // test equality for typecodes of structs
-
-  CORBA::Boolean private_equal_union (CORBA::TypeCode_ptr tc,
-                                      CORBA_Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ()) const;
-  // test equality for typecodes of unions
-
-  CORBA::Boolean private_equal_enum (CORBA::TypeCode_ptr tc,
-                                     CORBA_Environment &ACE_TRY_ENV =
-                                       TAO_default_environment ()) const;
-  // test equality for typecodes of enums
-
-  CORBA::Boolean private_equal_string (CORBA::TypeCode_ptr tc,
-                                       CORBA_Environment &ACE_TRY_ENV =
-                                         TAO_default_environment ()) const;
-  // test equality for typecodes of strings
-
-  CORBA::Boolean private_equal_wstring (CORBA::TypeCode_ptr tc,
-                                        CORBA_Environment &ACE_TRY_ENV =
-                                          TAO_default_environment ()) const;
-  // test equality for typecodes of wide strings
-
-  CORBA::Boolean private_equal_sequence (CORBA::TypeCode_ptr tc,
-                                         CORBA_Environment &ACE_TRY_ENV =
-                                           TAO_default_environment ()) const;
-  // test equality for typecodes of sequences
-
-  CORBA::Boolean private_equal_array (CORBA::TypeCode_ptr tc,
-                                      CORBA_Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ()) const;
-  // test equality for typecodes of array
-
-  CORBA::Boolean private_equal_alias (CORBA::TypeCode_ptr tc,
-                                      CORBA_Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ()) const;
-  // test equality for typecodes of typedefs
-
-  CORBA::Boolean private_equal_except (CORBA::TypeCode_ptr tc,
-                                       CORBA_Environment &ACE_TRY_ENV =
-                                         TAO_default_environment ()) const;
-  // test equality for typecodes of exceptions
-
-  CORBA::ULong refcount_;
-  // if refcount reaches 0, free this typecode
-
-  ACE_SYNCH_MUTEX refcount_lock_;
-  // Protect the reference count, this is OK because we do no
-  // duplicates or releases on the critical path.
-
-  CORBA::Boolean orb_owns_;
-  // TAO's approach differs from the SunSoft IIOP. Constant typecodes
-  // are owned by the ORB and get freed only when the ORB dies.
-
-  // If "orb_owns" is false, the value is a not a constant typecode
-  // with both the typecode and the buffer allocated (typically, this
-  // will be created by the IDL compiler generated code)
-
-  TC_Private_State *private_state_;
-  // maintains precomputed state. We need a separate class that
-  // maintains the precomputed state since most of the TypeCode class
-  // operations keep the state of the object constant. However, for
-  // the purpose of precomputation, we need to update the state. We
-  // cannot update state directly in the TypeCode class as that
-  // defeats the constness. However, we can keep an object in our
-  // typecode class that remains constant, but we can update its
-  // state.
-
-  // = No copy constructor or assignment operator supported;
-
-  // Use TypeCode_ptr values, duplicate (), release ().
-  CORBA_TypeCode (const CORBA::TypeCode &src);
-  CORBA_TypeCode &operator = (const CORBA::TypeCode &src);
-
-  char *non_aligned_buffer_;
-  // Original buffer that may possibly be non-aligned. We still need a
-  // handle to the allocated memory so that all of it can be freed by
-  // the destructor.
-};
-
-class TAO_Export TC_Private_State
-  // = TITLE
-  //   Private state of the TypeCode.
-  //
-  // = DESCRIPTION
-  //   Used to store precomputed values
-{
-public:
-  TC_Private_State (CORBA::TCKind kind);
-  // constructor
-
-  ~TC_Private_State (void);
-  // destructor
-
-  ACE_SYNCH_MUTEX mutex_;
-
-  CORBA::TCKind  tc_kind_;
-  // our kind that will determine what kind of children we may have
-
-  // = data members that indicate if the desired quantify was precomputed or not.
-  CORBA::Boolean tc_id_known_;
-  CORBA::Boolean tc_name_known_;
-  CORBA::Boolean tc_member_count_known_;
-  CORBA::Boolean tc_member_type_list_known_;
-  CORBA::Boolean tc_member_name_list_known_;
-  CORBA::Boolean tc_member_label_list_known_;
-  CORBA::Boolean tc_discriminator_type_known_;
-  CORBA::Boolean tc_default_index_used_known_;
-  CORBA::Boolean tc_length_known_;
-  CORBA::Boolean tc_content_type_known_;
-  CORBA::Boolean tc_size_known_;
-  CORBA::Boolean tc_alignment_known_;
-  CORBA::Boolean tc_discrim_pad_size_known_;
-
-  // = These data members store the precomputed values
-  CORBA::String  tc_id_;
-  CORBA::String  tc_name_;
-  CORBA::ULong   tc_member_count_;
-  CORBA::TypeCode_ptr *tc_member_type_list_;
-  char **tc_member_name_list_;
-  CORBA::Any_ptr *tc_member_label_list_;
-  CORBA::TypeCode_ptr tc_discriminator_type_;
-  CORBA::Long   tc_default_index_used_;
-  CORBA::ULong   tc_length_;
-  CORBA::TypeCode_ptr  tc_content_type_;
-  CORBA::ULong  tc_size_;
-  CORBA::ULong  tc_alignment_;
-  CORBA::ULong  tc_discrim_pad_size_;
-
-};
-
-class TAO_Export CORBA_TypeCode_var
-{
-  //
-  // = TITLE
-  //   A smart pointer for TypeCodes.
-  //
-  // = DESCRIPTION
-  //   Implements the _var class for the TypeCode pseudo object.
-  //
-public:
-  CORBA_TypeCode_var (void); // default constructor
-  CORBA_TypeCode_var (CORBA_TypeCode_ptr);
-  CORBA_TypeCode_var (const CORBA_TypeCode_var &); // copy constructor
-  ~CORBA_TypeCode_var (void); // destructor
-
-  CORBA_TypeCode_var &operator= (CORBA_TypeCode_ptr);
-  CORBA_TypeCode_var &operator= (const CORBA_TypeCode_var &);
-  CORBA_TypeCode_ptr operator-> (void) const;
-
-  operator const CORBA_TypeCode_ptr &() const;
-  operator CORBA_TypeCode_ptr &();
-  // in, inout, out, _retn
-  CORBA_TypeCode_ptr in (void) const;
-  CORBA_TypeCode_ptr &inout (void);
-  CORBA_TypeCode_ptr &out (void);
-  CORBA_TypeCode_ptr _retn (void);
-  CORBA_TypeCode_ptr ptr (void) const;
-
-private:
-  CORBA_TypeCode_ptr ptr_;
-};
-
-class TAO_Export CORBA_TypeCode_out
-{
-  //
-  // = TITLE
-  //   The _out class for TypeCode.
-  //
-  // = DESCRIPTION
-  //   Implements the _out class for the TypeCode pseudo object.
-  //
-public:
-  CORBA_TypeCode_out (CORBA_TypeCode_ptr &);
-  CORBA_TypeCode_out (CORBA_TypeCode_var &);
-  CORBA_TypeCode_out (const CORBA_TypeCode_out &);
-  CORBA_TypeCode_out &operator= (const CORBA_TypeCode_out &);
-  CORBA_TypeCode_out &operator= (CORBA_TypeCode_ptr);
-  operator CORBA_TypeCode_ptr &();
-  CORBA_TypeCode_ptr &ptr (void);
-  CORBA_TypeCode_ptr operator-> (void);
-
-private:
-  CORBA_TypeCode_ptr &ptr_;
-
-  CORBA_TypeCode_out &operator= (const CORBA_TypeCode_var &);
-  // Assignment from _var not allowed
-};
-
-class TAO_Export TAO_TypeCodes
-{
-  // = TITLE
-  //   This class is a namespace for TypeCode-related static data that is owned
-  //   by the ORB.
-public:
-
-  static void init (void);
-  // Runtime initialization of all standard typecodes.
-  // Called from <CORBA::ORB_init>.
-
-  static void fini (void);
-  // Runtime finalization of all standard typecodes.
-
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Typecode.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_TYPECODE_H */
diff --git a/TAO/tao/Typecode.i b/TAO/tao/Typecode.i
deleted file mode 100644
index a9bc37c5203..00000000000
--- a/TAO/tao/Typecode.i
+++ /dev/null
@@ -1,278 +0,0 @@
-// $Id$
-
-ACE_INLINE CORBA::ULong
-CORBA_TypeCode::_incr_refcnt (void)
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->refcount_lock_, 0);
-  return this->refcount_++;
-}
-
-ACE_INLINE CORBA::ULong
-CORBA_TypeCode::_decr_refcnt (void)
-{
-  {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->refcount_lock_, 0);
-    this->refcount_--;
-    if (this->refcount_ != 0)
-      return this->refcount_;
-  }
-  delete this;
-  return 0;
-}
-
-ACE_INLINE CORBA::TypeCode_ptr
-CORBA_TypeCode::_duplicate (CORBA::TypeCode_ptr tc)
-{
-  if (tc)
-    tc->_incr_refcnt ();
-  return tc;
-}
-
-ACE_INLINE CORBA::TypeCode_ptr
-CORBA::TypeCode::_nil (void)
-{
-  return (CORBA::TypeCode_ptr)0;
-}
-
-ACE_INLINE CORBA::TCKind
-CORBA_TypeCode::kind (CORBA::Environment &) const
-{
-  return this->kind_;
-}
-
-// Returns true if the two typecodes are identical
-ACE_INLINE CORBA::Boolean
-CORBA_TypeCode::equal (const CORBA::TypeCode_ptr tc,
-                       CORBA::Environment &ACE_TRY_ENV) const
-{
-  if (this->kind_ != tc->kind (ACE_TRY_ENV))
-    // simple case
-    return 0;
-  else
-    // typecode kinds are same
-    return this->private_equal (tc, ACE_TRY_ENV);
-}
-
-// returns the Repository ID
-ACE_INLINE const char *
-CORBA_TypeCode::id (CORBA::Environment &ACE_TRY_ENV) const
-{
-  // if already precomputed
-  if (this->private_state_->tc_id_known_)
-    return this->private_state_->tc_id_;
-  else
-    return this->private_id (ACE_TRY_ENV);
-}
-
-// returns the string name
-ACE_INLINE const char *
-CORBA_TypeCode::name (CORBA::Environment &ACE_TRY_ENV) const
-{
-  // if already precomputed
-  if (this->private_state_->tc_name_known_)
-    return this->private_state_->tc_name_;
-  else
-    return this->private_name (ACE_TRY_ENV);
-}
-
-// Return the number of members defined by this typecode
-//
-// Applicable to struct, union, enum, alias, and except
-// For the rest of the cases, raises the BadKind exception.
-
-ACE_INLINE CORBA::ULong
-CORBA_TypeCode::member_count (CORBA::Environment &ACE_TRY_ENV) const
-{
-  // if already precomputed
-  if (this->private_state_->tc_member_count_known_)
-    return this->private_state_->tc_member_count_;
-  else
-    return this->private_member_count (ACE_TRY_ENV);
-}
-
-// calculate size of the typecode
-ACE_INLINE size_t
-CORBA_TypeCode::size (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (this->private_state_->tc_size_known_)
-    return this->private_state_->tc_size_;
-  else
-    return this->private_size (ACE_TRY_ENV);
-}
-
-// calculate alignment requirements of the typecode
-ACE_INLINE size_t
-CORBA_TypeCode::alignment (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (this->private_state_->tc_alignment_known_)
-    return this->private_state_->tc_alignment_;
-  else
-    return this->private_alignment (ACE_TRY_ENV);
-}
-
-// ************************************************************
-// These are in CORBA namespace
-
-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->_decr_refcnt ();
-}
-
-// ****************************************************************
-
-ACE_INLINE
-CORBA_TypeCode_var::CORBA_TypeCode_var (void)
-  : ptr_ (CORBA_TypeCode::_nil ())
-{}
-
-ACE_INLINE
-CORBA_TypeCode_var::CORBA_TypeCode_var (CORBA_TypeCode_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA_TypeCode_ptr
-CORBA_TypeCode_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_TypeCode_var::CORBA_TypeCode_var (const CORBA_TypeCode_var &p)
-  : ptr_ (CORBA_TypeCode::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_TypeCode_var::~CORBA_TypeCode_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_TypeCode_var &
-CORBA_TypeCode_var::operator= (CORBA_TypeCode_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_TypeCode_var &
-CORBA_TypeCode_var::operator= (const CORBA_TypeCode_var &p)
-{
-  if (this != &p)
-    {
-      CORBA::release (this->ptr_);
-      this->ptr_ = CORBA_TypeCode::_duplicate (p.ptr ());
-    }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_TypeCode_var::operator const CORBA_TypeCode_ptr &() const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_TypeCode_var::operator CORBA_TypeCode_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_TypeCode_ptr
-CORBA_TypeCode_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_TypeCode_ptr
-CORBA_TypeCode_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_TypeCode_ptr &
-CORBA_TypeCode_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_TypeCode_ptr &
-CORBA_TypeCode_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_TypeCode::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_TypeCode_ptr
-CORBA_TypeCode_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_TypeCode_ptr val = this->ptr_;
-  this->ptr_ = CORBA_TypeCode::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_TypeCode_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_TypeCode_out::CORBA_TypeCode_out (CORBA_TypeCode_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA_TypeCode::_nil ();
-}
-
-ACE_INLINE
-CORBA_TypeCode_out::CORBA_TypeCode_out (CORBA_TypeCode_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_TypeCode::_nil ();
-}
-
-ACE_INLINE
-CORBA_TypeCode_out::CORBA_TypeCode_out (const CORBA_TypeCode_out &p)
-  : ptr_ (p.ptr_)
-{}
-
-ACE_INLINE CORBA_TypeCode_out &
-CORBA_TypeCode_out::operator= (const CORBA_TypeCode_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_TypeCode_out &
-CORBA_TypeCode_out::operator= (CORBA_TypeCode_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_TypeCode_out::operator CORBA_TypeCode_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_TypeCode_ptr &
-CORBA_TypeCode_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_TypeCode_ptr
-CORBA_TypeCode_out::operator-> (void)
-{
-  return this->ptr_;
-}
diff --git a/TAO/tao/Typecode_Constants.cpp b/TAO/tao/Typecode_Constants.cpp
deleted file mode 100644
index 25dacc3b002..00000000000
--- a/TAO/tao/Typecode_Constants.cpp
+++ /dev/null
@@ -1,1966 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Typecode_Constants.cpp
-//
-// = DESCRIPTION
-//   All the CORBA-specified typecode constants.
-//
-//   NOTE:  IFR TypeCode constants aren't here; they're left for an IDL
-//   compiler to generate from the appropriate IDL source.
-//
-//   NOTE:  it'd be nice to have these not use init sections.  Most can easily
-//   be in readonly data (e.g. text segment, ROM) rather than writable data;
-//   that speeds program startup and page sharing in shared libraries.
-//
-//   THREADING NOTE:  no issues, these are immutable constants
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//     and Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "tao/Typecode.h"
-#include "tao/ORB.h"
-#include "tao/GIOP.h"
-#include "tao/Object.h"
-#include "tao/Object_KeyC.h"
-#include "tao/PolicyC.h"
-#include "tao/CurrentC.h"
-#include "tao/DynAnyC.h"
-#include "tao/InconsistentTypeCodeC.h"
-#include "tao/DomainC.h"
-#include "tao/WrongTransactionC.h"
-#include "tao/Services.h"
-#include "tao/NVList.h"
-#if defined(TAO_POLLER)
-#include "tao/PollableC.h"
-#endif /* TAO_POLLER */
-
-ACE_RCSID(tao, Typecode_Constants, "$Id$")
-
-// Declare all the standard typecodes owned by the ORB
-
-// Null and void
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_null, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_void, 0)
-TAO_NAMESPACE_END
-
-// Basic numeric types:  short, long, longlong, and unsigned variants
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_short, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_long, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_longlong, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ushort, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ulong, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ulonglong, 0)
-TAO_NAMESPACE_END
-
-// Floating point types: single, double, quad precision
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_float, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_double, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_longdouble, 0)
-TAO_NAMESPACE_END
-
-// Various simple quantities.
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_boolean, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_octet, 0)
-TAO_NAMESPACE_END
-
-// Internationalization-related data types: ISO Latin/1 and "wide"
-// characters, and strings of each.  "wchar" is probably Unicode 1.1,
-// "wstring" being null-terminated sets thereof.
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_char, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_wchar, 0)
-TAO_NAMESPACE_END
-
-// a string/wstring have a simple parameter list that indicates the length
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_string, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_wstring, 0)
-TAO_NAMESPACE_END
-
-//
-// Various things that can be passed as "general" parameters:
-// Any, TypeCode_ptr, Principal_ptr, Object_ptr
-//
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_any, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TypeCode, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Principal, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Object, 0)
-TAO_NAMESPACE_END
-// Two typecodes for exceptions
-CORBA::TypeCode_ptr CORBA::TypeCode::_tc_Bounds = 0;
-CORBA::TypeCode_ptr CORBA::TypeCode::_tc_BadKind = 0;
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_exception_type, 0)
-TAO_NAMESPACE_END
-
-// Some more typecodes in the CORBA namespace. We keep adding
-// to this list as we find more and more things being introduced
-// to the CORBA namespace.
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Current, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Identifier, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RepositoryId, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ORBid, 0)
-TAO_NAMESPACE_END
-
-CORBA::TypeCode_ptr CORBA_ORB::_tc_ObjectId = 0;
-CORBA::TypeCode_ptr CORBA_ORB::_tc_InvalidName = 0;
-
-#if !defined(TAO_HAS_MINIMUM_CORBA)
-
-CORBA::TypeCode_ptr CORBA_ORB::_tc_InconsistentTypeCode = 0;
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ConstructionPolicy, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_NamedValue, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_WrongTransaction, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AnySeq, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FieldName, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_NameValuePair, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_NameValuePairSeq, 0)
-TAO_NAMESPACE_END
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PolicyErrorCode, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PolicyError, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_InvalidPolicies, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PolicyType, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Policy, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PolicyList, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PolicyTypeSeq, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_SetOverrideType, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PolicyManager, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PolicyCurrent, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_DomainManager, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_DomainManagerList, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PollableSet, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Pollable, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_DIIPollable, 0)
-TAO_NAMESPACE_END
-
-// Service definitions
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServiceType, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServiceOption, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServiceDetailType, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServiceDetail, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServiceInformation, 0)
-TAO_NAMESPACE_END
-
-// Internal to TAO ORB
-CORBA::TypeCode_ptr TC_opaque = 0;
-CORBA::TypeCode_ptr TC_ServiceContextList = 0;
-CORBA::TypeCode_ptr TC_completion_status = 0;
-
-// initialize all the ORB owned TypeCode constants. This
-// routine will be invoked by the ORB_init method.
-void
-TAO_TypeCodes::init (void)
-{
-  // Initialize all the standard typecodes owned by the ORB
-
-  // Null and void
-  CORBA::_tc_null = new CORBA::TypeCode (CORBA::tk_null);
-
-  CORBA::_tc_void = new CORBA::TypeCode (CORBA::tk_void);
-
-  // Basic numeric types:  short, long, longlong, and unsigned variants
-  CORBA::_tc_short = new CORBA::TypeCode (CORBA::tk_short);
-
-  CORBA::_tc_long = new CORBA::TypeCode (CORBA::tk_long);
-
-  CORBA::_tc_longlong = new CORBA::TypeCode (CORBA::tk_longlong);
-
-  CORBA::_tc_ushort = new CORBA::TypeCode (CORBA::tk_ushort);
-
-  CORBA::_tc_ulong = new CORBA::TypeCode (CORBA::tk_ulong);
-
-  CORBA::_tc_ulonglong = new CORBA::TypeCode (CORBA::tk_ulonglong);
-
-  // Floating point types: single, double, quad precision
-  CORBA::_tc_float = new CORBA::TypeCode (CORBA::tk_float);
-
-  CORBA::_tc_double = new CORBA::TypeCode (CORBA::tk_double);
-
-  CORBA::_tc_longdouble = new CORBA::TypeCode (CORBA::tk_longdouble);
-
-  // Various simple quantities.
-  CORBA::_tc_boolean = new CORBA::TypeCode (CORBA::tk_boolean);
-
-  CORBA::_tc_octet = new CORBA::TypeCode (CORBA::tk_octet);
-
-  // Internationalization-related data types: ISO Latin/1 and "wide"
-  // characters, and strings of each.  "wchar" is probably Unicode 1.1,
-  // "wstring" being null-terminated sets thereof.
-  CORBA::_tc_char = new CORBA::TypeCode (CORBA::tk_char);
-
-  CORBA::_tc_wchar = new CORBA::TypeCode (CORBA::tk_wchar);
-
-  // a string/wstring have a simple parameter list that indicates the length
-  static const CORBA::Long _oc_string [] =
-  {
-    // CDR typecode octets
-    TAO_ENCAP_BYTE_ORDER, // native endian + padding; "tricky"
-    0                     // ... unbounded string
-  };
-  CORBA::_tc_string = new CORBA::TypeCode (CORBA::tk_string,
-                                           sizeof _oc_string,
-                                           (char*)&_oc_string,
-                                           1,
-                                           sizeof (CORBA::String_var));
-
-  static const CORBA::Long _oc_wstring [] =
-  {
-    // CDR typecode octets
-    TAO_ENCAP_BYTE_ORDER,       // native endian + padding; "tricky"
-    0                     // ... unbounded string
-  };
-  CORBA::_tc_wstring = new CORBA::TypeCode (CORBA::tk_wstring,
-                                            sizeof _oc_wstring,
-                                            (char *) &_oc_wstring,
-                                            1,
-                                            sizeof (CORBA::WChar*));
-
-  //
-  // Various things that can be passed as "general" parameters:
-  // Any, TypeCode_ptr, Principal_ptr, Object_ptr
-  //
-  CORBA::_tc_any = new CORBA::TypeCode (CORBA::tk_any);
-
-  CORBA::_tc_TypeCode = new CORBA::TypeCode (CORBA::tk_TypeCode);
-
-  CORBA::_tc_Principal = new CORBA::TypeCode (CORBA::tk_Principal);
-
-  // typecode for objref is complex, has two string parameters
-  //
-  // NOTE:  Must be four-byte aligned
-
-  static const CORBA::Long _oc_CORBA_Object[] =
-  {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    29,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f62),
-    ACE_NTOHL (0x6a656374),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Object:1.0
-    7,
-    ACE_NTOHL (0x4f626a65),
-    ACE_NTOHL (0x63740000),  // name = Object
-  };
-
-  CORBA::_tc_Object = new CORBA::TypeCode (CORBA::tk_objref,
-                                           sizeof (_oc_CORBA_Object),
-                                           (char *) &_oc_CORBA_Object,
-                                           1,
-                                           sizeof (CORBA::Object));
-
-  // Static initialization of the two user-defined exceptions that
-  // are part of the ORB.
-
-  static const CORBA::Long _oc_CORBA_TypeCode_Bounds[] =
-  {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    38,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5479),
-    ACE_NTOHL (0x7065436f),
-    ACE_NTOHL (0x64652f42),
-    ACE_NTOHL (0x6f756e64),
-    ACE_NTOHL (0x733a312e),
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/TypeCode/Bounds:1.0
-    7,
-    ACE_NTOHL (0x426f756e),
-    ACE_NTOHL (0x64730000),  // name = Bounds
-    0, // member count
-  };
-
-  CORBA::TypeCode::_tc_Bounds =
-    new CORBA::TypeCode (CORBA::tk_except,
-                         sizeof (_oc_CORBA_TypeCode_Bounds),
-                         (char*) &_oc_CORBA_TypeCode_Bounds,
-                         1,
-                         sizeof (CORBA::TypeCode::Bounds));
-
-
-  static const CORBA::Long _oc_CORBA_TypeCode_BadKind[] =
-  {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    39,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5479),
-    ACE_NTOHL (0x7065436f),
-    ACE_NTOHL (0x64652f42),
-    ACE_NTOHL (0x61644b69),
-    ACE_NTOHL (0x6e643a31),
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/TypeCode/BadKind:1.0
-    8,
-    ACE_NTOHL (0x4261644b),
-    ACE_NTOHL (0x696e6400),  // name = BadKind
-    0, // member count
-  };
-  CORBA::TypeCode::_tc_BadKind =
-    new CORBA::TypeCode (CORBA::tk_except,
-                         sizeof (_oc_CORBA_TypeCode_BadKind),
-                         (char*) &_oc_CORBA_TypeCode_BadKind,
-                         1,
-                         sizeof (CORBA::TypeCode::BadKind));
-
-  static const CORBA::Long _oc_CORBA_Identifier[] =
-  {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    25,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0xfdfdfd),  // repository ID = IDL:CORBA/Identifier:1.0
-    11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
-    ACE_NTOHL (0x657200fd),  // name = Identifier
-    CORBA::tk_string,
-    0, // string length
-  };
-
-  CORBA::_tc_Identifier =
-    new CORBA::TypeCode (CORBA::tk_alias,
-                         sizeof (_oc_CORBA_Identifier),
-                         (char *) &_oc_CORBA_Identifier,
-                         1,
-                         sizeof (CORBA::Identifier));
-
-  static const CORBA::Long _oc_CORBA_RepositoryId[] =
-  {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    27,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
-    ACE_NTOHL (0x2e3000fd),  // repository ID = IDL:CORBA/RepositoryId:1.0
-    13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
-    ACE_NTOHL (0xfdfdfd),  // name = RepositoryId
-    CORBA::tk_string,
-    0, // string length
-  };
-  CORBA::_tc_RepositoryId =
-    new CORBA::TypeCode (CORBA::tk_alias,
-                         sizeof (_oc_CORBA_RepositoryId),
-                         (char *) &_oc_CORBA_RepositoryId,
-                         1,
-                         sizeof (CORBA::RepositoryId));
-
-  static const CORBA::Long _oc_CORBA_ORB_InvalidName[] =
-  {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    38, ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f52),
-    ACE_NTOHL (0x422f496e),
-    ACE_NTOHL (0x76616c69),
-    ACE_NTOHL (0x644e616d),
-    ACE_NTOHL (0x653a312e),
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ORB/InvalidName:1.0
-    12, ACE_NTOHL (0x496e7661),
-    ACE_NTOHL (0x6c69644e),
-    ACE_NTOHL (0x616d6500),  // name = InvalidName
-    0, // member count
-  };
-  CORBA::ORB::_tc_InvalidName =
-    new CORBA::TypeCode(CORBA::tk_except,
-                        sizeof (_oc_CORBA_ORB_InvalidName),
-                        (char *) &_oc_CORBA_ORB_InvalidName,
-                        0,
-                        sizeof (CORBA::ORB::InvalidName));
-
-  static const CORBA::Long _oc_CORBA_ORBid[] =
-  {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    28, ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f52),
-    ACE_NTOHL (0x4269643a),
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ORBid:1.0
-    6,
-    ACE_NTOHL (0x4f524269),
-    ACE_NTOHL (0x64000000),  // name = ORBid
-    CORBA::tk_string,
-    0, // string length
-  };
-  CORBA::_tc_ORBid = new CORBA::TypeCode (CORBA::tk_alias,
-                                          sizeof (_oc_CORBA_ORBid),
-                                          (char *) &_oc_CORBA_ORBid,
-                                          0,
-                                          sizeof (CORBA::ORBid));
-
-  static const CORBA::Long _oc_CORBA_ObjectId[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f62),
-    ACE_NTOHL (0x6a656374),
-    ACE_NTOHL (0x49643a31),
-    ACE_NTOHL (0x2e300000),  // repository ID =
-                             //   IDL:omg.org/CORBA/ObjectId:1.0
-    9,
-    ACE_NTOHL (0x4f626a65),
-    ACE_NTOHL (0x63744964),
-    ACE_NTOHL (0x0),        // name = ObjectId
-    CORBA::tk_string,
-    0,                      // string length
-  };
-  CORBA_ORB::_tc_ObjectId =
-    new CORBA::TypeCode (CORBA::tk_alias,
-                         sizeof (_oc_CORBA_ObjectId),
-                         (char *) &_oc_CORBA_ObjectId,
-                         0,
-                         sizeof (CORBA_ORB::ObjectId));
-
-#if !defined(TAO_HAS_MINIMUM_CORBA)
-  static const CORBA::Long _oc_CORBA_ORB_InconsistentTypeCode[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,   // byte order
-    47,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f52),
-    ACE_NTOHL (0x422f496e),
-    ACE_NTOHL (0x636f6e73),
-    ACE_NTOHL (0x69737465),
-    ACE_NTOHL (0x6e745479),
-    ACE_NTOHL (0x7065436f),
-    ACE_NTOHL (0x64653a31),
-    ACE_NTOHL (0x2e3000fd), // repository ID =
-                            //   IDL:omg.org/CORBA/ORB/InconsistentTypeCode:1.0
-    21,
-    ACE_NTOHL (0x496e636f),
-    ACE_NTOHL (0x6e736973),
-    ACE_NTOHL (0x74656e74),
-    ACE_NTOHL (0x54797065),
-    ACE_NTOHL (0x436f6465),
-    ACE_NTOHL (0xfdfdfd),   // name = InconsistentTypeCode
-    0,                      // member count
-  };
-
-  CORBA_ORB::_tc_InconsistentTypeCode =
-    new CORBA::TypeCode (CORBA::tk_except,
-                         sizeof (_oc_CORBA_ORB_InconsistentTypeCode),
-                         (char *) &_oc_CORBA_ORB_InconsistentTypeCode,
-                         0,
-                         sizeof (CORBA_ORB_InconsistentTypeCode));
-
-  static const CORBA::Long _oc_CORBA_ConstructionPolicy[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    41,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f436f),
-    ACE_NTOHL (0x6e737472),
-    ACE_NTOHL (0x75637469),
-    ACE_NTOHL (0x6f6e506f),
-    ACE_NTOHL (0x6c696379),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),          // repository ID =
-                              //   IDL:omg.org/CORBA/ConstructionPolicy:1.0
-    19,
-    ACE_NTOHL (0x436f6e73),
-    ACE_NTOHL (0x74727563),
-    ACE_NTOHL (0x74696f6e),
-    ACE_NTOHL (0x506f6c69),
-    ACE_NTOHL (0x63790000),   // name = ConstructionPolicy,
-  };
-  CORBA::_tc_ConstructionPolicy =
-    new CORBA::TypeCode (CORBA::tk_objref,
-                         sizeof (_oc_CORBA_ConstructionPolicy),
-                         (char *) &_oc_CORBA_ConstructionPolicy,
-                         0,
-                         sizeof (CORBA::ConstructionPolicy));
-
-
-  static const CORBA::Long _oc_corba_NamedValue[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x636f7262),
-    ACE_NTOHL (0x612f4e61),
-    ACE_NTOHL (0x6d656456),
-    ACE_NTOHL (0x616c7565),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),          // repository ID =
-                              //   IDL:omg.org/corba/NamedValue:1.0
-    11,
-    ACE_NTOHL (0x4e616d65),
-    ACE_NTOHL (0x6456616c),
-    ACE_NTOHL (0x75650000),  // name = NamedValue,
-  };
-
-  CORBA::_tc_NamedValue =
-    new CORBA::TypeCode (CORBA::tk_objref,
-                         sizeof (_oc_corba_NamedValue),
-                         (char *) &_oc_corba_NamedValue,
-                         0,
-                         sizeof (CORBA::NamedValue));
-
-  static const CORBA::Long _oc_CORBA_NameValuePair[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    28,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4e61),
-    ACE_NTOHL (0x6d655661),
-    ACE_NTOHL (0x6c756550),
-    ACE_NTOHL (0x6169723a),
-    ACE_NTOHL (0x312e3000),   // repository ID =
-                              //   IDL:CORBA/NameValuePair:1.0
-    14,
-    ACE_NTOHL (0x4e616d65),
-    ACE_NTOHL (0x56616c75),
-    ACE_NTOHL (0x65506169),
-    ACE_NTOHL (0x72000000),   // name = NameValuePair
-    2,                        // member count
-    3,
-    ACE_NTOHL (0x69640000),   // name = id
-    CORBA::tk_alias,          // typecode kind for typedefs
-    56,                       // encapsulation length
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    24,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4669),
-    ACE_NTOHL (0x656c644e),
-    ACE_NTOHL (0x616d653a),
-    ACE_NTOHL (0x312e3000),   // repository ID =
-                              //   IDL:CORBA/FieldName:1.0
-    10,
-    ACE_NTOHL (0x4669656c),
-    ACE_NTOHL (0x644e616d),
-    ACE_NTOHL (0x65000000),   // name = FieldName
-    CORBA::tk_string,
-    0,                        // string length
-    6,
-    ACE_NTOHL (0x76616c75),
-    ACE_NTOHL (0x65000000),   // name = value
-    CORBA::tk_any,
-  };
-
-  CORBA::_tc_NameValuePair =
-    new CORBA::TypeCode (CORBA::tk_struct,
-                         sizeof (_oc_CORBA_NameValuePair),
-                         (char *) &_oc_CORBA_NameValuePair,
-                         0,
-                         sizeof (CORBA::NameValuePair));
-
-  static const CORBA::Long _oc_CORBA_NameValuePairSeq[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4e61),
-    ACE_NTOHL (0x6d655661),
-    ACE_NTOHL (0x6c756550),
-    ACE_NTOHL (0x61697253),
-    ACE_NTOHL (0x65713a31),
-    ACE_NTOHL (0x2e300000),   // repository ID = IDL:CORBA/NameValuePairSeq:1.0
-    17,
-    ACE_NTOHL (0x4e616d65),
-    ACE_NTOHL (0x56616c75),
-    ACE_NTOHL (0x65506169),
-    ACE_NTOHL (0x72536571),
-    ACE_NTOHL (0x0),          // name = NameValuePairSeq
-    CORBA::tk_sequence,       // typecode kind
-    164,                      // encapsulation length
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    CORBA::tk_struct,         // typecode kind
-    148,                      // encapsulation length
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    28,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4e61),
-    ACE_NTOHL (0x6d655661),
-    ACE_NTOHL (0x6c756550),
-    ACE_NTOHL (0x6169723a),
-    ACE_NTOHL (0x312e3000),   // repository ID = IDL:CORBA/NameValuePair:1.0
-    14,
-    ACE_NTOHL (0x4e616d65),
-    ACE_NTOHL (0x56616c75),
-    ACE_NTOHL (0x65506169),
-    ACE_NTOHL (0x72000000),   // name = NameValuePair
-    2,                        // member count
-    3,
-    ACE_NTOHL (0x69640000),   // name = id
-    CORBA::tk_alias,          // typecode kind for typedefs
-    56,                       // encapsulation length
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    24,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4669),
-    ACE_NTOHL (0x656c644e),
-    ACE_NTOHL (0x616d653a),
-    ACE_NTOHL (0x312e3000),   // repository ID = IDL:CORBA/FieldName:1.0
-    10,
-    ACE_NTOHL (0x4669656c),
-    ACE_NTOHL (0x644e616d),
-    ACE_NTOHL (0x65000000),   // name = FieldName
-    CORBA::tk_string,
-    0,                        // string length
-    6,
-    ACE_NTOHL (0x76616c75),
-    ACE_NTOHL (0x65000000),   // name = value
-    CORBA::tk_any,
-    0,
-  };
-  CORBA::_tc_NameValuePairSeq =
-    new CORBA::TypeCode (CORBA::tk_alias,
-                         sizeof (_oc_CORBA_NameValuePairSeq),
-                         (char *) &_oc_CORBA_NameValuePairSeq,
-                         0,
-                         sizeof (CORBA::NameValuePairSeq));
-
-  static const CORBA::Long _oc_CORBA_WrongTransaction[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    39,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5772),
-    ACE_NTOHL (0x6f6e6754),
-    ACE_NTOHL (0x72616e73),
-    ACE_NTOHL (0x61637469),
-    ACE_NTOHL (0x6f6e3a31),
-    ACE_NTOHL (0x2e300000),   // repository ID =
-                              //   IDL:omg.org/CORBA/WrongTransaction:1.0
-    17,
-    ACE_NTOHL (0x57726f6e),
-    ACE_NTOHL (0x67547261),
-    ACE_NTOHL (0x6e736163),
-    ACE_NTOHL (0x74696f6e),
-    ACE_NTOHL (0x0),          // name = WrongTransaction
-    0,                        // member count
-  };
-  CORBA::_tc_WrongTransaction =
-    new CORBA::TypeCode (CORBA::tk_except,
-                         sizeof (_oc_CORBA_WrongTransaction),
-                         (char *) &_oc_CORBA_WrongTransaction,
-                         0,
-                         sizeof (CORBA::WrongTransaction));
-
-  static const CORBA::Long _oc_CORBA_AnySeq[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    21,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f416e),
-    ACE_NTOHL (0x79536571),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),          // repository ID = IDL:CORBA/AnySeq:1.0
-    7,
-    ACE_NTOHL (0x416e7953),
-    ACE_NTOHL (0x65710000),   // name = AnySeq
-    CORBA::tk_sequence,       // typecode kind
-    12,                       // encapsulation length
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    CORBA::tk_any,
-    0,
-  };
-
-  CORBA::_tc_AnySeq =
-    new CORBA::TypeCode (CORBA::tk_alias,
-                         sizeof (_oc_CORBA_AnySeq),
-                         (char *) &_oc_CORBA_AnySeq,
-                         0,
-                         sizeof (CORBA_AnySeq));
-
-  static const CORBA::Long _oc_CORBA_FieldName[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    24,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4669),
-    ACE_NTOHL (0x656c644e),
-    ACE_NTOHL (0x616d653a),
-    ACE_NTOHL (0x312e3000),   // repository ID = IDL:CORBA/FieldName:1.0
-    10,
-    ACE_NTOHL (0x4669656c),
-    ACE_NTOHL (0x644e616d),
-    ACE_NTOHL (0x65000000),   // name = FieldName
-    CORBA::tk_string,
-    0,                        // string length
-  };
-  CORBA::_tc_FieldName =
-    new CORBA::TypeCode (CORBA::tk_alias,
-                         sizeof (_oc_CORBA_FieldName),
-                         (char *) &_oc_CORBA_FieldName,
-                         0,
-                         sizeof (CORBA::FieldName));
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
- // Service Types
-  static const CORBA::Long _oc_CORBA_ServiceOption[] =
-  {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   36,
-   ACE_NTOHL (0x49444c3a),
-   ACE_NTOHL (0x6f6d672e),
-   ACE_NTOHL (0x6f72672f),
-   ACE_NTOHL (0x434f5242),
-   ACE_NTOHL (0x412f5365),
-   ACE_NTOHL (0x72766963),
-   ACE_NTOHL (0x654f7074),
-   ACE_NTOHL (0x696f6e3a),
-   ACE_NTOHL (0x312e3000),  // repository ID =
-                            //   IDL:omg.org/CORBA/ServiceOption:1.0
-   14,
-   ACE_NTOHL (0x53657276),
-   ACE_NTOHL (0x6963654f),
-   ACE_NTOHL (0x7074696f),
-   ACE_NTOHL (0x6e000000),  // name = ServiceOption
-   CORBA::tk_ulong,
-  };
-
-  CORBA::_tc_ServiceOption =
-    new CORBA::TypeCode (CORBA::tk_alias,
-                         sizeof (_oc_CORBA_ServiceOption),
-                         (char *) &_oc_CORBA_ServiceOption,
-                         0,
-                         sizeof (CORBA::ServiceOption));
-
-  static const CORBA::Long _oc_CORBA_ServiceDetailType[] =
-  {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    40,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x65446574),
-    ACE_NTOHL (0x61696c54),
-    ACE_NTOHL (0x7970653a),
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
-    18,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636544),
-    ACE_NTOHL (0x65746169),
-    ACE_NTOHL (0x6c547970),
-    ACE_NTOHL (0x65000000),  // name = ServiceDetailType
-    CORBA::tk_ulong,
-  };
-
- CORBA::_tc_ServiceDetailType =
-   new CORBA::TypeCode (CORBA::tk_alias,
-                        sizeof (_oc_CORBA_ServiceDetailType),
-                        (char *) &_oc_CORBA_ServiceDetailType,
-                        0,
-                        sizeof (CORBA::ServiceDetailType));
-
-  static const CORBA::Long _oc_CORBA_ServiceType[] =
-  {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x65547970),
-    ACE_NTOHL (0x653a312e),
-    ACE_NTOHL (0x30000000),  // repository ID= IDL:omg.org/CORBA/ServiceType:1.0
-    12,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636554),
-    ACE_NTOHL (0x79706500),  // name = ServiceType
-    CORBA::tk_ushort,
-  };
-
- CORBA::_tc_ServiceType =
-   new CORBA::TypeCode (CORBA::tk_alias,
-                        sizeof (_oc_CORBA_ServiceType),
-                        (char *) &_oc_CORBA_ServiceType,
-                        0,
-                        sizeof (CORBA::ServiceType));
-
-  static const CORBA::Long _oc_CORBA_ServiceDetail[] =
-  {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    36,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x65446574),
-    ACE_NTOHL (0x61696c3a),
-    ACE_NTOHL (0x312e3000),  // repository ID= IDL:omg.org/CORBA/ServiceDetail:1.0
-    14,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636544),
-    ACE_NTOHL (0x65746169),
-    ACE_NTOHL (0x6c000000),  // name = ServiceDetail
-    2, // member count
-    20,
-    ACE_NTOHL (0x73657276),
-    ACE_NTOHL (0x6963655f),
-    ACE_NTOHL (0x64657461),
-    ACE_NTOHL (0x696c5f74),
-    ACE_NTOHL (0x79706500),  // name = service_detail_type
-    CORBA::tk_alias, // typecode kind for typedefs
-    76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    40,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x65446574),
-    ACE_NTOHL (0x61696c54),
-    ACE_NTOHL (0x7970653a),
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
-    18,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636544),
-    ACE_NTOHL (0x65746169),
-    ACE_NTOHL (0x6c547970),
-    ACE_NTOHL (0x65000000),  // name = ServiceDetailType
-    CORBA::tk_ulong,
-    15,
-    ACE_NTOHL (0x73657276),
-    ACE_NTOHL (0x6963655f),
-    ACE_NTOHL (0x64657461),
-    ACE_NTOHL (0x696c0000),  // name = service_detail
-    CORBA::tk_sequence, // typecode kind
-    12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-    0,
-  };
-
-  CORBA::_tc_ServiceDetail =
-    new CORBA::TypeCode (CORBA::tk_struct,
-                         sizeof (_oc_CORBA_ServiceDetail),
-                         (char *) &_oc_CORBA_ServiceDetail,
-                         0,
-                         sizeof (CORBA::ServiceDetail));
-
-
-  static const CORBA::Long _oc_CORBA_ServiceInformation[] =
-  {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    41,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x65496e66),
-    ACE_NTOHL (0x6f726d61),
-    ACE_NTOHL (0x74696f6e),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ServiceInformation:1.0
-    19,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636549),
-    ACE_NTOHL (0x6e666f72),
-    ACE_NTOHL (0x6d617469),
-    ACE_NTOHL (0x6f6e0000),  // name = ServiceInformation
-    2, // member count
-    16,
-    ACE_NTOHL (0x73657276),
-    ACE_NTOHL (0x6963655f),
-    ACE_NTOHL (0x6f707469),
-    ACE_NTOHL (0x6f6e7300),  // name = service_options
-    CORBA::tk_sequence, // typecode kind
-    84, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_alias, // typecode kind for typedefs
-    68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    36,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x654f7074),
-    ACE_NTOHL (0x696f6e3a),
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceOption:1.0
-    14,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x6963654f),
-    ACE_NTOHL (0x7074696f),
-    ACE_NTOHL (0x6e000000),  // name = ServiceOption
-    CORBA::tk_ulong,
-    0,
-    16,
-    ACE_NTOHL (0x73657276),
-    ACE_NTOHL (0x6963655f),
-    ACE_NTOHL (0x64657461),
-    ACE_NTOHL (0x696c7300),  // name = service_details
-    CORBA::tk_sequence, // typecode kind
-    232, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    216, // encapsulation length
-    36,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x65446574),
-    ACE_NTOHL (0x61696c3a),
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetail:1.0
-    14,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636544),
-    ACE_NTOHL (0x65746169),
-    ACE_NTOHL (0x6c000000),  // name = ServiceDetail
-    2, // member count
-    20,
-    ACE_NTOHL (0x73657276),
-    ACE_NTOHL (0x6963655f),
-    ACE_NTOHL (0x64657461),
-    ACE_NTOHL (0x696c5f74),
-    ACE_NTOHL (0x79706500),  // name = service_detail_type
-    CORBA::tk_alias, // typecode kind for typedefs
-    76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    40,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x65446574),
-    ACE_NTOHL (0x61696c54),
-    ACE_NTOHL (0x7970653a),
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
-    18,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636544),
-    ACE_NTOHL (0x65746169),
-    ACE_NTOHL (0x6c547970),
-    ACE_NTOHL (0x65000000),  // name = ServiceDetailType
-    CORBA::tk_ulong,
-    15,
-    ACE_NTOHL (0x73657276),
-    ACE_NTOHL (0x6963655f),
-    ACE_NTOHL (0x64657461),
-    ACE_NTOHL (0x696c0000),  // name = service_detail
-    CORBA::tk_sequence, // typecode kind
-    12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-    0,
-    0,
-  };
-
- CORBA::_tc_ServiceInformation =
-    new CORBA::TypeCode (CORBA::tk_struct,
-                         sizeof (_oc_CORBA_ServiceInformation),
-                         (char *) &_oc_CORBA_ServiceInformation,
-                         0,
-                         sizeof (CORBA::ServiceInformation));
-
-  // ****************************************************************
-
-  static const CORBA::Long _oc_CORBA_PolicyErrorCode[] =
-  {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    38,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f506f),
-    ACE_NTOHL (0x6c696379),
-    ACE_NTOHL (0x4572726f),
-    ACE_NTOHL (0x72436f64),
-    ACE_NTOHL (0x653a312e),
-    ACE_NTOHL (0x30000000),  // repository ID =
-                             //   IDL:omg.org/CORBA/PolicyErrorCode:1.0
-    16,
-    ACE_NTOHL (0x506f6c69),
-    ACE_NTOHL (0x63794572),
-    ACE_NTOHL (0x726f7243),
-    ACE_NTOHL (0x6f646500),  // name = PolicyErrorCode
-    CORBA::tk_short,
-  };
-  CORBA::_tc_PolicyErrorCode =
-    new CORBA::TypeCode (CORBA::tk_alias,
-                         sizeof (_oc_CORBA_PolicyErrorCode),
-                         (char *) &_oc_CORBA_PolicyErrorCode,
-                         0,
-                         sizeof (CORBA::PolicyErrorCode));
-
-  static const CORBA::Long _oc_CORBA_PolicyError[] =
-  {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f506f),
-    ACE_NTOHL (0x6c696379),
-    ACE_NTOHL (0x4572726f),
-    ACE_NTOHL (0x723a312e),
-    ACE_NTOHL (0x30000000),   // repository ID =
-                              //   IDL:omg.org/CORBA/PolicyError:1.0
-    12,
-    ACE_NTOHL (0x506f6c69),
-
-    ACE_NTOHL (0x63794572),
-    ACE_NTOHL (0x726f7200),   // name = PolicyError
-    1, // member count
-    7,
-    ACE_NTOHL (0x72656173),
-    ACE_NTOHL (0x6f6e0000),   // name = reason
-    CORBA::tk_alias,          // typecode kind for typedefs
-    72,                       // encapsulation length
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    38,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f506f),
-    ACE_NTOHL (0x6c696379),
-    ACE_NTOHL (0x4572726f),
-    ACE_NTOHL (0x72436f64),
-    ACE_NTOHL (0x653a312e),
-    ACE_NTOHL (0x30000000),   // repository ID =
-                              //   IDL:omg.org/CORBA/PolicyErrorCode:1.0
-    16,
-    ACE_NTOHL (0x506f6c69),
-    ACE_NTOHL (0x63794572),
-    ACE_NTOHL (0x726f7243),
-    ACE_NTOHL (0x6f646500),   // name = PolicyErrorCode
-    CORBA::tk_short,
-  };
-  CORBA::_tc_PolicyError =
-    new CORBA::TypeCode(CORBA::tk_except,
-                        sizeof (_oc_CORBA_PolicyError),
-                        (char *) &_oc_CORBA_PolicyError,
-                        0,
-                        sizeof (CORBA::PolicyError));
-
-  static const CORBA::Long _oc_CORBA_InvalidPolicies[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    38,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f496e),
-    ACE_NTOHL (0x76616c69),
-    ACE_NTOHL (0x64506f6c),
-    ACE_NTOHL (0x69636965),
-    ACE_NTOHL (0x733a312e),
-    ACE_NTOHL (0x30000000),   // repository ID = IDL:omg.org/CORBA/InvalidPolicies:1.0
-    16,
-    ACE_NTOHL (0x496e7661),
-    ACE_NTOHL (0x6c696450),
-    ACE_NTOHL (0x6f6c6963),
-    ACE_NTOHL (0x69657300),   // name = InvalidPolicies
-    1,                        // member count
-    8,
-    ACE_NTOHL (0x696e6469),
-    ACE_NTOHL (0x63657300),   // name = indices
-    CORBA::tk_sequence,       // typecode kind
-    12,                       // encapsulation length
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    CORBA::tk_ushort,
-    0,
-  };
-  CORBA::_tc_InvalidPolicies =
-    new CORBA::TypeCode (CORBA::tk_except,
-                         sizeof (_oc_CORBA_InvalidPolicies),
-                         (char *) &_oc_CORBA_InvalidPolicies,
-                         0,
-                         sizeof (CORBA::InvalidPolicies));
-
-  static const CORBA::Long _oc_CORBA_PolicyType[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f506f),
-    ACE_NTOHL (0x6c696379),
-    ACE_NTOHL (0x54797065),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),          // repository ID =
-                              //   IDL:omg.org/CORBA/PolicyType:1.0
-    11,
-    ACE_NTOHL (0x506f6c69),
-    ACE_NTOHL (0x63795479),
-    ACE_NTOHL (0x70650000),   // name = PolicyType
-    CORBA::tk_ulong,
-  };
-  CORBA::_tc_PolicyType =
-    new CORBA::TypeCode (CORBA::tk_alias,
-                         sizeof (_oc_CORBA_PolicyType),
-                         (char *) &_oc_CORBA_PolicyType,
-                         0,
-                         sizeof (CORBA::PolicyType));
-
-  static const CORBA::Long _oc_CORBA_Policy[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    29,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f506f),
-    ACE_NTOHL (0x6c696379),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),          // repository ID = IDL:omg.org/CORBA/Policy:1.0
-    7,
-    ACE_NTOHL (0x506f6c69),
-    ACE_NTOHL (0x63790000),   // name = Policy,
-  };
-  CORBA::_tc_Policy =
-    new CORBA::TypeCode (CORBA::tk_objref,
-                         sizeof (_oc_CORBA_Policy),
-                         (char *) &_oc_CORBA_Policy,
-                         1,
-                         sizeof (CORBA::Policy));
-
-  static const CORBA::Long _oc_CORBA_PolicyList[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,       // byte order
-    33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f506f),
-    ACE_NTOHL (0x6c696379),
-    ACE_NTOHL (0x4c697374),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),            // repository ID =
-                                //   IDL:omg.org/CORBA/PolicyList:1.0
-    11,
-    ACE_NTOHL (0x506f6c69),
-    ACE_NTOHL (0x63794c69),
-    ACE_NTOHL (0x73740000),     // name = PolicyList
-    CORBA::tk_sequence,         // typecode kind
-    68,                         // encapsulation length
-    TAO_ENCAP_BYTE_ORDER,       // byte order
-    CORBA::tk_objref,           // typecode kind
-    52,                         // encapsulation length
-    TAO_ENCAP_BYTE_ORDER,       // byte order
-    29,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f506f),
-    ACE_NTOHL (0x6c696379),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),            // repository ID =
-                                //   IDL:omg.org/CORBA/Policy:1.0
-    7,
-    ACE_NTOHL (0x506f6c69),
-    ACE_NTOHL (0x63790000),     // name = Policy,
-    0,
-  };
- CORBA::_tc_PolicyList =
-   new CORBA::TypeCode (CORBA::tk_alias,
-                        sizeof (_oc_CORBA_PolicyList),
-                        (char *) &_oc_CORBA_PolicyList,
-                        1,
-                        sizeof (CORBA::PolicyList));
-
-  static const CORBA::Long _oc_CORBA_PolicyTypeSeq[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    36,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f506f),
-    ACE_NTOHL (0x6c696379),
-    ACE_NTOHL (0x54797065),
-    ACE_NTOHL (0x5365713a),
-    ACE_NTOHL (0x312e3000),   // repository ID =
-                              //   IDL:omg.org/CORBA/PolicyTypeSeq:1.0
-    14,
-    ACE_NTOHL (0x506f6c69),
-    ACE_NTOHL (0x63795479),
-    ACE_NTOHL (0x70655365),
-    ACE_NTOHL (0x71000000),   // name = PolicyTypeSeq
-    CORBA::tk_sequence,       // typecode kind
-    80,                       // encapsulation length
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    CORBA::tk_alias,          // typecode kind for typedefs
-    64,                       // encapsulation length
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f506f),
-    ACE_NTOHL (0x6c696379),
-    ACE_NTOHL (0x54797065),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),          // repository ID =
-                              //   IDL:omg.org/CORBA/PolicyType:1.0
-    11,
-    ACE_NTOHL (0x506f6c69),
-    ACE_NTOHL (0x63795479),
-    ACE_NTOHL (0x70650000),   // name = PolicyType
-    CORBA::tk_ulong,
-    0,
- };
- CORBA::_tc_PolicyTypeSeq =
-   new CORBA::TypeCode (CORBA::tk_alias,
-                        sizeof (_oc_CORBA_PolicyTypeSeq),
-                        (char *) &_oc_CORBA_PolicyTypeSeq,
-                        0,
-                        sizeof (CORBA::PolicyTypeSeq));
-
-  static const CORBA::Long _oc_CORBA_SetOverrideType[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    38,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x744f7665),
-    ACE_NTOHL (0x72726964),
-    ACE_NTOHL (0x65547970),
-    ACE_NTOHL (0x653a312e),
-    ACE_NTOHL (0x30000000),   // repository ID =
-                              //   IDL:omg.org/CORBA/SetOverrideType:1.0
-    16,
-    ACE_NTOHL (0x5365744f),
-    ACE_NTOHL (0x76657272),
-    ACE_NTOHL (0x69646554),
-    ACE_NTOHL (0x79706500),   // name = SetOverrideType
-    2,                        // member count
-    13,
-    ACE_NTOHL (0x5345545f),
-    ACE_NTOHL (0x4f564552),
-    ACE_NTOHL (0x52494445),
-    ACE_NTOHL (0x0),          // name = SET_OVERRIDE
-    13,
-    ACE_NTOHL (0x4144445f),
-    ACE_NTOHL (0x4f564552),
-    ACE_NTOHL (0x52494445),
-    ACE_NTOHL (0x0),          // name = ADD_OVERRIDE
-  };
- CORBA::_tc_SetOverrideType =
-   new CORBA::TypeCode (CORBA::tk_enum,
-                        sizeof (_oc_CORBA_SetOverrideType),
-                        (char *) &_oc_CORBA_SetOverrideType,
-                        0,
-                        sizeof (CORBA::SetOverrideType));
-
-  static const CORBA::Long _oc_CORBA_PolicyManager[] =
- {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    36,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f506f),
-    ACE_NTOHL (0x6c696379),
-    ACE_NTOHL (0x4d616e61),
-    ACE_NTOHL (0x6765723a),
-    ACE_NTOHL (0x312e3000),   // repository ID =
-                              //   IDL:omg.org/CORBA/PolicyManager:1.0
-    14,
-    ACE_NTOHL (0x506f6c69),
-    ACE_NTOHL (0x63794d61),
-    ACE_NTOHL (0x6e616765),
-    ACE_NTOHL (0x72000000),   // name = PolicyManager,
-  };
- CORBA::_tc_PolicyManager =
-   new CORBA::TypeCode (CORBA::tk_objref,
-                        sizeof (_oc_CORBA_PolicyManager),
-                        (char *) &_oc_CORBA_PolicyManager,
-                        0,
-                        sizeof (CORBA::PolicyManager));
-
-  static const CORBA::Long _oc_CORBA_PolicyCurrent[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    36,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f506f),
-    ACE_NTOHL (0x6c696379),
-    ACE_NTOHL (0x43757272),
-    ACE_NTOHL (0x656e743a),
-    ACE_NTOHL (0x312e3000),   // repository ID =
-                              //   IDL:omg.org/CORBA/PolicyCurrent:1.0
-    14,
-    ACE_NTOHL (0x506f6c69),
-    ACE_NTOHL (0x63794375),
-    ACE_NTOHL (0x7272656e),
-    ACE_NTOHL (0x74000000),   // name = PolicyCurrent,
-  };
- CORBA::_tc_PolicyCurrent =
-   new CORBA::TypeCode  (CORBA::tk_objref,
-                         sizeof (_oc_CORBA_PolicyCurrent),
-                         (char *) &_oc_CORBA_PolicyCurrent,
-                         0,
-                         sizeof (CORBA::PolicyCurrent));
-
-  static const CORBA::Long _oc_CORBA_DomainManager[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    36,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f446f),
-    ACE_NTOHL (0x6d61696e),
-    ACE_NTOHL (0x4d616e61),
-    ACE_NTOHL (0x6765723a),
-    ACE_NTOHL (0x312e3000),   // repository ID =
-                              //IDL:omg.org/CORBA/DomainManager:1.0
-    14,
-    ACE_NTOHL (0x446f6d61),
-
-    ACE_NTOHL (0x696e4d61),
-    ACE_NTOHL (0x6e616765),
-    ACE_NTOHL (0x72000000),   // name = DomainManager,
-  };
-  CORBA::_tc_DomainManager =
-    new CORBA::TypeCode (CORBA::tk_objref,
-                         sizeof (_oc_CORBA_DomainManager),
-                         (char *) &_oc_CORBA_DomainManager,
-                         0,
-                         sizeof (CORBA_DomainManager));
-
-  static const CORBA::Long _oc_CORBA_DomainManagerList[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,       // byte order
-    40,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f446f),
-    ACE_NTOHL (0x6d61696e),
-    ACE_NTOHL (0x4d616e61),
-    ACE_NTOHL (0x6765724c),
-    ACE_NTOHL (0x6973743a),
-    ACE_NTOHL (0x312e3000),     // repository ID =
-                                //IDL:omg.org/CORBA/DomainManagerList:1.0
-    18,
-    ACE_NTOHL (0x446f6d61),
-    ACE_NTOHL (0x696e4d61),
-    ACE_NTOHL (0x6e616765),
-    ACE_NTOHL (0x724c6973),
-    ACE_NTOHL (0x74000000),     // name = DomainManagerList
-    CORBA::tk_sequence,         // typecode kind
-    80,                         // encapsulation length
-    TAO_ENCAP_BYTE_ORDER,       // byte order
-    CORBA::tk_objref,           // typecode kind
-    64,                         // encapsulation length
-    TAO_ENCAP_BYTE_ORDER,       // byte order
-    36,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f446f),
-    ACE_NTOHL (0x6d61696e),
-    ACE_NTOHL (0x4d616e61),
-    ACE_NTOHL (0x6765723a),
-    ACE_NTOHL (0x312e3000),     // repository ID =
-                                //IDL:omg.org/CORBA/DomainManager:1.0
-    14,
-    ACE_NTOHL (0x446f6d61),
-    ACE_NTOHL (0x696e4d61),
-    ACE_NTOHL (0x6e616765),
-    ACE_NTOHL (0x72000000),     // name = DomainManager,
-    0,
-  };
-  CORBA::_tc_DomainManagerList =
-    new CORBA::TypeCode (CORBA::tk_alias,
-                         sizeof (_oc_CORBA_DomainManagerList),
-                         (char *) &_oc_CORBA_DomainManagerList,
-                         0,
-                         sizeof (CORBA_DomainManagerList));
-
- // ****************************************************************
-
-#if defined(TAO_POLLER)
-  static const CORBA::Long _oc_CORBA_Pollable[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f506f),
-    ACE_NTOHL (0x6c6c6162),
-    ACE_NTOHL (0x6c653a31),
-    ACE_NTOHL (0x2e300000),   // repository ID =
-                              //   IDL:omg.org/CORBA/Pollable:1.0
-    9,
-    ACE_NTOHL (0x506f6c6c),
-    ACE_NTOHL (0x61626c65),
-    ACE_NTOHL (0x0),          // name = Pollable,
-  };
- CORBA::_tc_Pollable =
-   new CORBA::TypeCode (CORBA::tk_objref,
-                        sizeof (_oc_CORBA_Pollable),
-                        (char *) &_oc_CORBA_Pollable,
-                        0,
-                        sizeof (CORBA_Pollable));
-
-  static const CORBA::Long _oc_CORBA_DIIPollable[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4449),
-    ACE_NTOHL (0x49506f6c),
-    ACE_NTOHL (0x6c61626c),
-    ACE_NTOHL (0x653a312e),
-    ACE_NTOHL (0x30000000),   // repository ID =
-                              //   IDL:omg.org/CORBA/DIIPollable:1.0
-    12,
-    ACE_NTOHL (0x44494950),
-    ACE_NTOHL (0x6f6c6c61),
-    ACE_NTOHL (0x626c6500),   // name = DIIPollable,
-  };
- CORBA::_tc_DIIPollable =
-   new CORBA::TypeCode (CORBA::tk_objref,
-                        sizeof (_oc_CORBA_DIIPollable),
-                        (char *) &_oc_CORBA_DIIPollable,
-                        0,
-                        sizeof (CORBA::DIIPollable));
-
-  static const CORBA::Long _oc_CORBA_PollableSet[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f506f),
-    ACE_NTOHL (0x6c6c6162),
-    ACE_NTOHL (0x6c655365),
-    ACE_NTOHL (0x743a312e),
-    ACE_NTOHL (0x30000000),   // repository ID =
-                              //   IDL:omg.org/CORBA/PollableSet:1.0
-    12,
-    ACE_NTOHL (0x506f6c6c),
-    ACE_NTOHL (0x61626c65),
-    ACE_NTOHL (0x53657400),   // name = PollableSet,
-  };
- CORBA::_tc_PollableSet =
-   new CORBA::TypeCode (CORBA::tk_objref,
-                        sizeof (_oc_CORBA_PollableSet),
-                        (char *) &_oc_CORBA_PollableSet,
-                        0,
-                        sizeof (CORBA_PollableSet));
-
-#endif /* TAO_POLLER */
-
- // ****************************************************************
-
-  static const CORBA::Long _oc_CORBA_Current[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    22,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4375),
-    ACE_NTOHL (0x7272656e),
-    ACE_NTOHL (0x743a312e),
-    ACE_NTOHL (0x3000fdfd),   // repository ID = IDL:CORBA/Current:1.0
-    8,
-    ACE_NTOHL (0x43757272),
-    ACE_NTOHL (0x656e7400),   // name = Current,
-  };
- CORBA::_tc_Current = new CORBA::TypeCode (CORBA::tk_objref,
-                                           sizeof (_oc_CORBA_Current),
-                                           (char *) &_oc_CORBA_Current,
-                                           1,
-                                           sizeof (CORBA::Current));
-
- // The following are internal to the TAO ORB
-
-  // Octet codes for the parameters of the "Opaque" (sequence of octet)
-  // data type used various places internally ... a CDR encapsulation
-  // holding two parameters (like all sequence TypeCodes).
-  //
-  // NOTE: this **MUST** be longword aligned, which is why it's coded as
-  // a longword array not an octet array.  Just sticking a long in for
-  // padding won't work with compilers that optimize unused data out of
-  // existence.
-
-  // CDR typecode octets.
-
-  static const CORBA::Long _oc_opaque [] =
-  {
-
-    TAO_ENCAP_BYTE_ORDER,    // native endian + padding; "tricky"
-    10,                      // ... (sequence of) octets
-    0                        // ... unbounded
-  };
-
-  TC_opaque = new CORBA::TypeCode (CORBA::tk_sequence,
-                                   sizeof _oc_opaque,
-                                   (char *) &_oc_opaque,
-                                   1,
-                                   sizeof (TAO_opaque));
-
-  // Octet codes for the parameters of the ServiceContextList TypeCode
-  // ...  this is a CDR encapsulation holding two parameters (like all
-  // sequences): a TypeCode, and the bounds of the sequence (zero in
-  // this case).
-  //
-  // This is complicated since the Typecode for the data type for the
-  // sequence members is complex, a structure that nests two further
-  // typecodes (one is a sequence).
-  //
-  // NOTE:  this must be longword aligned!
-
-  static const CORBA::Long _oc_svc_ctx_list [] =
-  {
-    // START bytes of encapsulation 0
-    TAO_ENCAP_BYTE_ORDER, // native endian + padding; "tricky"
-
-    //
-    // FIRST sequence param:  typecode for struct is complex,
-    // and so uses a nested encapsulation.
-    //
-    CORBA::tk_struct,
-    72, // length of encapsulation 1
-
-    // START bytes of encapsulation 1 (struct params)
-    1, // native endian + padding; "tricky"
-    1, 0, // type ID omitted:  null string
-    1, 0, // name omitted "ServiceContext"
-
-    2, // two struct elements
-
-    // First structure element:  name, typecode for ULong
-    //
-    // NOTE:  to be more strictly correct this could be a CORBA::tk_alias
-    // typecode ...
-
-    1, 0, // name omitted:  "context_id"
-    CORBA::tk_long,
-
-    // Second structure element: name, typecode for sequence of octet;
-    // the typecode for sequence of octet is complex, there's a second
-    // level of nested encapuslation here.
-
-    1, 0, // name omitted:  "context_data"
-    CORBA::tk_sequence,   // sequence typecode
-    16, // length of encapsulation 2
-
-    // START bytes of encapsulation 2 (sequence params)
-    1, // native endian + padding; "tricky"
-    1, 0, // type ID omitted:  null string
-    CORBA::tk_octet, // (sequence of) octet
-    0, // ... unbounded length
-    // END bytes of encapsulation 2 (sequence params)
-
-    // END bytes of encapsulation 1 (struct params)
-
-    // SECOND sequence param:  bound of sequence (none)
-    0 // unbounded seq of ServiceContext
-    // END bytes of encapsulation 0 (sequence params)
-  };
-
-  TC_ServiceContextList =
-    new CORBA::TypeCode (CORBA::tk_sequence,
-                         sizeof _oc_svc_ctx_list,
-                         (char *) &_oc_svc_ctx_list,
-                         1,
-                         sizeof (TAO_GIOP_ServiceContextList));
-
-  static const CORBA::ULong oc_completion_status [] =
-  {
-    TAO_ENCAP_BYTE_ORDER, // byte order flag, tricky
-    0, 0,                 // type ID omitted
-    3,                    // three members
-    0, 0,                 // ... whose names are all omitted
-    0, 0,
-    0, 0
-  };
-
-  TC_completion_status =
-    new CORBA::TypeCode (CORBA::tk_enum,
-                         sizeof oc_completion_status,
-                         (char *) &oc_completion_status,
-                         1,
-                         sizeof (CORBA::CompletionStatus));
-}
-
-// destroy all the typecodes owned by the ORB
-void
-TAO_TypeCodes::fini (void)
-{
-  // Initialize all the standard typecodes owned by the ORB
-
-  // Null and void
-  CORBA::release (CORBA::_tc_null);
-
-  CORBA::release (CORBA::_tc_void);
-
-  // Basic numeric types:  short, long, longlong, and unsigned variants
-  CORBA::release (CORBA::_tc_short);
-
-  CORBA::release (CORBA::_tc_long);
-
-  CORBA::release (CORBA::_tc_longlong);
-
-  CORBA::release (CORBA::_tc_ushort);
-
-  CORBA::release (CORBA::_tc_ulong);
-
-  CORBA::release (CORBA::_tc_ulonglong);
-
-  // Floating point types: single, double, quad precision
-  CORBA::release (CORBA::_tc_float);
-
-  CORBA::release (CORBA::_tc_double);
-
-  CORBA::release (CORBA::_tc_longdouble);
-
-  // Various simple quantities.
-  CORBA::release (CORBA::_tc_boolean);
-
-  CORBA::release (CORBA::_tc_octet);
-
-  // Internationalization-related data types: ISO Latin/1 and "wide"
-  // characters, and strings of each.  "wchar" is probably Unicode 1.1,
-  // "wstring" being null-terminated sets thereof.
-  CORBA::release (CORBA::_tc_char);
-
-  CORBA::release (CORBA::_tc_wchar);
-
-  // a string/wstring have a simple parameter list that indicates the length
-  CORBA::release (CORBA::_tc_string);
-
-  CORBA::release (CORBA::_tc_wstring);
-
-  //
-  // Various things that can be passed as "general" parameters:
-  // Any, TypeCode_ptr, Principal_ptr, Object_ptr
-  //
-  CORBA::release (CORBA::_tc_any);
-
-  CORBA::release (CORBA::_tc_TypeCode);
-
-  CORBA::release (CORBA::_tc_Principal);
-
-  // typecode for objref is complex, has two string parameters
-  //
-  CORBA::release (CORBA::_tc_Object);
-
-  // other ORB owned typecodes
-  CORBA::release (CORBA::TypeCode::_tc_Bounds);
-
-  CORBA::release (CORBA::TypeCode::_tc_BadKind);
-
-  // additional typecodes in the CORBA namespace
-  CORBA::release (CORBA::_tc_Policy);
-
-  CORBA::release (CORBA::_tc_PolicyList);
-
-  CORBA::release (CORBA::_tc_Current);
-
-  CORBA::release (CORBA::_tc_Identifier);
-
-  CORBA::release (CORBA::_tc_RepositoryId);
-
-  CORBA::release (CORBA::ORB::_tc_InvalidName);
-
-  CORBA::release (CORBA::_tc_ORBid);
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-  CORBA::release (CORBA_ORB::_tc_InconsistentTypeCode);
-
-  CORBA::release (CORBA::_tc_ConstructionPolicy);
-
-  CORBA::release (CORBA::_tc_NamedValue);
-
-  CORBA::release (CORBA::_tc_WrongTransaction);
-
-  CORBA::release (CORBA::_tc_AnySeq);
-
-  CORBA::release (CORBA::_tc_NameValuePair);
-
-  CORBA::release (CORBA::_tc_NameValuePairSeq);
-
-  CORBA::release (CORBA::_tc_FieldName);
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  CORBA::release (CORBA_ORB::_tc_ObjectId);
-
-  CORBA::release (CORBA::_tc_PolicyType);
-
-  CORBA::release (CORBA::_tc_PolicyErrorCode);
-
-  CORBA::release (CORBA::_tc_PolicyError);
-
-  CORBA::release (CORBA::_tc_InvalidPolicies);
-
-  CORBA::release (CORBA::_tc_PolicyTypeSeq);
-
-  CORBA::release (CORBA::_tc_SetOverrideType);
-
-  CORBA::release (CORBA::_tc_PolicyManager);
-
-  CORBA::release (CORBA::_tc_PolicyCurrent);
-
-  CORBA::release (CORBA::_tc_DomainManager);
-
-  CORBA::release (CORBA::_tc_DomainManagerList);
-
-#if defined (TAO_POLLER)
-  CORBA::release (CORBA::_tc_Pollable);
-
-  CORBA::release (CORBA::_tc_DIIPollable);
-
-  CORBA::release (CORBA::_tc_PollableSet);
-#endif /* defined (TAO_POLLER) */
-
-  // Service types
-   //= Service type
-   CORBA::release (CORBA::_tc_ServiceType);
-   CORBA::release (CORBA::_tc_ServiceOption);
-   CORBA::release (CORBA::_tc_ServiceDetailType);
-   CORBA::release (CORBA::_tc_ServiceDetail);
-   CORBA::release (CORBA::_tc_ServiceInformation);
-
-  // TAO specific
-  CORBA::release (TC_opaque);
-
-  CORBA::release (TC_ServiceContextList);
-
-  CORBA::release (TC_completion_status);
-}
diff --git a/TAO/tao/UIOP_Acceptor.cpp b/TAO/tao/UIOP_Acceptor.cpp
deleted file mode 100644
index 5f0ca844935..00000000000
--- a/TAO/tao/UIOP_Acceptor.cpp
+++ /dev/null
@@ -1,250 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//      UIOP_Acceptor.cpp
-//
-// = DESCRIPTION
-//
-//
-// = AUTHOR
-//     Fred Kuhns <fredk@cs.wustl.edu>
-//     Ossama Othman <othman@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "tao/UIOP_Acceptor.h"
-
-#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
-#include "tao/UIOP_Profile.h"
-#include "tao/MProfile.h"
-#include "tao/ORB_Core.h"
-#include "tao/GIOP.h"
-#include "tao/Server_Strategy_Factory.h"
-#include "tao/debug.h"
-
-ACE_RCSID(tao, UIOP_Acceptor, "$Id$")
-
-// ****************************************************************
-
-TAO_UIOP_Acceptor::TAO_UIOP_Acceptor (void)
-  : TAO_Acceptor (TAO_IOP_TAG_UNIX_IOP),
-    base_acceptor_ (),
-    version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR),
-    orb_core_ (0),
-    unlink_on_close_ (1)
-{
-}
-
-TAO_UIOP_Acceptor::~TAO_UIOP_Acceptor (void)
-{
-  // Explicitly call close() to aid in post-error resource clean up.
-  // close() is called to ensure that the rendezvous point is removed
-  // from the filesystem.
-  this->close ();
-}
-
-int
-TAO_UIOP_Acceptor::create_mprofile (const TAO_ObjectKey &object_key,
-                                    TAO_MProfile &mprofile)
-{
-  ACE_UNIX_Addr addr;
-
-  if (this->base_acceptor_.acceptor ().get_local_addr (addr) == -1)
-    return 0;
-
-  // we only make one
-  int count = mprofile.profile_count ();
-  if ((mprofile.size () - count) < 1)
-    {
-      if (mprofile.grow (count + 1) == -1)
-        return -1;
-    }
-
-  TAO_UIOP_Profile *pfile = 0;
-  ACE_NEW_RETURN (pfile,
-                  TAO_UIOP_Profile (addr,
-                                    object_key,
-                                    this->version_,
-                                    this->orb_core_),
-                  -1);
-
-  if (mprofile.give_profile (pfile) == -1)
-    return -1;
-
-  if (this->orb_core_->orb_params ()->std_profile_components () == 0)
-    return 0;
-
-  pfile->tagged_components ().set_orb_type (TAO_ORB_TYPE);
-
-  CONV_FRAME::CodeSetComponentInfo code_set_info;
-  code_set_info.ForCharData.native_code_set  = TAO_DEFAULT_CHAR_CODESET_ID;
-  code_set_info.ForWcharData.native_code_set = TAO_DEFAULT_WCHAR_CODESET_ID;
-  pfile->tagged_components ().set_code_sets (code_set_info);
-
-  return 0;
-}
-
-int
-TAO_UIOP_Acceptor::is_collocated (const TAO_Profile* pfile)
-{
-  const TAO_UIOP_Profile *profile =
-    ACE_dynamic_cast(const TAO_UIOP_Profile*, pfile);
-
-  // for UNIX Files this is relatively cheap
-  ACE_UNIX_Addr address;
-  if (this->base_acceptor_.acceptor ().get_local_addr (address) == -1)
-    return 0;
-
-  return profile->object_addr () == address;
-}
-
-ACE_Event_Handler *
-TAO_UIOP_Acceptor::acceptor (void)
-{
-  return &base_acceptor_;
-}
-
-int
-TAO_UIOP_Acceptor::close (void)
-{
-  ACE_UNIX_Addr addr;
-
-  if (this->base_acceptor_.acceptor ().get_local_addr (addr) == -1)
-    return -1;
-
-  if (this->unlink_on_close_)
-    (void) ACE_OS::unlink (addr.get_path_name ());
-
-  return this->base_acceptor_.close ();
-}
-
-int
-TAO_UIOP_Acceptor::open (TAO_ORB_Core *orb_core,
-                         int major,
-                         int minor,
-                         ACE_CString &address)
-{
-  if (major >= 0 && minor >= 0)
-    this->version_.set_version (ACE_static_cast (CORBA::Octet, major),
-                                ACE_static_cast (CORBA::Octet, minor));
-
-  return this->open_i (orb_core, address.c_str ());
-}
-
-int
-TAO_UIOP_Acceptor::open_default (TAO_ORB_Core *orb_core)
-{
-  ACE_Auto_String_Free tempname (ACE_OS::tempnam (0, "TAO"));
-
-  if (tempname.get () == 0)
-    return -1;
-
-  return this->open_i (orb_core, tempname.get ());
-}
-
-int
-TAO_UIOP_Acceptor::open_i (TAO_ORB_Core* orb_core,
-                           const char *rendezvous)
-{
-  this->orb_core_ = orb_core;
-
-  ACE_UNIX_Addr addr;
-
-  this->rendezvous_point (addr, rendezvous);
-
-  if (this->base_acceptor_.open (orb_core, addr) != 0)
-    {
-      // Don't unlink an existing rendezvous point since it may be in
-      // use by another UIOP server/client.
-      if (errno == EADDRINUSE)
-        this->unlink_on_close_ = 0;
-
-      return -1;
-    }
-
-  // @@ If Profile creation is slow we may need to cache the
-  //    rendezvous point here
-
-  if (TAO_debug_level > 5)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "\nTAO (%P|%t) UIOP_Acceptor::open_i - "
-                  "listening on: <%s>\n",
-                  addr.get_path_name ()));
-    }
-
-  return 0;
-}
-
-void
-TAO_UIOP_Acceptor::rendezvous_point (ACE_UNIX_Addr &addr,
-                                     const char *rendezvous)
-{
-  // To guarantee portability, local IPC rendezvous points (including
-  // the path and filename) should not be longer than 99 characters
-  // long. Some platforms may support longer rendezvous points,
-  // usually 108 characters including the null terminator, but
-  // Posix.1g only requires that local IPC rendezvous point arrays
-  // contain a maximum of at least 100 characters, including the null
-  // terminator.  If an endpoint is longer than what the platform
-  // supports then it will be truncated so that it fits, and a warning
-  // will be issued.
-
-  // Avoid using relative paths in your UIOP endpoints.  If possible,
-  // use absolute paths instead.  Imagine that the server is given an
-  // endpoint to create using -ORBEndpoint uiop://foobar.  A local IPC
-  // rendezvous point called foobar will be created in the current
-  // working directory.  If the client is not started in the directory
-  // where the foobar rendezvous point exists then the client will not
-  // be able to communicate with the server since its point of
-  // communication, the rendezvous point, was not found. On the other
-  // hand, if an absolute path was used, the client would know exactly
-  // where to find the rendezvous point.  It is up to the user to
-  // make sure that a given UIOP endpoint is accessible by both the
-  // server and the client.
-
-  addr.set (rendezvous);
-
-  size_t length = ACE_OS::strlen (addr.get_path_name ());
-
-  // Check if rendezvous point was truncated by ACE_UNIX_Addr since
-  // most UNIX domain socket rendezvous points can only be less than
-  // 108 characters long.
-  if (length < ACE_OS::strlen (rendezvous))
-    {
-      ACE_DEBUG ((LM_WARNING,
-                  "TAO (%P|%t) UIOP rendezvous point was truncated to <%s>\n"
-                  "since it was longer than %d characters long.\n",
-                  addr.get_path_name (),
-                  length));
-    }
-}
-
-CORBA::ULong
-TAO_UIOP_Acceptor::endpoint_count (void)
-{
-  return 1;
-}
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Acceptor<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>;
-template class TAO_Acceptor_Impl<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Acceptor<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>
-#pragma instantiate TAO_Acceptor_Impl<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
-#endif  /* !ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/TAO/tao/UIOP_Acceptor.h b/TAO/tao/UIOP_Acceptor.h
deleted file mode 100644
index 67417e11644..00000000000
--- a/TAO/tao/UIOP_Acceptor.h
+++ /dev/null
@@ -1,110 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    UIOP_Acceptor.h
-//
-// = DESCRIPTION
-//    Unix Domain Socket (UIOP) specific acceptor processing
-//
-// = AUTHOR
-//    Fred Kuhns <fredk@cs.wustl.edu>
-//    Ossama Othman <othman@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_UIOP_ACCEPTOR_H
-#define TAO_UIOP_ACCEPTOR_H
-
-#include "ace/Acceptor.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-# if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
-#include "ace/LSOCK_Acceptor.h"
-#include "tao/Pluggable.h"
-#include "tao/UIOP_Connect.h"
-#include "tao/Acceptor_Impl.h"
-
-// TAO UIOP_Acceptor concrete call defination
-
-class TAO_Export TAO_UIOP_Acceptor : public TAO_Acceptor
-{
-  // = TITLE
-  //   The UIOP-specific bridge class for the concrete acceptor.
-  //
-  // = DESCRIPTION
-  //
-public:
-  // TAO_UIOP_Acceptor (ACE_UNIX_Addr &addr);
-  // Create Acceptor object using addr.
-
-  TAO_UIOP_Acceptor (void);
-  // Create Acceptor object using addr.
-
-  virtual ~TAO_UIOP_Acceptor (void);
-  // Destructor
-
-  int open (TAO_ORB_Core *orb_core,
-            int version_major,
-            int version_minor,
-            ACE_CString &address);
-  // initialize acceptor for this address.
-
-  virtual int close (void);
-  // Closes the acceptor
-
-  virtual int open_default (TAO_ORB_Core *orb_core);
-  // Open an acceptor on the default endpoint for this protocol
-
-  int create_mprofile (const TAO_ObjectKey &object_key,
-                       TAO_MProfile &mprofile);
-  // create profile objects for this Acceptor using the SAP
-  // (service access point) and object_key.
-
-  // = See TAO_Acceptor
-  virtual int is_collocated (const TAO_Profile*);
-
-  virtual ACE_Event_Handler *acceptor (void);
-  // Return the underlying acceptor object, ACE_Acceptor
-
-  CORBA::ULong endpoint_count (void);
-  // return the number of profiles this will generate
-
-  typedef TAO_Acceptor_Impl<TAO_UIOP_Server_Connection_Handler,ACE_LSOCK_ACCEPTOR> TAO_UIOP_BASE_ACCEPTOR;
-
-private:
-  int open_i (TAO_ORB_Core *orb_core, const char *rendezvous);
-  // Implement the common part of the open*() methods
-
-  void rendezvous_point (ACE_UNIX_Addr &, const char *rendezvous);
-  // Set the rendezvous point and verify that it is
-  // valid (e.g. wasn't truncated because it was too long).
-
-private:
-  TAO_UIOP_BASE_ACCEPTOR base_acceptor_;
-  // the concrete acceptor, as a pointer to its base class.
-
-  TAO_GIOP_Version version_;
-  // The GIOP version for this endpoint
-
-  TAO_ORB_Core *orb_core_;
-  // ORB Core.
-
-  int unlink_on_close_;
-  // Flag that determines whether or not the rendezvous point should
-  // be unlinked on close.  This is really only used when an error
-  // occurs.
-};
-
-# endif /* !ACE_LACKS_UNIX_DOMAIN_SOCKETS */
-
-#endif  /* TAO_UIOP_ACCEPTOR_H */
diff --git a/TAO/tao/UIOP_Connect.cpp b/TAO/tao/UIOP_Connect.cpp
deleted file mode 100644
index dac245ffe98..00000000000
--- a/TAO/tao/UIOP_Connect.cpp
+++ /dev/null
@@ -1,364 +0,0 @@
-// $Id$
-
-#include "tao/UIOP_Connect.h"
-
-#if !defined(ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
-#include "tao/UIOP_Transport.h"
-#include "tao/GIOP.h"
-#include "tao/debug.h"
-#include "tao/ORB_Core.h"
-#include "tao/ORB.h"
-#include "tao/CDR.h"
-#include "tao/Timeprobe.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/UIOP_Connect.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, UIOP_Connect, "$Id$")
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-
-static const char *TAO_UIOP_Connect_Timeprobe_Description[] =
-{
-  "UIOP_Server_Connection_Handler::handle_input - start",
-  "UIOP_Server_Connection_Handler::handle_input - end",
-
-  "UIOP_Server_Connection_Handler::handle_locate - start",
-  "UIOP_Server_Connection_Handler::handle_locate - end",
-
-  "UIOP_Server_Connection_Handler::receive_request - end",
-
-  "UIOP_Client_Connection_Handler::send_request - start",
-  "UIOP_Client_Connection_Handler::send_request - end"
-};
-
-enum
-{
-  // Timeprobe description table start key
-  TAO_UIOP_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_START = 1400,
-  TAO_UIOP_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_END,
-
-  TAO_UIOP_SERVER_CONNECTION_HANDLER_HANDLE_LOCATE_START,
-  TAO_UIOP_SERVER_CONNECTION_HANDLER_HANDLE_LOCATE_END,
-
-  TAO_UIOP_SERVER_CONNECTION_HANDLER_RECEIVE_REQUEST_END,
-
-  TAO_UIOP_CLIENT_CONNECTION_HANDLER_SEND_REQUEST_START,
-  TAO_UIOP_CLIENT_CONNECTION_HANDLER_SEND_REQUEST_END
-};
-
-// Setup Timeprobes
-ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_UIOP_Connect_Timeprobe_Description,
-                                  TAO_UIOP_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_START);
-
-#endif /* ACE_ENABLE_TIMEPROBES */
-
-TAO_UIOP_Handler_Base::TAO_UIOP_Handler_Base (TAO_ORB_Core *orb_core)
-    : TAO_UIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0)
-{
-}
-
-TAO_UIOP_Handler_Base::TAO_UIOP_Handler_Base (ACE_Thread_Manager *t)
-  : TAO_UIOP_SVC_HANDLER (t, 0, 0)
-{
-}
-
-// ****************************************************************
-
-TAO_UIOP_Server_Connection_Handler::TAO_UIOP_Server_Connection_Handler (ACE_Thread_Manager *t)
-  : TAO_UIOP_Handler_Base (t),
-    transport_ (this, 0),
-    orb_core_ (0),
-    tss_resources_ (0)
-{
-  // This constructor should *never* get called, it is just here to
-  // make the compiler happy: the default implementation of the
-  // Creation_Strategy requires a constructor with that signature, we
-  // don't use that implementation, but some (most?) compilers
-  // instantiate it anyway.
-  ACE_ASSERT (this->orb_core_ != 0);
-}
-
-TAO_UIOP_Server_Connection_Handler::TAO_UIOP_Server_Connection_Handler (TAO_ORB_Core *orb_core)
-  : TAO_UIOP_Handler_Base (orb_core),
-    transport_ (this, orb_core),
-    orb_core_ (orb_core),
-    tss_resources_ (orb_core->get_tss_resources ())
-{
-}
-
-TAO_UIOP_Server_Connection_Handler::~TAO_UIOP_Server_Connection_Handler (void)
-{
-}
-
-int
-TAO_UIOP_Server_Connection_Handler::open (void*)
-{
-#if !defined (ACE_LACKS_SOCKET_BUFSIZ)
-  int sndbufsize =
-    this->orb_core_->orb_params ()->sock_sndbuf_size ();
-  int rcvbufsize =
-    this->orb_core_->orb_params ()->sock_rcvbuf_size ();
-
-  if (this->peer ().set_option (SOL_SOCKET,
-                                SO_SNDBUF,
-                                ACE_reinterpret_cast (void *, &sndbufsize),
-                                sizeof (sndbufsize)) == -1
-      && errno != ENOTSUP)
-    return -1;
-  else if (this->peer ().set_option (SOL_SOCKET,
-                                     SO_RCVBUF,
-                                     ACE_reinterpret_cast (void *, &rcvbufsize),
-                                     sizeof (rcvbufsize)) == -1
-           && errno != ENOTSUP)
-    return -1;
-#endif /* !ACE_LACKS_SOCKET_BUFSIZ */
-
-  (void) this->peer ().enable (ACE_CLOEXEC);
-  // Set the close-on-exec flag for that file descriptor. If the
-  // operation fails we are out of luck (some platforms do not support
-  // it and return -1).
-
-  // Called by the <Strategy_Acceptor> when the handler is completely
-  // connected.
-  ACE_UNIX_Addr addr;
-
-  if (this->peer ().get_remote_addr (addr) == -1)
-    return -1;
-
-  if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) UIOP connection from client <%s> on %d\n",
-                  addr.get_path_name (), this->peer ().get_handle ()));
-
-  return 0;
-}
-
-int
-TAO_UIOP_Server_Connection_Handler::activate (long flags,
-                                              int n_threads,
-                                              int force_active,
-                                              long priority,
-                                              int grp_id,
-                                              ACE_Task_Base *task,
-                                              ACE_hthread_t thread_handles[],
-                                              void *stack[],
-                                              size_t stack_size[],
-                                              ACE_thread_t  thread_names[])
-{
-  if (TAO_orbdebug)
-    ACE_DEBUG  ((LM_DEBUG,
-                 "TAO (%P|%t) UIOP_Server_Connection_Handler::activate"
-                 " %d threads, flags = %d\n",
-                 n_threads,
-                 flags,
-                 THR_BOUND));
-
-  return TAO_UIOP_SVC_HANDLER::activate (flags,
-                                         n_threads,
-                                         force_active,
-                                         priority,
-                                         grp_id,
-                                         task,
-                                         thread_handles,
-                                         stack,
-                                         stack_size,
-                                         thread_names);
-}
-
-int
-TAO_UIOP_Server_Connection_Handler::handle_close (ACE_HANDLE handle,
-                                                  ACE_Reactor_Mask rm)
-{
-  if (TAO_orbdebug)
-    ACE_DEBUG  ((LM_DEBUG,
-                 "TAO (%P|%t) UIOP_Server_Connection_Handler::handle_close"
-                 " (%d, %d)\n",
-                 handle,
-                 rm));
-
-  return TAO_UIOP_SVC_HANDLER::handle_close (handle, rm);
-}
-
-int
-TAO_UIOP_Server_Connection_Handler::svc (void)
-{
-  // This method is called when an instance is "activated", i.e.,
-  // turned into an active object.  Presumably, activation spawns a
-  // thread with this method as the "worker function."
-  int result = 0;
-
-  // Inheriting the ORB_Core tss stuff from the parent thread.
-  this->orb_core_->inherit_from_parent_thread (this->tss_resources_);
-
-  if (TAO_orbdebug)
-    ACE_DEBUG ((LM_DEBUG,
-                "(%P|%t) TAO_UIOP_Server_Connection_Handler::svc begin\n"));
-
-  // Here we simply synthesize the "typical" event loop one might find
-  // in a reactive handler, except that this can simply block waiting
-  // for input.
-
-  while ((result = handle_input ()) >= 0)
-    continue;
-
-  if (TAO_orbdebug)
-    ACE_DEBUG  ((LM_DEBUG,
-                 "(%P|%t) TAO_UIOP_Server_Connection_Handler::svc end\n"));
-
-  return result;
-}
-
-int
-TAO_UIOP_Server_Connection_Handler::handle_input (ACE_HANDLE)
-{
-  int result = TAO_GIOP::handle_input (this->transport (),
-                                       this->orb_core_,
-                                       this->transport_.message_state_);
-
-  if (result == -1 && TAO_debug_level > 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - %p\n",
-                  "TAO_UIOP_Server_Connection_Handler::handle_input, "
-                  "handle_input"));
-    }
-
-  if (result == 0 || result == -1)
-    return result;
-
-  result = TAO_GIOP::process_server_message (this->transport (),
-                                             this->orb_core_,
-                                             this->transport_.message_state_.cdr,
-                                             this->transport_.message_state_);
-  if (result != -1)
-    {
-      this->transport_.message_state_.reset ();
-      result = 0;
-    }
-
-  return result;
-}
-
-// ****************************************************************
-
-TAO_UIOP_Client_Connection_Handler::
-TAO_UIOP_Client_Connection_Handler (ACE_Thread_Manager *t,
-                                    TAO_ORB_Core* orb_core)
-  : TAO_UIOP_Handler_Base (t),
-    transport_ (this, orb_core),
-    orb_core_ (orb_core)
-{
-}
-
-TAO_UIOP_Client_Connection_Handler::~TAO_UIOP_Client_Connection_Handler (void)
-{
-}
-
-// @@ Should I do something here to enable non-blocking?? (Alex).
-// @@ Alex: I don't know if this is the place to do it, but the way to
-//    do it is:
-//    if (this->peer ().enable (ACE_NONBLOCK) == -1)
-//       return -1;
-//    Probably we will need to use the transport to decide if it is
-//    needed or not.
-
-int
-TAO_UIOP_Client_Connection_Handler::open (void *)
-{
-  // @@ TODO: These flags should be set using the RT CORBA policies...
-
-  // Here is where we could enable all sorts of things such as
-  // nonblock I/O, sock buf sizes, etc.
-
-#if !defined (ACE_LACKS_SOCKET_BUFSIZ)
-  int sndbufsize =
-    this->orb_core_->orb_params ()->sock_sndbuf_size ();
-  int rcvbufsize =
-    this->orb_core_->orb_params ()->sock_rcvbuf_size ();
-
-  if (this->peer ().set_option (SOL_SOCKET,
-                                SO_SNDBUF,
-                                ACE_reinterpret_cast (void *, &sndbufsize),
-                                sizeof (sndbufsize)) == -1
-      && errno != ENOTSUP)
-    return -1;
-  else if (this->peer ().set_option (SOL_SOCKET,
-                                     SO_RCVBUF,
-                                     ACE_reinterpret_cast (void *, &rcvbufsize),
-                                     sizeof (rcvbufsize)) == -1
-           && errno != ENOTSUP)
-    return -1;
-#endif /* ACE_LACKS_SOCKET_BUFSIZ */
-
-  (void) this->peer ().enable (ACE_CLOEXEC);
-  // Set the close-on-exec flag for that file descriptor. If the
-  // operation fails we are out of luck (some platforms do not support
-  // it and return -1).
-
-  // Called by the <Strategy_Acceptor> when the handler is completely
-  // connected.
-  ACE_UNIX_Addr addr;
-
-  if (this->peer ().get_remote_addr (addr) == -1)
-    return -1;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO (%P|%t) UIOP connection to server <%s> on %d\n",
-                addr.get_path_name (), this->peer ().get_handle ()));
-
-  // Register the handler with the Reactor if necessary.
-  return this->transport ()->wait_strategy ()->register_handler ();
-}
-
-int
-TAO_UIOP_Client_Connection_Handler::handle_close (ACE_HANDLE handle,
-                                                  ACE_Reactor_Mask rm)
-{
-  // @@ Alex: we need to figure out if the transport decides to close
-  //    us or something else.  If it is something else (for example
-  //    the cached connector trying to make room for other
-  //    connections) then we should let the transport know, so it can
-  //    in turn take appropiate action (such as sending exceptions to
-  //    all waiting reply handlers).
-
-  if (TAO_orbdebug)
-    ACE_DEBUG  ((LM_DEBUG,
-                 "TAO (%P|%t) UIOP_Client_Connection_Handler::handle_close"
-                 " (%d, %d)\n",
-                 handle,
-                 rm));
-
-  if (this->recycler ())
-    this->recycler ()->mark_as_closed (this->recycling_act ());
-
-  // Deregister this handler with the ACE_Reactor.
-  if (this->reactor ())
-    {
-      ACE_Reactor_Mask mask =
-        ACE_Event_Handler::ALL_EVENTS_MASK | ACE_Event_Handler::DONT_CALL;
-
-      // Make sure there are no timers.
-      this->reactor ()->cancel_timer (this);
-
-      // Remove self from reactor.
-      this->reactor ()->remove_handler (this, mask);
-    }
-
-  this->peer ().close ();
-
-  return 0;
-}
-
-// ****************************************************************
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* !ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/TAO/tao/UIOP_Connect.h b/TAO/tao/UIOP_Connect.h
deleted file mode 100644
index ec1296023e6..00000000000
--- a/TAO/tao/UIOP_Connect.h
+++ /dev/null
@@ -1,161 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     UIOP_Connect.h
-//
-// = AUTHOR
-//     Ossama Othman
-//
-// ============================================================================
-
-#ifndef TAO_UIOP_CONNECT_H
-#define TAO_UIOP_CONNECT_H
-
-#include "ace/Reactor.h"
-
-#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Acceptor.h"
-#include "ace/LSOCK_Acceptor.h"
-#include "ace/Synch.h"
-#include "ace/Svc_Handler.h"
-
-#include "tao/corbafwd.h"
-#include "tao/Wait_Strategy.h"
-
-#include "tao/UIOP_Transport.h"
-
-// Forward Decls
-class TAO_ORB_Core;
-class TAO_ORB_Core_TSS_Resources;
-
-
-typedef ACE_Svc_Handler<ACE_LSOCK_STREAM, ACE_NULL_SYNCH>
-        TAO_UIOP_SVC_HANDLER;
-
-class TAO_UIOP_Handler_Base : public TAO_UIOP_SVC_HANDLER
-{
-public:
-  TAO_UIOP_Handler_Base (ACE_Thread_Manager *t);
-  TAO_UIOP_Handler_Base (TAO_ORB_Core *orb_core);
-
-  virtual TAO_Transport *transport (void) = 0;
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_UIOP_Client_Connection_Handler : public TAO_UIOP_Handler_Base
-{
-  // = TITLE
-  //      <Svc_Handler> used on the client side and returned by the
-  //      <TAO_CONNECTOR>.
-public:
-  // = Intialization method.
-  TAO_UIOP_Client_Connection_Handler (ACE_Thread_Manager *t = 0,
-                                      TAO_ORB_Core* orb_core = 0);
-
-  virtual ~TAO_UIOP_Client_Connection_Handler (void);
-
-  // = <Connector> hook.
-  virtual int open (void *);
-  // Activation template method.
-
-  // = Event Handler overloads
-
-  virtual int handle_input (ACE_HANDLE = ACE_INVALID_HANDLE);
-  // Called when a a response from a twoway invocation is available.
-
-  virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
-                            ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK);
-  // Perform appropriate closing.
-
-  virtual int close (u_long flags = 0);
-  // Object termination hook.
-
-  virtual TAO_Transport *transport (void);
-
-protected:
-  TAO_UIOP_Client_Transport transport_;
-  // Reference to the transport object, it is owned by this class.
-
-  TAO_ORB_Core *orb_core_;
-  // Cached ORB Core.
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_UIOP_Server_Connection_Handler : public TAO_UIOP_Handler_Base
-{
-  // = TITLE
-  //   Handles requests on a single connection in a server.
-
-public:
-  TAO_UIOP_Server_Connection_Handler (ACE_Thread_Manager* t = 0);
-  TAO_UIOP_Server_Connection_Handler (TAO_ORB_Core *orb_core);
-  // Constructor.
-
-  ~TAO_UIOP_Server_Connection_Handler (void);
-  // Destructor
-
-  virtual int open (void *);
-  // Called by the <Strategy_Acceptor> when the handler is completely
-  // connected.  Argument is unused.
-
-  // = Active object activation method.
-  virtual int activate (long flags = THR_NEW_LWP,
-                        int n_threads = 1,
-                        int force_active = 0,
-                        long priority = ACE_DEFAULT_THREAD_PRIORITY,
-                        int grp_id = -1,
-                        ACE_Task_Base *task = 0,
-                        ACE_hthread_t thread_handles[] = 0,
-                        void *stack[] = 0,
-                        size_t stack_size[] = 0,
-                        ACE_thread_t  thread_names[] = 0);
-
-  virtual int svc (void);
-  // Only used when the handler is turned into an active object by
-  // calling <activate>.  This serves as the event loop in such cases.
-
-  // = Template Methods Called by <handle_input>
-
-  TAO_Transport *transport (void);
-
-protected:
-  TAO_UIOP_Server_Transport transport_;
-  // @@ New transport object reference.
-
-  // = Event Handler overloads
-
-  virtual int handle_input (ACE_HANDLE = ACE_INVALID_HANDLE);
-  // Reads a message from the <peer()>, dispatching and servicing it
-  // appropriately.
-
-  virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
-                            ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK);
-  // Perform appropriate closing.
-
-  TAO_ORB_Core *orb_core_;
-  // Cached the ORB Core.
-
-  TAO_ORB_Core_TSS_Resources *tss_resources_;
-  // Cached tss resources of the ORB that activated this object.
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao/UIOP_Connect.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* !ACE_LACKS_UNIX_DOMAIN_SOCKETS */
-
-#endif /* TAO_UIOP_CONNECT_H */
diff --git a/TAO/tao/UIOP_Connect.i b/TAO/tao/UIOP_Connect.i
deleted file mode 100644
index 2ced771f3c1..00000000000
--- a/TAO/tao/UIOP_Connect.i
+++ /dev/null
@@ -1,33 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
-ACE_INLINE TAO_Transport *
-TAO_UIOP_Server_Connection_Handler::transport (void)
-{
-  return &(this->transport_);
-}
-
-ACE_INLINE TAO_Transport *
-TAO_UIOP_Client_Connection_Handler::transport (void)
-{
-  return &(this->transport_);
-}
-
-ACE_INLINE int
-TAO_UIOP_Client_Connection_Handler::handle_input (ACE_HANDLE)
-{
-  // Call the waiter to handle the input.
-  return this->transport ()->wait_strategy ()->handle_input ();
-}
-
-ACE_INLINE int
-TAO_UIOP_Client_Connection_Handler::close (u_long /* flags */)
-{
-  this->destroy ();
-
-  return 0;
-}
-
-#endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/TAO/tao/UIOP_Connector.cpp b/TAO/tao/UIOP_Connector.cpp
deleted file mode 100644
index 0743ba2ab7f..00000000000
--- a/TAO/tao/UIOP_Connector.cpp
+++ /dev/null
@@ -1,460 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     UIOP_Connector.cpp
-//
-// = DESCRIPTION
-//
-// = AUTHOR
-//     Fred Kuhns <fredk@cs.wustl.edu>
-//     Ossama Othman <othman@cs.wustl.edu>
-// ============================================================================
-
-#include "tao/UIOP_Connector.h"
-
-#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
-#include "tao/UIOP_Profile.h"
-#include "tao/GIOP.h"
-#include "tao/debug.h"
-#include "tao/ORB_Core.h"
-#include "tao/Environment.h"
-
-ACE_RCSID(tao, UIOP_Connector, "$Id$")
-
-// ****************************************************************
-
-TAO_UIOP_Connect_Creation_Strategy::
-  TAO_UIOP_Connect_Creation_Strategy (ACE_Thread_Manager* t,
-                                      TAO_ORB_Core* orb_core)
-    :  ACE_Creation_Strategy<TAO_UIOP_Client_Connection_Handler> (t),
-       orb_core_ (orb_core)
-{
-}
-
-int
-TAO_UIOP_Connect_Creation_Strategy::make_svc_handler (
-    TAO_UIOP_Client_Connection_Handler *&sh)
-{
-  if (sh == 0)
-    {
-      ACE_NEW_RETURN (sh,
-                      TAO_UIOP_Client_Connection_Handler (
-                          this->orb_core_->thr_mgr (),
-                          this->orb_core_),
-                      -1);
-    }
-  return 0;
-}
-
-// ****************************************************************
-
-typedef ACE_Cached_Connect_Strategy<TAO_UIOP_Client_Connection_Handler,
-                                    ACE_LSOCK_CONNECTOR,
-                                    TAO_Cached_Connector_Lock>
-        TAO_CACHED_CONNECT_STRATEGY;
-
-TAO_UIOP_Connector::TAO_UIOP_Connector (void)
-  : TAO_Connector (TAO_IOP_TAG_UNIX_IOP),
-    base_connector_ (),
-    orb_core_ (0)
-{
-}
-
-int
-TAO_UIOP_Connector::open (TAO_ORB_Core *orb_core)
-{
-  this->orb_core_ = orb_core;
-
-  TAO_Cached_Connector_Lock *connector_lock = 0;
-  ACE_NEW_RETURN (connector_lock,
-                  TAO_Cached_Connector_Lock (orb_core),
-                  -1);
-
-  TAO_CACHED_CONNECT_STRATEGY* cached_connect_strategy =
-    new TAO_CACHED_CONNECT_STRATEGY (
-        new TAO_UIOP_Connect_Creation_Strategy (
-            orb_core->thr_mgr (),
-            orb_core),
-        0,
-        0,
-        connector_lock,
-        1);
-
-  return this->base_connector_.open (orb_core->reactor (),
-                                     &this->null_creation_strategy_,
-                                     cached_connect_strategy,
-                                     &this->null_activation_strategy_);
-}
-
-int
-TAO_UIOP_Connector::close (void)
-{
-  TAO_CACHED_CONNECT_STRATEGY *cached_connect_strategy =
-    ACE_dynamic_cast (TAO_CACHED_CONNECT_STRATEGY *,
-                      this->base_connector_.connect_strategy ());
-
-  // Zap the creation strategy that we created earlier
-  delete cached_connect_strategy->creation_strategy ();
-  delete cached_connect_strategy;
-
-  this->base_connector_.close ();
-  return 0;
-}
-
-int
-TAO_UIOP_Connector::connect (TAO_Profile *profile,
-                             TAO_Transport *& transport,
-                             ACE_Time_Value *max_wait_time)
-{
-  if (profile->tag () != TAO_IOP_TAG_UNIX_IOP)
-    return -1;
-
-  TAO_UIOP_Profile *uiop_profile =
-    ACE_dynamic_cast (TAO_UIOP_Profile *, profile);
-
-  if (uiop_profile == 0)
-    return -1;
-
-  const ACE_UNIX_Addr &oa = uiop_profile->object_addr ();
-
-  ACE_Synch_Options synch_options;
-  if (max_wait_time != 0)
-    {
-      synch_options.set (ACE_Synch_Options::USE_TIMEOUT,
-                         *max_wait_time);
-    }
-
-  TAO_UIOP_Client_Connection_Handler* result;
-
-  // the connect call will set the hint () stored in the Profile
-  // object; but we obtain the transport in the <result>
-  // variable. Other threads may modify the hint, but we are not
-  // affected.
-  if (this->base_connector_.connect (uiop_profile->hint (),
-                                     result,
-                                     oa,
-                                     synch_options) == -1)
-    { // Give users a clue to the problem.
-      if (TAO_orbdebug)
-        {
-          char buffer [MAXPATHLEN + 1];
-          profile->addr_to_string (buffer, MAXPATHLEN);
-          ACE_DEBUG ((LM_ERROR, "(%P|%t) %s:%u, connection to "
-                      "%s failed (%p)\n",
-                      __FILE__,
-                      __LINE__,
-                      buffer,
-                      "errno"));
-        }
-      return -1;
-    }
-
-  transport = result->transport ();
-
-  return 0;
-}
-
-int
-TAO_UIOP_Connector::preconnect (const char *preconnects)
-{
-  // Check for the proper protocol prefix.
-  if (this->check_prefix (preconnects) != 0)
-    return 0; // Failure: zero successful preconnections
-
-  const char *protocol_removed = ACE_OS::strstr (preconnects, "://") + 3;
-  // "+ 3" since strlen of "://" is 3.
-
-  char *preconnections = ACE_OS::strdup (protocol_removed);
-
-  int successes = 0;
-
-  if (preconnections)
-    {
-      ACE_UNIX_Addr dest;
-      ACE_Unbounded_Stack<ACE_UNIX_Addr> dests;
-
-      size_t num_connections;
-
-      char *nextptr = 0;
-      char *where = 0;
-      for (where = ACE::strsplit_r (preconnections, ",", nextptr);
-           where != 0;
-           where = ACE::strsplit_r (0, ",", nextptr))
-        {
-          char *rendezvous_point = where;
-
-          int version_offset = 0;
-          // Additional offset to remove version from preconnect, if it exists.
-
-          if (isdigit (rendezvous_point[0]) &&
-              rendezvous_point[1] == '.' &&
-              isdigit (rendezvous_point[2]) &&
-              rendezvous_point[3] == '@')
-            version_offset = 4;
-
-          // @@ For now, we just drop the version prefix.  However, at
-          //    some point in the future the version may become useful.
-
-          dest.set (rendezvous_point + version_offset);
-
-          dests.push (dest);
-        }
-
-      // Create an array of addresses from the stack, as well as an
-      // array of eventual handlers.
-      num_connections = dests.size ();
-      ACE_UNIX_Addr *remote_addrs = 0;
-      TAO_UIOP_Client_Connection_Handler **handlers = 0;
-      char *failures = 0;
-
-      ACE_NEW_RETURN (remote_addrs,
-                      ACE_UNIX_Addr[num_connections],
-                      -1);
-      ACE_NEW_RETURN (handlers,
-                      TAO_UIOP_Client_Connection_Handler *[num_connections],
-                      -1);
-      ACE_NEW_RETURN (failures,
-                      char[num_connections],
-                      -1);
-
-      size_t slot = 0;
-
-      // Fill in the remote address array
-      while (dests.pop (remote_addrs[slot]) == 0)
-        handlers[slot++] = 0;
-
-      // Finally, try to connect.
-      this->base_connector_.connect_n (num_connections,
-                                       handlers,
-                                       remote_addrs,
-                                       failures);
-      // Loop over all the failures and set the handlers that
-      // succeeded to idle state.
-      for (slot = 0;
-           slot < num_connections;
-           ++slot)
-        {
-          if (!failures[slot])
-            {
-              handlers[slot]->idle ();
-              ++successes;
-
-              if (TAO_debug_level > 0)
-                {
-                  ACE_DEBUG ((LM_DEBUG,
-                              "TAO (%P|%t) Preconnection <%s> succeeded.\n",
-                              remote_addrs[slot].get_path_name ()));
-                }
-            }
-          else
-            {
-              if (TAO_debug_level > 0)
-                {
-                  ACE_DEBUG ((LM_DEBUG,
-                              "TAO (%P|%t) Preconnection <%s> failed.\n",
-                              remote_addrs[slot].get_path_name ()));
-                }
-            }
-        }
-
-      ACE_OS::free (preconnections);
-
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) UIOP preconnections: %d successes and "
-                      "%d failures.\n",
-                      successes,
-                      num_connections - successes));
-        }
-    }
-
-  return successes;
-}
-
-TAO_Profile*
-TAO_UIOP_Connector::create_profile (TAO_InputCDR& cdr)
-{
-  TAO_Profile* pfile;
-  ACE_NEW_RETURN (pfile,
-                  TAO_UIOP_Profile (this->orb_core_),
-                  0);
-
-  int r = pfile->decode (cdr);
-  if (r == -1)
-    {
-      pfile->_decr_refcnt ();
-      pfile = 0;
-    }
-
-  return pfile;
-}
-
-void
-TAO_UIOP_Connector::make_profile (const char *endpoint,
-                                  TAO_Profile *&profile,
-                                  CORBA::Environment &ACE_TRY_ENV)
-{
-  // The endpoint should be of the form:
-  //
-  //    N.n@rendezvous_point|object_key
-  //
-  // or:
-  //
-  //    rendezvous_point|object_key
-
-  ACE_NEW_THROW_EX (profile,
-                    TAO_UIOP_Profile (endpoint,
-                                      this->orb_core_,
-                                      ACE_TRY_ENV),
-                    CORBA::NO_MEMORY ());
-
-  ACE_CHECK;
-}
-
-
-int
-TAO_UIOP_Connector::check_prefix (const char *endpoint)
-{
-  // Parse the given URL style IOR and create an mprofile from it.
-
-  // Check for a valid string
-  if (!endpoint || !*endpoint)
-    return -1;  // Failure
-
-  const char protocol[] = "uiop";
-  // This is valid for any protocol beginning with `uiop'.
-
-  // Check for the proper prefix in the IOR.  If the proper prefix isn't
-  // in the IOR then it is not an IOR we can use.
-  if (ACE_OS::strncasecmp (endpoint,
-                           protocol,
-                           ACE_OS::strlen (protocol)) == 0)
-    {
-      return 0;  // Success
-    }
-
-  return -1;
-  // Failure: not an UIOP IOR
-  // DO NOT throw an exception here.
-}
-
-char
-TAO_UIOP_Connector::object_key_delimiter (void) const
-{
-  return TAO_UIOP_Profile::object_key_delimiter;
-}
-
-#define TAO_UIOP_SVC_TUPLE ACE_Svc_Tuple<TAO_UIOP_Client_Connection_Handler>
-#define UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR ACE_Refcounted_Hash_Recyclable<ACE_UNIX_Addr>
-
-# if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Node<ACE_UNIX_Addr>;
-template class ACE_Unbounded_Stack<ACE_UNIX_Addr>;
-template class ACE_Unbounded_Stack_Iterator<ACE_UNIX_Addr>;
-
-template class ACE_Connector<TAO_UIOP_Client_Connection_Handler, ACE_LSOCK_CONNECTOR>;
-template class ACE_Connect_Strategy<TAO_UIOP_Client_Connection_Handler, ACE_LSOCK_CONNECTOR>;
-template class ACE_Cached_Connect_Strategy<TAO_UIOP_Client_Connection_Handler, ACE_LSOCK_CONNECTOR, TAO_Cached_Connector_Lock>;
-template class ACE_Strategy_Connector<TAO_UIOP_Client_Connection_Handler,
-                               ACE_LSOCK_CONNECTOR>;
-
-template class ACE_Concurrency_Strategy<TAO_UIOP_Client_Connection_Handler>;
-template class ACE_Creation_Strategy<TAO_UIOP_Client_Connection_Handler>;
-
-template class ACE_NOOP_Creation_Strategy<TAO_UIOP_Client_Connection_Handler>;
-template class ACE_NOOP_Concurrency_Strategy<TAO_UIOP_Client_Connection_Handler>;
-template class ACE_Recycling_Strategy<TAO_UIOP_Client_Connection_Handler>;
-
-template class ACE_Svc_Handler<ACE_LSOCK_STREAM, ACE_NULL_SYNCH>;
-template class UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR;
-template class TAO_UIOP_SVC_TUPLE;
-template class ACE_Map_Manager<int, TAO_UIOP_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Iterator_Base<int, TAO_UIOP_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Iterator<int, TAO_UIOP_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Reverse_Iterator<int, TAO_UIOP_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Entry<int, TAO_UIOP_SVC_TUPLE*>;
-
-template class ACE_Hash_Map_Entry<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *>;
-template class ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>;
-template class ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>;
-
-#if defined(ACE_HAS_THREADS)
-template class ACE_Hash_Map_Manager<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Manager_Ex<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Iterator_Base_Ex<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Iterator<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Iterator_Ex<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Reverse_Iterator<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_MUTEX>;
-#endif /* ACE_HAS_THREADS */
-
-template class ACE_Hash_Map_Manager<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Manager_Ex<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Iterator_Base_Ex<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Iterator<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Iterator_Ex<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Reverse_Iterator<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>;
-
-# elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Node<ACE_UNIX_Addr>
-#pragma instantiate ACE_Unbounded_Stack<ACE_UNIX_Addr>
-#pragma instantiate ACE_Unbounded_Stack_Iterator<ACE_UNIX_Addr>
-
-#pragma instantiate ACE_Connector<TAO_UIOP_Client_Connection_Handler, ACE_LSOCK_CONNECTOR>
-#pragma instantiate ACE_Connect_Strategy<TAO_UIOP_Client_Connection_Handler, ACE_LSOCK_CONNECTOR>
-#pragma instantiate ACE_Cached_Connect_Strategy<TAO_UIOP_Client_Connection_Handler, ACE_LSOCK_CONNECTOR, TAO_Cached_Connector_Lock>
-#pragma instantiate ACE_Strategy_Connector<TAO_UIOP_Client_Connection_Handler, ACE_LSOCK_CONNECTOR>
-
-#pragma instantiate ACE_Concurrency_Strategy<TAO_UIOP_Client_Connection_Handler>
-#pragma instantiate ACE_Creation_Strategy<TAO_UIOP_Client_Connection_Handler>
-
-#pragma instantiate ACE_NOOP_Creation_Strategy<TAO_UIOP_Client_Connection_Handler>
-#pragma instantiate ACE_NOOP_Concurrency_Strategy<TAO_UIOP_Client_Connection_Handler>
-
-#pragma instantiate ACE_Recycling_Strategy<TAO_UIOP_Client_Connection_Handler>
-
-#pragma instantiate ACE_Svc_Handler<ACE_LSOCK_STREAM, ACE_NULL_SYNCH>
-#pragma instantiate UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR
-#pragma instantiate TAO_UIOP_SVC_TUPLE
-#pragma instantiate ACE_Map_Manager<int, TAO_UIOP_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Iterator_Base<int, TAO_UIOP_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Iterator<int, TAO_UIOP_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Reverse_Iterator<int, TAO_UIOP_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Entry<int, TAO_UIOP_SVC_TUPLE*>
-
-#pragma instantiate ACE_Hash_Map_Entry<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *>
-#pragma instantiate ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>
-#pragma instantiate ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>
-
-#if defined(ACE_HAS_THREADS)
-#pragma instantiate ACE_Hash_Map_Manager<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_MUTEX>
-#endif /* ACE_HAS_THREADS */
-
-#pragma instantiate ACE_Hash_Map_Manager<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_UIOP_Client_Connection_Handler *, ACE_Hash<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>
-
-# endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* !ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/TAO/tao/UIOP_Connector.h b/TAO/tao/UIOP_Connector.h
deleted file mode 100644
index 950cb74233a..00000000000
--- a/TAO/tao/UIOP_Connector.h
+++ /dev/null
@@ -1,121 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    UIOP_Connector.h
-//
-// = DESCRIPTION
-//    UIOP specific connector processing
-//
-// = AUTHOR
-//    Fred Kuhns <fredk@cs.wustl.edu>
-//    Ossama Othman <othman@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_UIOP_CONNECTOR_H
-#define TAO_UIOP_CONNECTOR_H
-
-#include "ace/Connector.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-# if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
-#include "ace/LSOCK_Connector.h"
-
-#include "tao/Pluggable.h"
-#include "tao/UIOP_Connect.h"
-
-typedef ACE_Strategy_Connector<TAO_UIOP_Client_Connection_Handler,
-                               ACE_LSOCK_CONNECTOR> TAO_UIOP_BASE_CONNECTOR;
-
-// ****************************************************************
-
-class TAO_Export TAO_UIOP_Connect_Creation_Strategy : public ACE_Creation_Strategy<TAO_UIOP_Client_Connection_Handler>
-{
-  // = TITLE
-  //   Helper creation strategy
-  //
-  // = DESCRIPTION
-  //   Creates UIOP_Client_Connection_Handler objects but satisfies
-  //   the interface required by the
-  //   ACE_Creation_Strategy<TAO_UIOP_Client_Connection_Handler>
-  //
-public:
-  TAO_UIOP_Connect_Creation_Strategy (ACE_Thread_Manager * = 0,
-                                      TAO_ORB_Core* orb_core = 0);
-
-  virtual int make_svc_handler (TAO_UIOP_Client_Connection_Handler *&sh);
-  // Makes TAO_UIOP_Client_Connection_Handlers
-
-private:
-  TAO_ORB_Core* orb_core_;
-  // The ORB
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_UIOP_Connector : public TAO_Connector
-{
-  // = TITLE
-  //   UIOP-specific Connector bridge for pluggable protocols.
-  //
-  // = DESCRIPTION
-  //
-public:
-  // = Initialization and termination methods.
-  TAO_UIOP_Connector (void);
-  // Constructor.
-  // @@ Do we want to pass in the tag here or should it be statically
-  // defined?
-
-  // = The TAO_Connector methods, please check the documentation on
-  // Pluggable.h
-  int open (TAO_ORB_Core *orb_core);
-  int close (void);
-  int connect (TAO_Profile *profile,
-               TAO_Transport *&transport,
-               ACE_Time_Value *max_wait_time);
-  int preconnect (const char *preconnections);
-  TAO_Profile *create_profile (TAO_InputCDR& cdr);
-
-  virtual int check_prefix (const char *endpoint);
-
-  virtual char object_key_delimiter (void) const;
-
-protected:
-  // = More TAO_Connector methods, please check the documentation on
-  //   Pluggable.h
-  virtual void make_profile (const char *endpoint,
-                             TAO_Profile *&,
-                             CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-protected:
-  typedef ACE_NOOP_Creation_Strategy<TAO_UIOP_Client_Connection_Handler>
-        TAO_NULL_CREATION_STRATEGY;
-
-  typedef ACE_NOOP_Concurrency_Strategy<TAO_UIOP_Client_Connection_Handler>
-        TAO_NULL_ACTIVATION_STRATEGY;
-
-private:
-  TAO_NULL_CREATION_STRATEGY null_creation_strategy_;
-  TAO_NULL_ACTIVATION_STRATEGY null_activation_strategy_;
-
-  TAO_UIOP_BASE_CONNECTOR base_connector_;
-  // The connector initiating connection requests for UIOP.
-
-  TAO_ORB_Core *orb_core_;
-  // ORB Core.
-};
-
-# endif  /* !ACE_LACKS_UNIX_DOMAIN_SOCKETS */
-
-#endif  /* TAO_UIOP_CONNECTOR_H */
diff --git a/TAO/tao/UIOP_Factory.cpp b/TAO/tao/UIOP_Factory.cpp
deleted file mode 100644
index c69a3bdba06..00000000000
--- a/TAO/tao/UIOP_Factory.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "tao/UIOP_Factory.h"
-
-# if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
-#include "tao/UIOP_Acceptor.h"
-#include "tao/UIOP_Connector.h"
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID(tao, UIOP_Factory, "$Id$")
-
-static const char prefix_[] = "uiop";
-
-TAO_UIOP_Protocol_Factory::TAO_UIOP_Protocol_Factory (void)
-  :  major_ (TAO_DEF_GIOP_MAJOR),
-     minor_ (TAO_DEF_GIOP_MINOR)
-{
-}
-
-TAO_UIOP_Protocol_Factory::~TAO_UIOP_Protocol_Factory (void)
-{
-}
-
-int
-TAO_UIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix)
-{
-  // Check for the proper prefix in the IOR.  If the proper prefix isn't
-  // in the IOR then it is not an IOR we can use.
-  return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0);
-}
-
-const char *
-TAO_UIOP_Protocol_Factory::prefix (void) const
-{
-  return ::prefix_;
-}
-
-TAO_Acceptor *
-TAO_UIOP_Protocol_Factory::make_acceptor (void)
-{
-  TAO_Acceptor *acceptor = 0;
-
-  ACE_NEW_RETURN (acceptor,
-                  TAO_UIOP_Acceptor,
-                  0);
-
-  return acceptor;
-}
-
-int
-TAO_UIOP_Protocol_Factory::init (int /* argc */,
-                                 char* /* argv */ [])
-{
-  return 0;
-}
-
-TAO_Connector *
-TAO_UIOP_Protocol_Factory::make_connector (void)
-{
-  TAO_Connector *connector = 0;
-
-  ACE_NEW_RETURN (connector,
-                  TAO_UIOP_Connector,
-                  0);
-  return connector;
-}
-
-int
-TAO_UIOP_Protocol_Factory::requires_explicit_endpoint (void) const
-{
-  return 1;
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_UIOP_Protocol_Factory,
-                       ASYS_TEXT ("UIOP_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_UIOP_Protocol_Factory),
-                       ACE_Service_Type::DELETE_THIS |
-                                  ACE_Service_Type::DELETE_OBJ,
-                       0)
-
-ACE_FACTORY_DEFINE (TAO, TAO_UIOP_Protocol_Factory)
-
-
-# endif  /* !ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/TAO/tao/UIOP_Factory.h b/TAO/tao/UIOP_Factory.h
deleted file mode 100644
index e549eeabb43..00000000000
--- a/TAO/tao/UIOP_Factory.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// -*- C++ -*-
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   Protocol_Factory.h
-//
-// = AUTHOR
-//   Fred Kuhns <fredk@cs.wustl.edu>
-//   Ossama Othman <othman@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_UIOP_FACTORY_H
-#define TAO_UIOP_FACTORY_H
-
-#include "tao/Protocol_Factory.h"
-
-# if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_Acceptor;
-class TAO_Connector;
-
-
-class TAO_Export TAO_UIOP_Protocol_Factory : public TAO_Protocol_Factory
-{
-public:
-  TAO_UIOP_Protocol_Factory (void);
-  virtual ~TAO_UIOP_Protocol_Factory (void);
-
-  // = Service Configurator hooks.
-  virtual int init (int argc, char* argv[]);
-  // Dynamic linking hook
-
-  virtual int match_prefix (const ACE_CString &prefix);
-  // Verify prefix is a match
-
-  virtual const char *prefix (void) const;
-  // Returns the prefix used by the protocol.
-
-  // = Check Protocol_Factory.h for a description of these methods.
-  virtual TAO_Acceptor  *make_acceptor (void);
-  virtual TAO_Connector *make_connector  (void);
-  virtual int requires_explicit_endpoint (void) const;
-
-private:
-  int major_;
-  int minor_;
-  // Changing the version number can be used to provide backwards
-  // compatibility with old clients.
-};
-
-ACE_STATIC_SVC_DECLARE (TAO_UIOP_Protocol_Factory)
-ACE_FACTORY_DECLARE (TAO, TAO_UIOP_Protocol_Factory)
-
-# endif  /* !ACE_LACKS_UNIX_DOMAIN_SOCKETS */
-
-#endif /* TAO_UIOP_FACTORY_H */
diff --git a/TAO/tao/UIOP_Profile.cpp b/TAO/tao/UIOP_Profile.cpp
deleted file mode 100644
index 24970de3adc..00000000000
--- a/TAO/tao/UIOP_Profile.cpp
+++ /dev/null
@@ -1,391 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-#include "tao/UIOP_Profile.h"
-
-#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
-#include "tao/GIOP.h"
-#include "tao/CDR.h"
-#include "tao/Environment.h"
-#include "tao/ORB.h"
-#include "tao/ORB_Core.h"
-#include "tao/POA.h"
-#include "tao/debug.h"
-
-ACE_RCSID(tao, UIOP_Profile, "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "tao/UIOP_Profile.i"
-#endif /* __ACE_INLINE__ */
-
-static const char *prefix_ = "uiop:";
-
-const char TAO_UIOP_Profile::object_key_delimiter = '|';
-
-TAO_UIOP_Profile::TAO_UIOP_Profile (const ACE_UNIX_Addr &addr,
-                                    const TAO_ObjectKey &object_key,
-                                    const TAO_GIOP_Version &version,
-                                    TAO_ORB_Core *orb_core)
-  : TAO_Profile (TAO_IOP_TAG_UNIX_IOP),
-    version_ (version),
-    object_key_ (object_key),
-    object_addr_ (addr),
-    hint_ (0),
-    orb_core_ (orb_core)
-{
-}
-
-TAO_UIOP_Profile::TAO_UIOP_Profile (const char *,
-                                    const TAO_ObjectKey &object_key,
-                                    const ACE_UNIX_Addr &addr,
-                                    const TAO_GIOP_Version &version,
-                                    TAO_ORB_Core *orb_core)
-  : TAO_Profile (TAO_IOP_TAG_UNIX_IOP),
-    version_ (version),
-    object_key_ (object_key),
-    object_addr_ (addr),
-    hint_ (0),
-    orb_core_ (orb_core)
-{
-}
-
-TAO_UIOP_Profile::TAO_UIOP_Profile (const TAO_UIOP_Profile &pfile)
-  : TAO_Profile (pfile.tag ()),
-    version_ (pfile.version_),
-    object_key_ (pfile.object_key_),
-    object_addr_ (pfile.object_addr_),
-    hint_ (pfile.hint_),
-    orb_core_ (pfile.orb_core_)
-{
-}
-
-TAO_UIOP_Profile::TAO_UIOP_Profile (const char *string,
-                                    TAO_ORB_Core *orb_core,
-                                    CORBA::Environment &ACE_TRY_ENV)
-  : TAO_Profile (TAO_IOP_TAG_UNIX_IOP),
-    version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR),
-    object_key_ (),
-    object_addr_ (),
-    hint_ (0),
-    orb_core_ (orb_core)
-{
-  parse_string (string, ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-TAO_UIOP_Profile::TAO_UIOP_Profile (TAO_ORB_Core *orb_core)
-  : TAO_Profile (TAO_IOP_TAG_UNIX_IOP),
-    version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR),
-    object_key_ (),
-    object_addr_ (),
-    hint_ (0),
-    orb_core_ (orb_core)
-{
-}
-
-TAO_UIOP_Profile::~TAO_UIOP_Profile (void)
-{
-}
-
-int
-TAO_UIOP_Profile::parse_string (const char *string,
-                                CORBA::Environment &ACE_TRY_ENV)
-{
-  if (!string || !*string)
-    {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (
-        CORBA_SystemException::_tao_minor_code (
-          TAO_NULL_POINTER_MINOR_CODE,
-          0),
-        CORBA::COMPLETED_NO),
-        -1);
-    }
-
-  // Remove the "N.n@" version prefix, if it exists, and verify the
-  // version is one that we accept.
-
-  // Check for version
-  if (isdigit (string [0]) &&
-      string[1] == '.' &&
-      isdigit (string [2]) &&
-      string[3] == '@')
-    {
-      // @@ This may fail for non-ascii character sets [but take that
-      // with a grain of salt]
-      this->version_.set_version ((char) (string [0] - '0'),
-                                  (char) (string [2] - '0'));
-      string += 4;
-      // Skip over the "N.n@"
-    }
-
-  if (this->version_.major != TAO_DEF_GIOP_MAJOR ||
-      this->version_.minor  > TAO_DEF_GIOP_MINOR)
-    {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (), -1);
-    }
-
-  // Pull off the "rendezvous point" part of the objref
-  // Copy the string because we are going to modify it...
-  CORBA::String_var copy (string);
-
-  char *start = copy.inout ();
-  char *cp = ACE_OS::strchr (start, this->object_key_delimiter);
-
-  if (cp == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (
-        CORBA_SystemException::_tao_minor_code (
-          TAO_NULL_POINTER_MINOR_CODE,
-          0),
-        CORBA::COMPLETED_NO),
-        -1);
-      // No rendezvous point specified
-    }
-
-  CORBA::ULong length = cp - start;
-
-  CORBA::String_var rendezvous = CORBA::string_alloc (length);
-
-  ACE_OS::strncpy (rendezvous.inout (), start, length);
-  rendezvous[length] = '\0';
-
-  if (this->object_addr_.set (rendezvous.in ()) != 0)
-    {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (
-        CORBA_SystemException::_tao_minor_code (
-          TAO_NULL_POINTER_MINOR_CODE,
-          0),
-        CORBA::COMPLETED_NO),
-        -1);
-    }
-
-  start = ++cp;  // increment past the object key separator
-
-  TAO_POA::decode_string_to_sequence (this->object_key_, start);
-
-  return 1;
-}
-
-CORBA::Boolean
-TAO_UIOP_Profile::is_equivalent (const TAO_Profile *other_profile)
-{
-
-  if (other_profile->tag () != TAO_IOP_TAG_UNIX_IOP)
-    return 0;
-
-  const TAO_UIOP_Profile *op =
-    ACE_dynamic_cast (const TAO_UIOP_Profile *, other_profile);
-
-  ACE_ASSERT (op->object_key_.length () < UINT_MAX);
-
-  return this->object_key_ == op->object_key_ &&
-    ACE_OS::strcmp (this->rendezvous_point (),
-                    op->rendezvous_point ()) == 0 &&
-    this->version_ == op->version_;
-}
-
-CORBA::ULong
-TAO_UIOP_Profile::hash (CORBA::ULong max,
-                        CORBA::Environment &)
-{
-  CORBA::ULong hashval = 0;
-
-  // Just grab a bunch of convenient bytes and hash them; could do
-  // more (rendezvous_point, full key, exponential hashing)
-  // but no real need to do so except if performance requires a more
-  // costly hash.
-
-  hashval = this->object_key_.length () *
-    ACE_OS::atoi (this->rendezvous_point ());  // @@ Is this valid?
-  hashval += this->version_.minor;
-
-  if (this->object_key_.length () >= 4)
-    {
-      hashval += this->object_key_ [1];
-      hashval += this->object_key_ [3];
-    }
-
-  return hashval % max;
-}
-
-int
-TAO_UIOP_Profile::addr_to_string (char *buffer, size_t length)
-{
-  if (length < (ACE_OS::strlen (this->rendezvous_point ()) + 1))
-    return -1;
-
-  ACE_OS::strcpy (buffer, this->rendezvous_point ());
-
-  return 0;
-}
-
-void
-TAO_UIOP_Profile::reset_hint (void)
-{
-  if (this->hint_)
-    {
-      this->hint_->cleanup_hint ();
-      this->hint_ = 0;
-    }
-}
-
-TAO_UIOP_Profile &
-TAO_UIOP_Profile::operator= (const TAO_UIOP_Profile &src)
-{
-  this->version_ = src.version_;
-
-  this->object_key_ = src.object_key_;
-
-  this->object_addr_.set (src.object_addr_);
-
-  return *this;
-}
-
-CORBA::String
-TAO_UIOP_Profile::to_string (CORBA::Environment &)
-{
-  CORBA::String_var key;
-  TAO_POA::encode_sequence_to_string (key.inout(),
-                                      this->object_key ());
-
-  u_int buflen = (ACE_OS::strlen (::prefix_) +
-                  2 /* double-slash separator */ +
-                  1 /* major version */ +
-                  1 /* decimal point */ +
-                  1 /* minor version */ +
-                  1 /* `@' character */ +
-                  ACE_OS::strlen (this->rendezvous_point ()) +
-                  1 /* object key separator */ +
-                  ACE_OS::strlen (key));
-
-  CORBA::String buf = CORBA::string_alloc (buflen);
-
-  static const char digits [] = "0123456789";
-
-  ACE_OS::sprintf (buf,
-                   "%s//%c.%c@%s%c%s",
-                   ::prefix_,
-                   digits [this->version_.major],
-                   digits [this->version_.minor],
-                   this->rendezvous_point (),
-                   this->object_key_delimiter,
-                   key.in ());
-  return buf;
-}
-
-const char *
-TAO_UIOP_Profile::prefix (void)
-{
-  return ::prefix_;
-}
-
-// return codes:
-// -1 -> error
-//  0 -> can't understand this version
-//  1 -> success.
-int
-TAO_UIOP_Profile::decode (TAO_InputCDR& cdr)
-{
-  CORBA::ULong encap_len = cdr.length ();
-
-  // Read and verify major, minor versions, ignoring UIOP
-  // profiles whose versions we don't understand.
-  // FIXME:  Version question again,  what do we do about them for this
-  //         protocol?
-
-  if (!(cdr.read_octet (this->version_.major)
-        && this->version_.major == TAO_DEF_GIOP_MAJOR
-        && cdr.read_octet (this->version_.minor)
-        && this->version_.minor <= TAO_DEF_GIOP_MINOR))
-  {
-    ACE_DEBUG ((LM_DEBUG,
-                "detected new v%d.%d UIOP profile\n",
-                this->version_.major,
-                this->version_.minor));
-    return -1;
-  }
-
-  char *rendezvous = 0;
-
-  // Get rendezvous_point
-  if (cdr.read_string (rendezvous) == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "error decoding UIOP rendezvous_point"));
-      return -1;
-    }
-
-  this->object_addr_.set (rendezvous);
-
-  // Clean up
-  delete [] rendezvous;
-
-  // ... and object key.
-
-  if ((cdr >> this->object_key_) == 0)
-    return -1;
-
-  if (this->version_.major > 1
-      || this->version_.minor > 0)
-    if (this->tagged_components_.decode (cdr) == 0)
-      return -1;
-
-  if (cdr.length () != 0 && TAO_debug_level)
-    {
-      // If there is extra data in the profile we are supposed to
-      // ignore it, but print a warning just in case...
-      ACE_DEBUG ((LM_DEBUG,
-                  "%d bytes out of %d left after UIOP profile data\n",
-                  cdr.length (),
-                  encap_len));
-    }
-
-  if (cdr.good_bit ())
-    return 1;
-
-  return -1;
-}
-
-int
-TAO_UIOP_Profile::encode (TAO_OutputCDR &stream) const
-{
-  // UNSIGNED LONG, tag for this protocol profile;
-  // @@ it seems like this is not a good separation of concerns, why
-  // do we write the TAG here? That's generic code and should be
-  // handled by the object reference writer (IMHO).
-  stream.write_ulong (TAO_IOP_TAG_UNIX_IOP);
-
-  // Create the encapsulation....
-  TAO_OutputCDR encap (ACE_CDR::DEFAULT_BUFSIZE,
-                       TAO_ENCAP_BYTE_ORDER,
-                       this->orb_core_->output_cdr_buffer_allocator (),
-                       this->orb_core_->output_cdr_dblock_allocator (),
-                       this->orb_core_->orb_params ()->cdr_memcpy_tradeoff (),
-                       this->orb_core_->to_iso8859 (),
-                       this->orb_core_->to_unicode ());
-
-  // CHAR describing byte order, starting the encapsulation
-  encap.write_octet (TAO_ENCAP_BYTE_ORDER);
-
-  // The GIOP version
-  encap.write_octet (this->version_.major);
-  encap.write_octet (this->version_.minor);
-
-  // STRING rendezvous_pointname from profile
-  encap.write_string (this->rendezvous_point ());
-
-  // OCTET SEQUENCE for object key
-  encap << this->object_key_;
-
-  if (this->version_.major > 1
-      || this->version_.minor > 0)
-    this->tagged_components_.encode (encap);
-
-  // write the encapsulation as an octet sequence...
-  stream << CORBA::ULong (encap.total_length ());
-  stream.write_octet_array_mb (encap.begin ());
-
-  return 1;
-}
-
-#endif  /* !ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/TAO/tao/UIOP_Profile.h b/TAO/tao/UIOP_Profile.h
deleted file mode 100644
index e6df2364d97..00000000000
--- a/TAO/tao/UIOP_Profile.h
+++ /dev/null
@@ -1,177 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     UIOP_Profile.h
-//
-// = DESCRIPTION
-//     Unix Domain Socket (UIOP) profile specific processing
-//
-// = AUTHOR
-//     Fred Kuhns <fredk@cs.wustl.edu>
-//     Ossama Othman <othman@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_UIOP_PROFILE_H
-#define TAO_UIOP_PROFILE_H
-
-#include "tao/Pluggable.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-# if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
-#include "tao/Object_KeyC.h"
-#include "tao/UIOP_Connect.h"
-#include "tao/Tagged_Components.h"
-
-#include "ace/UNIX_Addr.h"
-#include "ace/Synch.h"
-
-//class TAO_UIOP_Client_Connection_Handler;
-
-// TAO UIOP_Profile concrete Profile definitions
-class TAO_Export TAO_UIOP_Profile : public TAO_Profile
-{
-  // = TITLE
-  //   This class defines the protocol specific attributes required
-  //   for locating ORBs over local IPC.
-  //
-  // = DESCRIPTION
-  //   This class defines the UIOP profile.
-public:
-  static const char object_key_delimiter;
-  // The object key delimiter that UIOP uses or expects.
-
-  static const char *prefix (void);
-  // Return the char string prefix.
-
-  TAO_UIOP_Profile (const ACE_UNIX_Addr &addr,
-                    const TAO_ObjectKey &object_key,
-                    const TAO_GIOP_Version &version,
-                    TAO_ORB_Core *orb_core);
-  // Profile constructor, same as above except the object_key has
-  // already been marshaled.  (actually, no marshalling for this protocol)
-
-  TAO_UIOP_Profile (const char *rendezvous_point,
-                    const TAO_ObjectKey &object_key,
-                    const ACE_UNIX_Addr &addr,
-                    const TAO_GIOP_Version &version,
-                    TAO_ORB_Core *orb_core);
-  // Profile constructor
-
-  TAO_UIOP_Profile (const char *string,
-                    TAO_ORB_Core *orb_core,
-                    CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // Create object using a string ior.
-
-  TAO_UIOP_Profile (const TAO_UIOP_Profile &pfile);
-  // Profile copy constructor
-
-  TAO_UIOP_Profile (TAO_ORB_Core *orb_core);
-  // Profile constructor, default.
-
-  TAO_UIOP_Profile & operator= (const TAO_UIOP_Profile &src);
-  // Assignment operator
-
-  ~TAO_UIOP_Profile (void);
-  // Destructor is to be called only through <_decr_refcnt>.
-
-  int parse_string (const char *string,
-                    CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // Initialize this object using the given input string.
-
-  CORBA::String to_string (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // Return a string representation for this profile.
-  // client must deallocate memory.
-
-  int decode (TAO_InputCDR& cdr);
-  // Initialize this object using the given CDR octet string.
-
-  virtual int encode (TAO_OutputCDR &stream) const;
-  // Encode this profile in a stream, i.e. marshal it.
-
-  const TAO_ObjectKey &object_key (void) const;
-  // @@ deprecated, return a reference to the Object Key.
-
-  TAO_ObjectKey &object_key (TAO_ObjectKey& objkey);
-  // @@ deprecated. set the Object Key.
-
-  TAO_ObjectKey *_key (void) const;
-  // Return a pointer to the Object Key.
-
-  CORBA::Boolean is_equivalent (const TAO_Profile *other_profile);
-  // Return true if this profile is equivalent to other_profile.  Two
-  // profiles are equivalent iff their key, rendezvous point, object_key
-  // and version are the same.
-
-  CORBA::ULong hash (CORBA::ULong max,
-                     CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // Return a hash value for this object.
-
-  int addr_to_string (char *buffer, size_t length);
-  // Return a string representation for the address.
-
-  const ACE_UNIX_Addr &object_addr (void) const;
-  // return a reference to the object_addr.
-
-  const char *rendezvous_point (void) const;
-  // Return a pointer to the rendezvous point string.
-  // This object maintains ownership of the returned string.
-
-  const TAO_GIOP_Version &version (void) const;
-  // Return a pointer to this profile's version.  This object
-  // maintains ownership.
-
-  TAO_UIOP_Client_Connection_Handler *&hint (void);
-  // This is a hint for which connection handler to use.
-
-  void reset_hint (void);
-  // Reset the hint's value.
-
-  const TAO_Tagged_Components& tagged_components (void) const;
-  TAO_Tagged_Components& tagged_components (void);
-  // Access the tagged components, notice that they are empty and
-  // ignored for GIOP 1.0.
-
-private:
-
-  TAO_GIOP_Version version_;
-  // UIOP version number.
-
-  TAO_ObjectKey object_key_;
-  // object_key associated with this profile.
-
-  ACE_UNIX_Addr object_addr_;
-  // Cached instance of <ACE_UNIX_Addr> for use in making
-  // invocations, etc.
-
-  TAO_UIOP_Client_Connection_Handler *hint_;
-  // Pointer to a connection handler which we successfully used
-  // already.
-
-  TAO_MProfile *forward_to_;
-  // list of profiles which we should try forwarding on.
-
-  TAO_ORB_Core *orb_core_;
-  // ORB Core.
-
-  TAO_Tagged_Components tagged_components_;
-  // The tagged components
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/UIOP_Profile.i"
-#endif /* __ACE_INLINE__ */
-
-# endif  /* !ACE_LACKS_UNIX_DOMAIN_SOCKETS */
-
-#endif  /* TAO_UIOP_PROFILE_H */
diff --git a/TAO/tao/UIOP_Profile.i b/TAO/tao/UIOP_Profile.i
deleted file mode 100644
index b3805d9f1a4..00000000000
--- a/TAO/tao/UIOP_Profile.i
+++ /dev/null
@@ -1,61 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-# if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
-ACE_INLINE const TAO_ObjectKey &
-TAO_UIOP_Profile::object_key (void) const
-{
-  return this->object_key_;
-}
-
-ACE_INLINE TAO_ObjectKey &
-TAO_UIOP_Profile::object_key (TAO_ObjectKey& objkey)
-{
-  this->object_key_ = objkey;
-  return this->object_key_;
-}
-
-ACE_INLINE TAO_ObjectKey *
-TAO_UIOP_Profile::_key (void) const
-{
-  return new TAO_ObjectKey (this->object_key_);
-}
-
-ACE_INLINE const ACE_UNIX_Addr&
-TAO_UIOP_Profile::object_addr (void) const
-{
-  return this->object_addr_;
-}
-
-ACE_INLINE const char *
-TAO_UIOP_Profile::rendezvous_point (void) const
-{
-  return this->object_addr_.get_path_name ();
-}
-
-ACE_INLINE const TAO_GIOP_Version &
-TAO_UIOP_Profile::version (void) const
-{
-  return this->version_;
-}
-
-ACE_INLINE TAO_UIOP_Client_Connection_Handler *&
-TAO_UIOP_Profile::hint (void)
-{
-  return this->hint_;
-}
-
-ACE_INLINE const TAO_Tagged_Components&
-TAO_UIOP_Profile::tagged_components (void) const
-{
-  return this->tagged_components_;
-}
-
-ACE_INLINE TAO_Tagged_Components&
-TAO_UIOP_Profile::tagged_components (void)
-{
-  return this->tagged_components_;
-}
-
-#endif  /* !defined ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/TAO/tao/UIOP_Transport.cpp b/TAO/tao/UIOP_Transport.cpp
deleted file mode 100644
index 7de6447d1ce..00000000000
--- a/TAO/tao/UIOP_Transport.cpp
+++ /dev/null
@@ -1,538 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-#include "tao/UIOP_Transport.h"
-
-# if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
-#include "tao/UIOP_Connect.h"
-#include "tao/UIOP_Profile.h"
-#include "tao/Timeprobe.h"
-#include "tao/CDR.h"
-#include "tao/Transport_Mux_Strategy.h"
-#include "tao/Wait_Strategy.h"
-#include "tao/Reply_Dispatcher.h"
-#include "tao/ORB_Core.h"
-#include "tao/debug.h"
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-
-static const char *TAO_UIOP_Transport_Timeprobe_Description[] =
-  {
-    "UIOP_Transport::send - start",
-    "UIOP_Transport::send - end",
-
-    "UIOP_Transport::receive - start",
-    "UIOP_Transport::receive - end",
-
-    "UIOP_Client_Transport::start_request - start",
-    "UIOP_Client_Transport::start_request - end"
-  };
-
-enum
-  {
-    TAO_UIOP_TRANSPORT_SEND_START = 1300,
-    TAO_UIOP_TRANSPORT_SEND_END,
-
-    TAO_UIOP_TRANSPORT_RECEIVE_START,
-    TAO_UIOP_TRANSPORT_RECEIVE_END,
-
-    TAO_UIOP_CLIENT_TRANSPORT_START_REQUEST_START,
-    TAO_UIOP_CLIENT_TRANSPORT_START_REQUEST_END
-  };
-
-
-// Setup Timeprobes
-ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_UIOP_Transport_Timeprobe_Description,
-                                  TAO_UIOP_TRANSPORT_SEND_START);
-
-#endif /* ACE_ENABLE_TIMEPROBES */
-
-TAO_UIOP_Transport::TAO_UIOP_Transport (TAO_UIOP_Handler_Base *handler,
-                                        TAO_ORB_Core *orb_core)
-  : TAO_Transport (TAO_IOP_TAG_UNIX_IOP,
-                   orb_core),
-    handler_ (handler)
-{
-}
-
-TAO_UIOP_Transport::~TAO_UIOP_Transport (void)
-{
-}
-
-TAO_UIOP_Handler_Base *&
-TAO_UIOP_Transport::handler (void)
-{
-  return this->handler_;
-}
-
-int
-TAO_UIOP_Transport::idle (void)
-{
-  return this->handler_->idle();
-}
-
-void
-TAO_UIOP_Transport::close_connection (void)
-{
-  this->handler_->handle_close ();
-}
-
-ACE_HANDLE
-TAO_UIOP_Transport::handle (void)
-{
-  return this->handler_->get_handle ();
-}
-
-// ****************************************************************
-
-TAO_UIOP_Server_Transport::
-    TAO_UIOP_Server_Transport (TAO_UIOP_Server_Connection_Handler *handler,
-                               TAO_ORB_Core* orb_core)
-  : TAO_UIOP_Transport (handler,
-                        orb_core),
-    server_handler_ (handler),
-    message_state_ (orb_core)
-{
-}
-
-TAO_UIOP_Server_Transport::~TAO_UIOP_Server_Transport (void)
-{
-}
-
-// ****************************************************************
-
-TAO_UIOP_Client_Transport::
-    TAO_UIOP_Client_Transport (TAO_UIOP_Client_Connection_Handler *handler,
-                               TAO_ORB_Core *orb_core)
-  :  TAO_UIOP_Transport (handler, orb_core),
-     client_handler_ (handler)
-{
-}
-
-TAO_UIOP_Client_Transport::~TAO_UIOP_Client_Transport (void)
-{
-}
-
-TAO_UIOP_Client_Connection_Handler *
-TAO_UIOP_Client_Transport::client_handler (void)
-{
-  return this->client_handler_;
-}
-
-void
-TAO_UIOP_Client_Transport::start_request (TAO_ORB_Core *orb_core,
-                                          const TAO_Profile* pfile,
-                                          const char* opname,
-                                          CORBA::ULong request_id,
-                                          CORBA::Boolean is_roundtrip,
-                                          TAO_OutputCDR &output,
-                                          CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_UIOP_CLIENT_TRANSPORT_START_REQUEST_START);
-
-  const TAO_UIOP_Profile* profile =
-    ACE_dynamic_cast(const TAO_UIOP_Profile*, pfile);
-
-  // Obtain object key.
-  const TAO_ObjectKey& key = profile->object_key ();
-
-  // @@ This should be implemented in the transport object, which
-  //    would query the profile to obtain the version...
-  if (TAO_GIOP::start_message (profile->version (),
-                               TAO_GIOP::Request,
-                               output,
-                               orb_core) == 0)
-    ACE_THROW (CORBA::MARSHAL ());
-
-  // Then fill in the rest of the RequestHeader
-  //
-  // The first element of header is service context list;
-  // transactional context would be acquired here using the
-  // transaction service APIs.  Other kinds of context are as yet
-  // undefined.
-  //
-  // Last element of request header is the principal; no portable way
-  // to get it, we just pass empty principal (convention: indicates
-  // "anybody").  Steps upward in security include passing an
-  // unverified user ID, and then verifying the message (i.e. a dummy
-  // service context entry is set up to hold a digital signature for
-  // this message, then patched shortly before it's sent).
-  static CORBA::Principal_ptr principal = 0;
-
-  if (TAO_GIOP::write_request_header (request_id,
-                                      is_roundtrip,
-                                      key,
-                                      opname,
-                                      principal,
-                                      output,
-                                      orb_core) == 0)
-    ACE_THROW (CORBA::MARSHAL ());
-}
-
-void
-TAO_UIOP_Client_Transport::start_locate (TAO_ORB_Core *orb_core,
-                                         const TAO_Profile* pfile,
-                                         CORBA::ULong request_id,
-                                         TAO_OutputCDR &output,
-                                         CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  const TAO_UIOP_Profile* profile =
-    ACE_dynamic_cast(const TAO_UIOP_Profile*, pfile);
-
-  // Obtain object key.
-  const TAO_ObjectKey& key = profile->object_key ();
-
-  // @@ This should be implemented in the transport object, which
-  //    would query the profile to obtain the version...
-  if (TAO_GIOP::start_message (profile->version (),
-                               TAO_GIOP::Request,
-                               output,
-                               orb_core) == 0)
-    ACE_THROW (CORBA::MARSHAL ());
-
-
-  if (TAO_GIOP::write_locate_request_header (request_id,
-                                             key,
-                                             output) != 0)
-    ACE_THROW (CORBA::MARSHAL ());
-}
-
-int
-TAO_UIOP_Client_Transport::send_request (TAO_ORB_Core *orb_core,
-                                         TAO_OutputCDR &stream,
-                                         int two_way,
-                                         ACE_Time_Value *max_wait_time)
-{
-  if (this->ws_->sending_request (orb_core,
-                                  two_way) == -1)
-    return -1;
-
-  if (TAO_GIOP::send_message (this,
-                              stream,
-                              orb_core,
-                              max_wait_time) == -1)
-    return -1;
-
-  return this->idle_after_send ();
-}
-
-// Return 0, when the reply is not read fully, 1 if it is read fully.
-// @@ This code should go in the TAO_Transport class is repeated for
-//    each transport!!
-int
-TAO_UIOP_Client_Transport::handle_client_input (int /* block */,
-                                                ACE_Time_Value *max_wait_time)
-{
-  // When we multiplex several invocations over a connection we need
-  // to allocate the CDR stream *here*, but when there is a single
-  // request over a connection the CDR stream can be pre-allocated on
-  // the stack of the thread that sent the request!
-  // Can we preserve this optimization on the new architecture?
-  //
-  // here is how:
-  //
-  // Use an "factory" to obtain the CDR stream, in the Muxed case the
-  // factory simply allocates a new one, in the Exclusive case the
-  // factory returns a pointer to the pre-allocated CDR.
-  //
-  // @@ Alex: I thought some more about this, and here is how i would
-  //    like to do it: this class keeps a CDR stream for the "current"
-  //    message beign received. Initially the CDR is 0, when the
-  //    handle_client_input() is called the first time then we go to
-  //    the muxer to obtain the CDR stream.
-  //    - The exclusive Muxer returns the CDR stream pre-allocated by
-  //      the invocation.
-  //    - The shared Muxer returns a new CDR stream.
-  //    Once all the data has been received the reply handler takes
-  //    charge of the CDR stream, or actually of its message block,
-  //    which is referenced counted and thus can be efficiently
-  //    removed.
-  //    Do I make any sense?
-
-  TAO_GIOP_Message_State* message_state =
-    this->tms_->get_message_state ();
-
-  if (message_state == 0)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) UIOP_Transport::handle_client_input -"
-                    " nil message state\n"));
-      return -1;
-    }
-
-  int result = TAO_GIOP::handle_input (this,
-                                       this->orb_core_,
-                                       *message_state,
-                                       max_wait_time);
-  if (result == -1)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - %p\n",
-                    "UIOP_Transport::handle_client_input, handle_input"));
-      return -1;
-    }
-  if (result == 0)
-    return result;
-
-  // OK, the complete message is here...
-
-  TAO_GIOP_ServiceContextList reply_ctx;
-  CORBA::ULong request_id;
-  CORBA::ULong reply_status;
-
-  result = TAO_GIOP::parse_reply (this,
-                                  this->orb_core_,
-                                  *message_state,
-                                  reply_ctx,
-                                  request_id,
-                                  reply_status);
-  if (result == -1)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - %p\n",
-                    "UIOP_Transport::handle_client_input, parse reply"));
-      message_state->reset ();
-      return -1;
-    }
-
-  result =
-    this->tms_->dispatch_reply (request_id,
-                                reply_status,
-                                message_state->giop_version,
-                                reply_ctx,
-                                message_state);
-
-  if (result == -1)
-    {
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) : UIOP_Client_Transport::"
-                    "handle_client_input - "
-                    "dispatch reply failed\n"));
-      message_state->reset ();
-      return -1;
-    }
-
-  if (result == 0)
-    {
-      message_state->reset ();
-      return 0;
-    }
-
-  // This is a NOOP for the Exclusive request case, but it actually
-  // destroys the stream in the muxed case.
-  this->tms_->destroy_message_state (message_state);
-
-  // Return something to indicate the reply is received.
-  return result;
-}
-
-int
-TAO_UIOP_Client_Transport::register_handler (void)
-{
-  ACE_Reactor *r = this->orb_core ()->reactor ();
-  if (r == this->client_handler ()->reactor ())
-    return 0;
-
-  return r->register_handler (this->client_handler (),
-                              ACE_Event_Handler::READ_MASK);
-}
-
-int
-TAO_UIOP_Client_Transport::check_unexpected_data (void)
-{
-  // @@ Alex: This should *not* be part of the client connection
-  //    handler, we should treat any incoming data as a GIOP message.
-  //    The server can always send the "CloseConnection" message and
-  //    we should act accordingly.
-  //    Finally: in the future the server may send requests though
-  //    GIOP 1.2 connections, we shouldn't hard-code the current GIOP
-  //    state machine at this level...
-
-  // We're a client, so we're not expecting to see input.  Still we
-  // better check what it is!
-  char ignored;
-  ssize_t ret = this->client_handler ()->peer().recv (&ignored,
-                                                      sizeof ignored,
-                                                      MSG_PEEK);
-  switch (ret)
-    {
-    case 0:
-    case -1:
-      // 0 is a graceful shutdown
-      // -1 is a somewhat ugly shutdown
-      //
-      // Both will result in us returning -1 and this connection
-      // getting closed
-      //
-      // if (errno == EWOULDBLOCK)
-      // return 0;
-
-      if (TAO_debug_level)
-        ACE_DEBUG ((LM_WARNING,
-                    "TAO_UIOP_Client_Transport::check_unexpected_data: "
-                    "closing connection on fd %d\n",
-                    this->client_handler ()->peer().get_handle ()));
-      break;
-
-    case 1:
-      //
-      // @@ Fix me!!
-      //
-      // This should be the close connection message.  Since we don't
-      // handle this yet, log an error, and close the connection.
-      ACE_ERROR ((LM_WARNING,
-                  "TAO_UIOP_Client_Transport::check_unexpected_data: "
-                  "input while not expecting a response; "
-                  "closing connection on fd %d\n",
-                  this->client_handler ()->peer().get_handle ()));
-      break;
-    }
-
-  // We're not expecting input at this time, so we'll always
-  // return -1 for now.
-  return -1;
-}
-
-// ****************************************************************
-
-ssize_t
-TAO_UIOP_Transport::send (const ACE_Message_Block *mblk,
-                          ACE_Time_Value *max_time_wait)
-{
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_UIOP_TRANSPORT_SEND_START);
-
-  // For the most part this was copied from GIOP::send_request and
-  // friends.
-
-  iovec iov[IOV_MAX];
-  int iovcnt = 0;
-  ssize_t n = 0;
-  ssize_t nbytes = 0;
-
-  for (const ACE_Message_Block *i = mblk;
-       i != 0;
-       i = i->cont ())
-    {
-      // Make sure there is something to send!
-      if (i->length () > 0)
-        {
-          iov[iovcnt].iov_base = i->rd_ptr ();
-          iov[iovcnt].iov_len  = i->length ();
-          iovcnt++;
-
-          // The buffer is full make a OS call.  @@ TODO this should
-          // be optimized on a per-platform basis, for instance, some
-          // platforms do not implement writev() there we should copy
-          // the data into a buffer and call send_n(). In other cases
-          // there may be some limits on the size of the iovec, there
-          // we should set IOV_MAX to that limit.
-          if (iovcnt == IOV_MAX)
-            {
-              if (max_time_wait == 0)
-                n = this->handler_->peer ().sendv_n ((const iovec *) iov,
-                                                     iovcnt);
-              else
-                n = ACE::writev (this->handler_->peer ().get_handle (),
-                                 (const iovec*) iov,
-                                 iovcnt,
-                                 max_time_wait);
-              if (n <= 0)
-                return n;
-
-              nbytes += n;
-              iovcnt = 0;
-            }
-        }
-    }
-
-  // Check for remaining buffers to be sent!
-  if (iovcnt != 0)
-    {
-      n = this->handler_->peer ().sendv_n ((const iovec *) iov,
-                                           iovcnt);
-      if (n < 1)
-        return n;
-
-      nbytes += n;
-    }
-
-  return nbytes;
-}
-
-ssize_t
-TAO_UIOP_Transport::send (const u_char *buf,
-                          size_t len,
-                          ACE_Time_Value *)
-{
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_UIOP_TRANSPORT_SEND_START);
-
-  return this->handler_->peer ().send_n (buf, len);
-}
-
-ssize_t
-TAO_UIOP_Transport::send (const iovec *iov,
-                          int iovcnt,
-                          ACE_Time_Value *)
-{
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_UIOP_TRANSPORT_SEND_START);
-
-  return this->handler_->peer ().sendv_n ((const iovec *) iov,
-                                          iovcnt);
-}
-
-ssize_t
-TAO_UIOP_Transport::recv (char *buf,
-                          size_t len,
-                          ACE_Time_Value *max_wait_time)
-{
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_UIOP_TRANSPORT_RECEIVE_START);
-
-  return ACE::recv_n (this->handler_->peer ().get_handle (),
-                      buf,
-                      len,
-                      max_wait_time);
-}
-
-ssize_t
-TAO_UIOP_Transport::recv (char *buf,
-                          size_t len,
-                          int flags,
-                          ACE_Time_Value *max_wait_time)
-{
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_UIOP_TRANSPORT_RECEIVE_START);
-
-  return ACE::recv_n (this->handler_->peer ().get_handle (),
-                      buf,
-                      len,
-                      flags,
-                      max_wait_time);
-}
-
-ssize_t
-TAO_UIOP_Transport::recv (iovec *iov,
-                          int iovcnt,
-                          ACE_Time_Value *)
-{
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_UIOP_TRANSPORT_RECEIVE_START);
-
-  return handler_->peer ().recvv_n (iov, iovcnt);
-}
-
-// Default action to be taken for send request.
-int
-TAO_UIOP_Transport::send_request (TAO_ORB_Core *  /* orb_core */,
-                                  TAO_OutputCDR & /* stream   */,
-                                  int             /* twoway   */,
-                                  ACE_Time_Value * /* max_wait_time */)
-{
-  return -1;
-}
-
-#endif  /* !ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/TAO/tao/UIOP_Transport.h b/TAO/tao/UIOP_Transport.h
deleted file mode 100644
index bcd9d8f61c1..00000000000
--- a/TAO/tao/UIOP_Transport.h
+++ /dev/null
@@ -1,216 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     UIOP_Transport.h
-//
-// = DESCRIPTION
-//     UIOP Transport specific processing
-//
-// = AUTHOR
-//     Fred Kuhns <fredk@cs.wustl.edu>
-//     Ossama Othman <othman@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_UIOP_TRANSPORT_H
-#define TAO_UIOP_TRANSPORT_H
-
-#include "tao/Pluggable.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/GIOP.h"
-
-# if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
-// Forward decls.
-class TAO_UIOP_Handler_Base;
-class TAO_UIOP_Client_Connection_Handler;
-class TAO_UIOP_Server_Connection_Handler;
-class TAO_ORB_Core;
-
-class TAO_Export TAO_UIOP_Transport : public TAO_Transport
-{
-  // = TITLE
-  //   This class acts as a bridge class to the transport specific
-  //   connection handler (handler_).
-  //
-  // = DESCRIPTION
-  //   Specialization of the base TAO_Transport class to handle the UIOP
-  //   protocol.  This class in turn will be further specialized for
-  //   the client and server side.
-public:
-  TAO_UIOP_Transport (TAO_UIOP_Handler_Base *handler,
-                      TAO_ORB_Core *orb_core);
-  // Base object's creator method.
-
-  ~TAO_UIOP_Transport (void);
-  // Default destructor.
-
-  CORBA::ULong tag (void);
-  // Returns the specific IOP instance, in this case UIOP.
-
-  void close_connection (void);
-  // Call the corresponding connection handlers close method.
-
-  int idle (void);
-  // Idles the corresponding connection handler.
-
-  TAO_UIOP_Handler_Base *&handler (void);
-  // Return a reference to the corresponding connection handler.
-
-  ACE_HANDLE handle (void);
-  // Return the underlying connection handle.
-
-  ssize_t send (const ACE_Message_Block *mblk,
-                ACE_Time_Value *s = 0);
-  // Write the contents of the Message_Block to the connection.
-
-  ssize_t send (const u_char *buf,
-                size_t len,
-                ACE_Time_Value *s = 0);
-  // Write the contents of the buffer of length len to the connection.
-
-  ssize_t send (const iovec *iov,
-                int iovcnt,
-                ACE_Time_Value *s = 0);
-  // Write the contents of iovcnt iovec's to the connection.
-
-  ssize_t recv (char *buf,
-                size_t len,
-                ACE_Time_Value *s = 0);
-  // Read len bytes from into buf.
-
-  ssize_t recv (char *buf,
-                size_t len,
-                int flags,
-                ACE_Time_Value *s = 0);
-  // Read len bytes from into buf using flags.
-
-  ssize_t recv (iovec *iov,
-                int iovcnt,
-                ACE_Time_Value *s = 0);
-  //  Read received data into the iovec buffers.
-
-  virtual int send_request (TAO_ORB_Core *orb_core,
-                            TAO_OutputCDR &stream,
-                            int twoway,
-                            ACE_Time_Value *max_wait_time);
-  // Default action to be taken for send request.
-
-protected:
-  TAO_UIOP_Handler_Base *handler_;
-  // the connection service handler used for accessing lower layer
-  // communication protocols.
-};
-
-class TAO_Export TAO_UIOP_Client_Transport : public TAO_UIOP_Transport
-{
-  // = TITLE
-  //   The Transport class used for Client side communication with a
-  //   server.
-  //
-  // = DESCRIPTION
-  //   Specialization of the TAO_UIOP_Transport class for client
-  //   side.  Methods related to sending one and two way requests
-  //   lives here.
-public:
-  TAO_UIOP_Client_Transport (TAO_UIOP_Client_Connection_Handler *handler,
-                             TAO_ORB_Core *orb_core);
-  // Constructor.  Note, TAO_UIOP_Handler_Base is the base class for
-  // both TAO_UIOP_Client_Connection_Handler and
-  // TAO_UIOP_Server_Connection_Handler.
-
-  ~TAO_UIOP_Client_Transport (void);
-  // destructor
-
-  TAO_UIOP_Client_Connection_Handler *client_handler (void);
-  // return a pointer to the client's connection handler.
-
-  virtual void start_request (TAO_ORB_Core *orb_core,
-                              const TAO_Profile *profile,
-                              const char* opname,
-                              CORBA::ULong request_id,
-                              CORBA::Boolean is_twoway,
-                              TAO_OutputCDR &output,
-                              CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Fill into <output> the right headers to make a request.
-
-  virtual void start_locate (TAO_ORB_Core *orb_core,
-                             const TAO_Profile *profile,
-                             CORBA::ULong request_id,
-                             TAO_OutputCDR &output,
-                             CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Fill into <output> the right headers to make a locate request.
-
-  int send_request (TAO_ORB_Core *orb_core,
-                    TAO_OutputCDR &stream,
-                    int twoway,
-                    ACE_Time_Value *max_wait_time);
-  // This is a bridge method for the connection handlers
-  // <send_request> method.  The connection handler is responsible for
-  // concurrency strategies, typically using the leader-follower
-  // pattern.
-
-  int handle_client_input (int block = 0,
-                           ACE_Time_Value *max_time_value = 0);
-  // Read and handle the reply. Returns 0 when there is Short Read on
-  // the connection. Returns 1 when the full reply is read and
-  // handled. If <block> is 1, then reply is read in a blocking
-  // manner.
-
-  virtual int register_handler (void);
-  // Register the handler with the reactor. This will be called by the
-  // Wait Strategy if Reactor is used  for that strategy.
-
-protected:
-  int check_unexpected_data (void);
-  // This method checks for unexpected data.
-
-private:
-  TAO_UIOP_Client_Connection_Handler *client_handler_;
-  // pointer to the corresponding client side connection handler.
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_UIOP_Server_Transport : public TAO_UIOP_Transport
-{
-  // = TITLE
-  //   The Transport class used for server communication with a
-  //   connected client.
-  //
-  // = DESCRIPTION
-  //   Specialization of the TAO_UIOP_Transport class for the server side.
-  //   methods for reading messages (requests) and sending replies live
-  //   here.
-public:
-
-  TAO_UIOP_Server_Transport (TAO_UIOP_Server_Connection_Handler *handler,
-                             TAO_ORB_Core* orb_core);
-  //  Default creator method.
-
-  ~TAO_UIOP_Server_Transport (void);
-  // Default destructor
-
-  TAO_UIOP_Server_Connection_Handler *server_handler_;
-  // Pointer to the corresponding connection handler.
-
-  TAO_GIOP_Message_State message_state_;
-  // This keep the state of the current message, to enable
-  // non-blocking reads, fragment reassembly, etc.
-};
-
-# endif  /* !ACE_LACKS_UNIX_DOMAIN_SOCKETS */
-
-#endif  /* TAO_UIOP_TRANSPORT_H */
diff --git a/TAO/tao/Union.cpp b/TAO/tao/Union.cpp
deleted file mode 100644
index ff534013ad8..00000000000
--- a/TAO/tao/Union.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Union.cpp
-//
-// = AUTHOR
-//
-//    Aniruddha Gokhale (Idea by Carlos O'Ryan)
-//
-// ============================================================================
-
-#include "tao/Union.h"
-
-ACE_RCSID(tao, Union, "$Id$")
-
-// *************************************************************
-// Operations for class TAO_Base_Union
-// *************************************************************
-
-TAO_Base_Union::TAO_Base_Union (void)
-{
-}
-
-TAO_Base_Union::~TAO_Base_Union (void)
-{
-}
diff --git a/TAO/tao/Union.h b/TAO/tao/Union.h
deleted file mode 100644
index e0dece89f19..00000000000
--- a/TAO/tao/Union.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Union.h
-//
-// = AUTHOR
-//
-//    Aniruddha Gokhale (Idea by Carlos O'Ryan)
-//
-// ============================================================================
-
-#ifndef TAO_UNION_H
-#define TAO_UNION_H
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_Export TAO_Base_Union
-{
-  // = TITLE
-  //   Base class for TAO Unions.
-  //
-  // = DESCRIPTION
-  //   This class provides a common interface for all IDL unions,
-  //   hence the interpreted marshal engine can manipulate them in a
-  //   type-safe manner.
-public:
-  friend class TAO_Marshal_Union;
-  // We give access to TAO_Marshal_Union, this allows a safe
-  // implementation of the marshal engine.
-
-  virtual ~TAO_Base_Union (void);
-  // destructor.
-
-  virtual void *_discriminant (void) = 0;
-  // Return pointer to the discriminant.
-
-  virtual void *_access (CORBA::Boolean flag) = 0;
-  // Provides access to the right data member at the right offset. If
-  // the flag is TRUE, we allocate the necessary storage. This will be
-  // required for the decoding side.
-
-  virtual void _reset (void) = 0;
-  // Free existing storage.
-
-protected:
-  TAO_Base_Union (void);
-  // Default constructor.
-
-};
-
-#endif /* TAO_BASE_UNION_H */
diff --git a/TAO/tao/ValueBase.cpp b/TAO/tao/ValueBase.cpp
deleted file mode 100644
index 188466baca0..00000000000
--- a/TAO/tao/ValueBase.cpp
+++ /dev/null
@@ -1,269 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     ValueBase.cpp
-//
-// = AUTHOR
-//     Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//
-// ============================================================================
-
-
-#include "tao/CDR.h"
-#include "tao/ORB.h"
-#include "tao/ORB_Core.h"
-#include "tao/ValueBase.h"
-
-#ifdef TAO_HAS_VALUETYPE
-
-#if !defined (__ACE_INLINE__)
-# include "tao/ValueBase.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, ValueBase, "$Id$")
-
-// destructor
-CORBA_ValueBase::~CORBA_ValueBase (void)
-{
-}
-
-CORBA_ValueBase*
-CORBA_ValueBase::_downcast (CORBA_ValueBase* vt)
-{
-  return vt;  // every vt is a CORBA::ValueBase :-)
-}
-
-
-// OBV marshaling in principle:
-// _tao_marshal () is called from the CDR operator<< ()
-// to marshal a valuetype. To marshal the state
-// it calls (virtual) _tao_marshal_v () (IDL generated) on itself
-// which 'jumps' to the most derived valuetype class. This function
-// further calls (inline) _tao_marshal_state, which is generated from
-// IDL too and does the marshaling of state members and base classes
-// (before, if any) actually.
-// Fragmentation (chunking) needs some cooperation with the CDR stream.
-// It needs to keep track of the state we're in:
-// (outside chunk, beginning of chunk - no data, inside chunk and
-// the nesting level of valuetypes. (The chunks itself are not nested.))
-
-// (see CORBA 2.3 GIOP 15.3.4)
-
-CORBA::Boolean
-CORBA_ValueBase::_tao_marshal (TAO_OutputCDR &strm,
-                               CORBA_ValueBase *this_,
-                               ptr_arith_t /* formal_type_id */)
-{
-  CORBA::Boolean retval = 1;
-  // %! yet much to do ... look for +++ !
-
-  // 1. Is 'this' yet marshalled ? (->1a)
-  //    If not then mark 'this' as marshalled. (->2) +++
-  //    Or is it null ? (write null_ref and return ok)
-  // 1a. Put indirection and return successfull.
-
-  if (this_ == 0)
-    {
-      retval = strm.write_ulong (0);
-      // write TAO_OBV_GIOP_Flags::Null_ref
-      return retval;
-    }
-
-  // 2. if (chunking) and we are in a chunk (look in strm),
-  //    end the chunk by writing its length at its start.
-  //    This is the responsibility of the CDR stream. +++
-  //    But if nothing is writtern in this chunk yet,
-  //    we want to overwrite the place of the dummy blocksize-tag
-  //    with our <value-tag>.
-  //    Increase the nesting level of valuetypes.
-
-  // 3. Build <value-tag>, which states if chunking is used
-  //    and if type information ((list of) repository id(s))
-  //    is provided. The latter is necessary if the formal_type_id
-  //    is unequal the 'true derived' type of this object. +++
-
-  CORBA::ULong value_tag =   TAO_OBV_GIOP_Flags::Value_tag_base
-                           | TAO_OBV_GIOP_Flags::Type_info_single;
-
-  retval = strm.write_ulong (value_tag);
-  if (!retval)
-    return retval;
-
-  // 4. Marshal type information.
-
-  retval = strm.write_string (this_->_tao_obv_repository_id ());
-  if (!retval)
-    return retval;
-
-  // 5. if (chunking) let room for a blocksize-tag. (i.e. write ULong)
-
-  // 6. Now marshal state members. (%! Problem when state is empty
-  //    and chunked encoding is used.)
-
-  retval = this_->_tao_marshal_v (strm);
-
-  // 7. if (chunking) let strm overwrite the last blocksize tag
-  //    with its concrete value.                                 +++
-  // 8. if (chunking) write an end tag, or (optimization) let the CDR
-  //    care for collecting all end tags of nested values (e.g. linked
-  //    list), so that only one end tag at all must be written.  +++
-
-  return retval;
-}
-
-
-CORBA::Boolean
-CORBA_ValueBase::_tao_unmarshal (TAO_InputCDR &,
-                                  CORBA_ValueBase *&)
-{
-  // This is for the special case only that one unmarshals in order
-  // to assign the newly created object directly to a ValueBase pointer.
-  // Implementation is like a specialized one (in TC.cpp, if T.idl is source).
-  // basically do:
-  //  ValueBase::_tao_unmarshal_pre ()
-  //    (Gets factory or possible a null or an existing object.
-  //     Then the job is done. On an existing (backreferenced) object
-  //     do a cast and a type check)
-  //  new_object = factory->create_for_unmarshal ()
-  //     (with apropriate cast)
-  //  new_object->_tao_unmarshal_v ()
-  //  new_object->_tao_unmarshal_post ()
-
-  ACE_DEBUG ((LM_DEBUG, "unimpl. CORBA::ValueBase::_tao_unmarshal\n"));
-  return 0; // %!
-}
-
-
-CORBA::Boolean
-CORBA_ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
-                                     CORBA_ValueFactory_ptr &factory,
-                                     CORBA_ValueBase *&valuetype,
-                                     const char * const /* repo_id */)
-{ // %! dont leak on error case !
-  // %! postconditions
-  CORBA::Boolean retval = 1;
-  factory = 0;
-  // %! yet much to do ... look for +++ !
-
-  // 1. Get the <value-tag> (else it may be <indirection-tag> or <null-ref>).
-  //    Is object yet unmarshalled (<indirection-tag> is set) ? (->1a)
-  //    Is <null-ref> given ? Set 0 and return ok.
-  // 1a. Lookup the real address in memory, which should be aligned +++
-  //     to CORBA::ValueBase. Its possible at this point that worse
-  //     type mismatch gets by undetected, if the CDR stream fakes.
-  //     So the type should be checked ... +++
-
-  CORBA::ULong value_tag;
-  if (!strm.read_ulong (value_tag))
-    {
-      return 0;
-    }
-
-  if (TAO_OBV_GIOP_Flags::is_null_ref (value_tag))
-    {
-      valuetype = 0;
-      return 1;
-      // ok, null reference unmarshaled
-    }
-  // 2. Now at this point it must be a <value-tag> (error else).
-  //    if (chunking) check that any last chunk ends with matching
-  //    size. If not raise marshal exception.
-  //    Increase the nesting level of valuetypes.
-
-  if (!TAO_OBV_GIOP_Flags::is_value_tag (value_tag))
-    {
-      ACE_DEBUG ((LM_DEBUG, "!CORBA::ValueBase::_tao_unmarshal_pre not value_tag\n"));
-      return 0;
-    }
-
-  // 3. if (chunking) read and record the blocksize-tag.
-
-  // 4. Unmarshal type information and lookup factory.
-  //    If no type information is given in the CDR encoding, as told
-  //    from the <value-tag>, then use the repository id parameter
-  //    (it _must_ be right).
-
-  CORBA::String_var repo_id_stream;
-
-  // It would be more efficient not to copy the string %!)
-  if (strm.read_string (repo_id_stream.inout ()) == 0)
-    {
-      return 0;
-    }
-
-  factory = TAO_ORB_Core_instance ()->orb ()   // @@ %! right way to access ?
-    ->lookup_value_factory (repo_id_stream.in());
-  if (factory == 0) // %! except.!
-    {
-      ACE_DEBUG ((LM_ERROR, "(%N:%l) OBV factory is null !!!\n"));
-      return 0;
-    }
-
-  return retval;
-}
-
-CORBA::Boolean
-CORBA_ValueBase::_tao_unmarshal_post (TAO_InputCDR &)
-{
-  CORBA::Boolean retval = 1;
-
-  // (... called from T::_tao_unmarshal)
-  // 7. if (chunking) check the last blocksize tag for correct value.  +++
-  //    And if we're gonna to truncate, skip all the state of the more
-  //    derived classes. (But it might need to be accessed again,
-  //    if there are embedded objects which are referenced later
-  //    in this CDR encoding stream.)
-
-  // 8. if (chunking) there must be some end tag. Let the CDR stream deal
-  //    with this (and decrease the nesting level of valuetypes).
-  //    Also the CDR stream must check for eventually outstanding end tags
-  //    at the end of the stream which have to cause a marshal
-  //    exception there.
-
-  return retval;
-}
-
-
-// member functions for CORBA_DefaultValueRefCountBase ============
-
-// destructor
-CORBA_DefaultValueRefCountBase::~CORBA_DefaultValueRefCountBase (void)
-{
-}
-
-void
-CORBA_DefaultValueRefCountBase::_add_ref (void)
-{
-  this->_tao_add_ref ();
-}
-
-void
-CORBA_DefaultValueRefCountBase::_remove_ref (void)
-{
-  this->_tao_remove_ref ();
-}
-
-CORBA::ULong
-CORBA_DefaultValueRefCountBase::_refcount_value (void)
-{
-  return this->_tao_refcount_value ();
-}
-
-
-// some constants
-
-const CORBA::ULong TAO_OBV_GIOP_Flags::Value_tag_base    = 0x7fffff00L;
-const CORBA::ULong TAO_OBV_GIOP_Flags::Value_tag_sigbits = 0xffffff00L;
-const CORBA::ULong TAO_OBV_GIOP_Flags::Codebase_url      = 1;
-const CORBA::ULong TAO_OBV_GIOP_Flags::Type_info_sigbits = 0x00000006L;
-const CORBA::ULong TAO_OBV_GIOP_Flags::Type_info_none    = 0;
-const CORBA::ULong TAO_OBV_GIOP_Flags::Type_info_single  = 2;
-const CORBA::ULong TAO_OBV_GIOP_Flags::Type_info_list    = 6;
-
-
-#endif /* TAO_HAS_VALUETYPE */
diff --git a/TAO/tao/ValueBase.h b/TAO/tao/ValueBase.h
deleted file mode 100644
index 3bb80ab8cf2..00000000000
--- a/TAO/tao/ValueBase.h
+++ /dev/null
@@ -1,160 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     ValueBase.h
-//
-// = AUTHOR
-//     Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//
-// ============================================================================
-
-#ifndef TAO_VALUEBASE_H
-#define TAO_VALUEBASE_H
-
-#include "ace/OS.h"           /* for ptr_arith_t */
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/corbafwd.h"
-
-#ifdef TAO_HAS_VALUETYPE
-
-
-class TAO_Export CORBA_ValueBase
-{
-  // = TITLE
-  //   Abstract baseclass for Valuetypes
-  //   (see CORBA 2.3 20.17.5)
-
-public:
-  // reference counting
-  virtual void _add_ref (void) = 0;
-  virtual void _remove_ref (void) = 0;
-  // %! virtual CORBA::ValueBase* _copy_value (void) = 0;
-  virtual CORBA::ULong _refcount_value (void) = 0;
-
-  // dynamic casting
-  static CORBA::ValueBase* _downcast (CORBA::ValueBase*);
-
-  virtual const char* _tao_obv_repository_id () const = 0;
-  // TAO extension
-
-  // TAO internal --------------------------
-
-  static CORBA::Boolean _tao_marshal (TAO_OutputCDR &strm,
-                                      CORBA_ValueBase *_this,
-                               ptr_arith_t formal_type_id = 0);
-  // Marshal a valuetype (see operator<< in tao_idl generated file
-  // how it is called)
-
-  static CORBA::Boolean _tao_unmarshal (TAO_InputCDR &strm,
-                                        CORBA_ValueBase *&_this);
-  // Unmarshal a valuetype, if formal type is a pointer to ValueBase
-
-  // static CORBA::Boolean
-  // T::_tao_unmarshal (TAO_InputCDR &, CORBA_ValueBase *&_this)
-  // is typespecific for valuetype T and generated from tao_idl
-  // Use this for unmarshaling.
-
-  static CORBA::Boolean _tao_unmarshal_pre (TAO_InputCDR &strm,
-                                            CORBA_ValueFactory_ptr &,
-                                            CORBA_ValueBase *&,
-                                            const char * const repo_id);
-  CORBA::Boolean _tao_unmarshal_post (TAO_InputCDR &strm);
-  // Both used internally and are called from T::_tao_unmarshal ()
-
-
-public:  // otherwise these cannot be called from a static function
-  virtual void *_tao_obv_narrow (ptr_arith_t) = 0;
-
-  virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &) = 0;
-  // during marshal jump to the most derived part
-
-  virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &) = 0;
-  // called after obtaining the fresh object from create_for_unmarshal ()
-
-protected:
-  CORBA_ValueBase (void);
-  CORBA_ValueBase (const CORBA_ValueBase&);
-  virtual ~CORBA_ValueBase ();
-
-private:
-  void operator= (const CORBA_ValueBase &);
-}; // CORBA_ValueBase
-
-
-
-
-class TAO_Export CORBA_DefaultValueRefCountBase : public virtual CORBA_ValueBase
-{
-  // = TITLE
-  //   Default mix-in for reference count of a valuetype.
-
-public:
-  virtual void _add_ref (void);
-  virtual void _remove_ref (void);
-  virtual CORBA::ULong _refcount_value (void);
-
-  void _tao_add_ref (void);
-  void _tao_remove_ref (void);
-  CORBA::ULong _tao_refcount_value (void);
-  // The _tao variants are inline for fast access from T_var
-  // (if valuetype T is compiled with optimization for that.) %! (todo)
-
-protected:
-  CORBA_DefaultValueRefCountBase (void);
-  CORBA_DefaultValueRefCountBase (const CORBA_DefaultValueRefCountBase&);
-  virtual ~CORBA_DefaultValueRefCountBase ();
-
-private:
-  void operator= (const CORBA_DefaultValueRefCountBase &);
-
-private: // data
-  CORBA::ULong _tao_reference_count_;
-  ACE_SYNCH_MUTEX _tao_reference_count_lock_;
-}; // CORBA_DefaultValueRefCountBase
-
-// %! which lock has the lowest memory overhead ?
-// %! todo refcountbase w/o locking (now memory overhead)
-// $! todo: debug aids for refcounts
-
-
-class TAO_OBV_GIOP_Flags
-{
-  // CORBA 2.3: 15.3.4
-public:
-  static const CORBA::ULong Value_tag_base;
-  static const CORBA::ULong Value_tag_sigbits;
-  static const CORBA::ULong Codebase_url;
-  static const CORBA::ULong Type_info_sigbits;
-  static const CORBA::ULong Type_info_none;
-  static const CORBA::ULong Type_info_single;
-  static const CORBA::ULong Type_info_list;
-
-  static CORBA::Boolean is_null_ref           (CORBA::ULong);
-  static CORBA::Boolean is_value_tag          (CORBA::ULong);
-  static CORBA::Boolean has_codebase_url      (CORBA::ULong);
-  static CORBA::Boolean has_no_type_info      (CORBA::ULong);
-  static CORBA::Boolean has_single_type_info  (CORBA::ULong);
-  static CORBA::Boolean has_list_type_info    (CORBA::ULong);
-  static CORBA::Boolean is_chunked            (CORBA::ULong);
-  static CORBA::Boolean is_indirection_tag    (CORBA::ULong);
-  static CORBA::Boolean is_indirection        (CORBA::ULong);
-  static CORBA::Boolean is_block_size         (CORBA::ULong);
-  static CORBA::Boolean is_end_tag            (CORBA::ULong);
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/ValueBase.i"
-#endif /* __ACE_INLINE__) */
-
-#endif /* TAO_HAS_VALUETYPE */
-#endif /* TAO_VALUEBASE_H */
diff --git a/TAO/tao/ValueBase.i b/TAO/tao/ValueBase.i
deleted file mode 100644
index 4117def9904..00000000000
--- a/TAO/tao/ValueBase.i
+++ /dev/null
@@ -1,136 +0,0 @@
-// This may not look like C++, but it's really -*- C++ -*-
-// $Id$
-
-// static operations in namespace CORBA ========================
-
-ACE_INLINE void
-CORBA::add_ref (CORBA::ValueBase *val)
-{
-  if (val)
-    val->_add_ref ();
-}
-
-ACE_INLINE void
-CORBA::remove_ref (CORBA::ValueBase *val)
-{
-  if (val)
-    val->_remove_ref ();
-}
-
-// ===========================================================
-
-// constructor
-ACE_INLINE
-CORBA_ValueBase::CORBA_ValueBase (void)
-{
-}
-
-
-// ===========================================================
-
-// constructor
-ACE_INLINE
-CORBA_DefaultValueRefCountBase::CORBA_DefaultValueRefCountBase (void)
-    : _tao_reference_count_ (1)
-{
-}
-
-
-ACE_INLINE void
-CORBA_DefaultValueRefCountBase::_tao_add_ref (void)
-{
-  ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->_tao_reference_count_lock_);
-  ++_tao_reference_count_;
-}
-
-ACE_INLINE void
-CORBA_DefaultValueRefCountBase::_tao_remove_ref (void)
-{
-  {
-    ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->_tao_reference_count_lock_);
-    -- this->_tao_reference_count_;
-    if (this->_tao_reference_count_ != 0)
-      return;
-  }
-  // The guard has been already given up, but this is no problem
-  // cause we have held the last reference, and this one we don't give
-  // away anymore, we do:
-  delete this;
-}
-
-ACE_INLINE CORBA::ULong
-CORBA_DefaultValueRefCountBase::_tao_refcount_value (void)
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->_tao_reference_count_lock_,0);
-  return _tao_reference_count_;
-}
-
-// ===========================================================
-
-// Detection of flags in the CDR Stream
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::is_null_ref (CORBA::ULong tag)
-{
-  return (tag == 0);
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::is_value_tag (CORBA::ULong tag)
-{
-  return ((tag & Value_tag_sigbits) == 0x7FFFFF00L);
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags:: has_codebase_url(CORBA::ULong tag)
-{
-  return (tag & Codebase_url);
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::has_no_type_info (CORBA::ULong tag)
-{
-  return ((tag & Type_info_sigbits) == Type_info_none);
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::has_single_type_info (CORBA::ULong tag)
-{
-  return ((tag & Type_info_sigbits) == Type_info_single);
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::has_list_type_info (CORBA::ULong tag)
-{
-  return ((tag & Type_info_sigbits) == Type_info_list);
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags:: is_chunked (CORBA::ULong tag)
-{
-  return (tag & 8);
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::is_indirection_tag (CORBA::ULong tag)
-{
-  return (tag == 0xFFFFFFFFL);
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::is_indirection (CORBA::ULong value)
-{
-  return (0x80000000L < value && value <= (0xFFFFFFFFL - 4));
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::is_block_size (CORBA::ULong value)
-{
-  return ( 0 < value && value < 0x7fffff00L);
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::is_end_tag (CORBA::ULong tag)
-{
-  return (0x80000000L < tag  && tag <= 0xFFFFFFFFL);
-}
diff --git a/TAO/tao/ValueFactory.cpp b/TAO/tao/ValueFactory.cpp
deleted file mode 100644
index 6b8f049ca11..00000000000
--- a/TAO/tao/ValueFactory.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     ValueFactory.cpp
-//
-// = AUTHOR
-//     Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//
-// ============================================================================
-
-
-#include "tao/ValueFactory.h"
-
-#ifdef TAO_HAS_VALUETYPE
-
-#if !defined (__ACE_INLINE__)
-# include "tao/ValueFactory.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, ValueFactory, "$Id$")
-
-CORBA_ValueFactoryBase::~CORBA_ValueFactoryBase ()
-{
-}
-
-#endif /* TAO_HAS_VALUETYPE */
diff --git a/TAO/tao/ValueFactory.h b/TAO/tao/ValueFactory.h
deleted file mode 100644
index 802ef7547a6..00000000000
--- a/TAO/tao/ValueFactory.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     ValueFactory.h
-//
-// = AUTHOR
-//     Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//
-// ============================================================================
-
-#ifndef TAO_VALUEFACTORY_H
-#define TAO_VALUEFACTORY_H
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#ifdef TAO_HAS_VALUETYPE
-
-
-class TAO_Export CORBA_ValueFactoryBase
-{
-  /*  friend CORBA::Boolean _tao_unmarshal_pre (TAO_InputCDR &,
-                                            CORBA_ValueFactory_ptr &,
-                                            CORBA_ValueBase *&,
-                                            const char * const);
-  %! how can I make the friendship work ? (g++) */
-public:
-  CORBA_ValueFactoryBase ();
-  virtual ~CORBA_ValueFactoryBase ();
-
-  // non-standard
-  virtual const char* tao_repository_id () = 0;
-
-  // non-virtual is non-standard
-  void _add_ref (void);
-  void _remove_ref (void);
-
-  // private: %!
-  virtual CORBA_ValueBase* create_for_unmarshal (void) = 0;
-  // In a derived class T use return type TAO_OBV_CREATE_RETURN_TYPE (T)
-  // (see at definition below)
-
-private:
-  CORBA::ULong _tao_reference_count_;
-  ACE_SYNCH_MUTEX _tao_reference_count_lock_;
-}; // CORBA_ValueFactoryBase
-
-
-
-// Use this macro for writing code that is independend from
-// the compiler support of covariant return types of pointers to
-// virtual inherited classes.
-// (e.g. in egcs-2.90.29 980515 (egcs-1.0.3 release) its not yet implemented)
-// (But it is TAO specific and at the moment the covariant case is not
-// elaborated --- its just a suggestion.)
-
-#ifdef TAO_HAS_OBV_COVARIANT_RETURN
-#  define TAO_OBV_CREATE_RETURN_TYPE(TYPE) TYPE *
-#else /*  TAO_HAS_OBV_COVARIANT_RETURN */
-#  define TAO_OBV_CREATE_RETURN_TYPE(TYPE) CORBA::ValueBase *
-#endif /* TAO_HAS_OBV_COVARIANT_RETURN */
-
-
-
-// (The obtaining of the repository id is currently not yet like the OMG way. %!)
-//
-// Macro for on the fly registration of a factory (with type Factory).
-// The repository id is taken from the static repository id of the
-// valuetype via tao_repository_id () of the specialized factory.
-// It forgets the pre-registered factory (if any) and the reference
-// to the newly created one. (A new reference could be obtained with
-// orb->lookup_value_factory (CORBA::String repo_id) .)
-
-#define TAO_OBV_REGISTER_FACTORY(FACTORY) \
-  { CORBA_ValueFactory_ptr factory = new FACTORY; \
-    CORBA_ValueFactory_ptr prev_factory = \
-    TAO_ORB_Core_instance ()->orb ()->register_value_factory (\
-                                   factory->tao_repository_id (),\
-                                   factory); \
-    if (prev_factory) prev_factory->_remove_ref (); \
-    factory->_remove_ref (); }
-
-
-#if defined (__ACE_INLINE__)
-# include "tao/ValueFactory.i"
-#endif /* __ACE_INLINE__) */
-
-#endif /* TAO_HAS_VALUETYPE */
-#endif /* TAO_VALUEFACTORY_H */
diff --git a/TAO/tao/ValueFactory.i b/TAO/tao/ValueFactory.i
deleted file mode 100644
index 84d4da93833..00000000000
--- a/TAO/tao/ValueFactory.i
+++ /dev/null
@@ -1,26 +0,0 @@
-// $Id$
-
-ACE_INLINE
-CORBA_ValueFactoryBase::CORBA_ValueFactoryBase ()
-  : _tao_reference_count_ (1)
-{
-}
-
-ACE_INLINE void
-CORBA_ValueFactoryBase::_add_ref (void)
-{
-  ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->_tao_reference_count_lock_);
-  ++_tao_reference_count_;
-}
-
-ACE_INLINE void
-CORBA_ValueFactoryBase::_remove_ref (void)
-{
-  {
-    ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->_tao_reference_count_lock_);
-    -- this->_tao_reference_count_;
-    if (this->_tao_reference_count_ != 0)
-      return;
-  }
-  delete this;
-}
diff --git a/TAO/tao/ValueFactory_Map.cpp b/TAO/tao/ValueFactory_Map.cpp
deleted file mode 100644
index 347d6bde062..00000000000
--- a/TAO/tao/ValueFactory_Map.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     ValueFactory_Map.cpp
-//
-// = AUTHOR
-//     Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//
-// ============================================================================
-
-#include "tao/ValueFactory_Map.h"
-#include "tao/ValueFactory.h"
-#include "tao/ORB.h"
-
-#ifdef TAO_HAS_VALUETYPE
-
-#if !defined (__ACE_INLINE__)
-# include "tao/ValueFactory_Map.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, ValueFactory_Map, "$Id$")
-
-
-TAO_ValueFactory_Map::TAO_ValueFactory_Map ()
-  : map_ ()   // use default size and allocator
-{
-}
-
-TAO_ValueFactory_Map::~TAO_ValueFactory_Map ()
-{
-  // Initialize an iterator.  We need to go thru each entry and free
-  // up storage allocated to hold the external ids and invoke
-  // _remove_ref () on the internal ids.
-  FACTORY_MAP_MANAGER::ITERATOR iterator (this->map_);
-
-  for (FACTORY_MAP_MANAGER::ENTRY *entry = 0;
-       iterator.next (entry) != 0;
-       iterator.advance ())
-    {
-      // We had allocated memory and stored the string. So we free the
-      // memory.
-      CORBA::string_free ((char *) entry->ext_id_);
-      entry->ext_id_ = 0;
-      entry->int_id_->_remove_ref ();
-      entry->int_id_ = 0;
-    }
-}
-
-// %! Thread issues
-
-int
-TAO_ValueFactory_Map::rebind (const char *repo_id,
-                              CORBA_ValueFactory_ptr &factory)
-{
-//  ACE_READ_GUARD_RETURN (ACE_SYNCH_RW_MUTEX, guard, map_->mutex(),-1);
-//   --- but must be recursive
-  const char *prev_repo_id;
-  CORBA_ValueFactory_ptr prev_factory;
-  int ret = 0;
-  ret = this->map_.rebind (CORBA::string_dup (repo_id),
-                           factory,
-                           prev_repo_id, 
-                           prev_factory);
-  if (ret > -1)   // ok, no error
-    {
-      factory->_add_ref ();    // The map owns one reference.
-      if (ret == 1)    // there was a previous factory
-        {
-          factory = prev_factory;
-          CORBA::string_free (ACE_const_cast(char*,prev_repo_id));
-        }
-    }
-  return ret;
-}
-
-int
-TAO_ValueFactory_Map::unbind (const char *repo_id,
-                              CORBA_ValueFactory_ptr &factory)
-{
-  // ACE_Hash_Map_Entry<const char *, CORBA_ValueFactory_ptr> *prev_entry;
-  FACTORY_MAP_MANAGER::ENTRY *prev_entry;
-  int ret = 0;
-  ret = this->map_.find (repo_id, 
-                         prev_entry);
-  if (ret == 0)    // there was a matching factory
-    {
-      // set factory to the previous factory,
-      factory = prev_entry->int_id_;
-      char *temp = ACE_const_cast (char *, prev_entry->ext_id_);
-      ret = this->map_.unbind (prev_entry);
-      if (ret == 0)
-        {
-          CORBA::string_free (temp);
-        }
-    }
-  return ret;
-}
-
-// %! perhaps inline
-int
-TAO_ValueFactory_Map::find (const char *repo_id,
-                            CORBA_ValueFactory_ptr &factory)
-{
-  int ret = 0;
-  ret = this->map_.find (repo_id, 
-                         factory);
-  // %! this must be guarded to be atomic  !!!!!!!!!!!!!!!!!!
-  if (ret > -1)
-    {
-      factory->_add_ref ();    // The caller gets one reference as gift.
-    }
-  return ret;
-}
-
-
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Hash_Map_Iterator_Base_Ex<const char *, CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Iterator_Ex<const char *, CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<const char *, CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Manager_Ex<const char *, CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Entry<const char *, CORBA_ValueFactory_ptr>;
-template class ACE_Singleton<TAO_ValueFactory_Map, ACE_SYNCH_MUTEX>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<const char *, CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<const char *, CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<const char *, CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<const char *, CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Entry<const char *, CORBA_ValueFactory_ptr>
-#pragma instantiate ACE_Singleton<TAO_ValueFactory_Map, ACE_SYNCH_MUTEX>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
-#endif /* TAO_HAS_VALUETYPE */
diff --git a/TAO/tao/ValueFactory_Map.h b/TAO/tao/ValueFactory_Map.h
deleted file mode 100644
index eae56a8c02c..00000000000
--- a/TAO/tao/ValueFactory_Map.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     ValueFactory_Map.h
-//
-// = AUTHOR
-//     Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//
-// ============================================================================
-
-#ifndef TAO_VALUEFACTORY_MAP_H
-#define TAO_VALUEFACTORY_MAP_H
-
-#include "ace/Hash_Map_Manager.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Singleton.h"
-#include "ace/Synch.h"
-#include "tao/corbafwd.h"
-
-#ifdef TAO_HAS_VALUETYPE
-
-class TAO_ValueFactory_Map
-{
-public:
-  TAO_ValueFactory_Map ();
-  ~TAO_ValueFactory_Map ();
-
-
-  int rebind (const char *repo_id, CORBA_ValueFactory_ptr &factory);
-  // Associate the factory (int_id) with the repo_id (ext_id).
-  // Invokes _add_ref () on the factory.
-  // If previous factory had been bind with this repo_id, this one is
-  // returned in factory (and the caller holds a reference).
-  // Returns -1 on failure, 0 on success and 1 if a previous factory
-  // is found (and returned in factory).
-
-  int unbind (const char *repo_id, CORBA_ValueFactory_ptr &factory);
-  // Removes entry for repo_id from the map and sets factory to
-  // the tied one.
-
-  int find (const char *repo_id, CORBA_ValueFactory_ptr &factory);
-  // Lookup a matching factory for repo_id.
-  // Invokes _add_ref () on the factory if found.
-  // Returns -1 on failure and 0 on success.
-
-  void dump (void);
-private:
-
-  typedef ACE_Hash_Map_Manager_Ex<const char *,
-                                  CORBA_ValueFactory_ptr,
-                                  ACE_Hash<const char *>,
-                                  ACE_Equal_To<const char *>,
-                                  ACE_SYNCH_RW_MUTEX>
-          FACTORY_MAP_MANAGER;
-  FACTORY_MAP_MANAGER map_;
-  // The hash table data structure.
-}; /* TAO_ValueFactory_Map */
-
-
-// currently the ValueFactory_Map is a singleton and not per ORB
-// as in the OMG specs
-typedef ACE_Singleton<TAO_ValueFactory_Map, ACE_SYNCH_MUTEX>
-        TAO_VALUEFACTORY_MAP;
-
-
-
-#if defined (__ACE_INLINE__)
-# include "tao/ValueFactory_Map.i"
-#endif /* __ACE_INLINE__) */
-
-#endif /* TAO_HAS_VALUETYPE */
-#endif /* TAO_VALUEFACTORY_MAP_H */
diff --git a/TAO/tao/ValueFactory_Map.i b/TAO/tao/ValueFactory_Map.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/ValueFactory_Map.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h
deleted file mode 100644
index 9ae6129f70b..00000000000
--- a/TAO/tao/Version.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-// This is an automatically generated file.
-
-#define TAO_MAJOR_VERSION 0
-#define TAO_MINOR_VERSION 4
-#define TAO_BETA_VERSION 1
-#define TAO_VERSION "0.4.1"
diff --git a/TAO/tao/Wait_Strategy.cpp b/TAO/tao/Wait_Strategy.cpp
deleted file mode 100644
index 44cd1feb188..00000000000
--- a/TAO/tao/Wait_Strategy.cpp
+++ /dev/null
@@ -1,534 +0,0 @@
-// $Id$
-
-#include "tao/Wait_Strategy.h"
-#include "tao/Pluggable.h"
-#include "tao/ORB_Core.h"
-#include "tao/debug.h"
-
-ACE_RCSID(tao, Wait_Strategy, "$Id$")
-
-// Constructor.
-TAO_Wait_Strategy::TAO_Wait_Strategy (TAO_Transport *transport)
-  : transport_ (transport)
-{
-}
-
-// Destructor.
-TAO_Wait_Strategy::~TAO_Wait_Strategy (void)
-{
-}
-
-int
-TAO_Wait_Strategy::sending_request (TAO_ORB_Core * /* orb_core */,
-                                    int /* two_way */)
-{
-  return 0;
-}
-
-// *********************************************************************
-
-// Constructor.
-TAO_Wait_On_Reactor::TAO_Wait_On_Reactor (TAO_Transport *transport)
-  : TAO_Wait_Strategy (transport),
-    reply_received_ (0)
-{
-}
-
-// Destructor.
-TAO_Wait_On_Reactor::~TAO_Wait_On_Reactor (void)
-{
-}
-
-int
-TAO_Wait_On_Reactor::wait (ACE_Time_Value *max_wait_time)
-{
-  // Reactor does not change inside the loop.
-  ACE_Reactor* reactor =
-    this->transport_->orb_core ()->reactor ();
-
-  // Do the event loop, till we fully receive a reply.
-  
-  int result = 1; // So the first iteration works...
-  this->reply_received_ = 0;
-  while (this->reply_received_ == 0 && result > 0)
-    {
-      result = reactor->handle_events (max_wait_time);
-    }
-
-  if (result == -1 || this->reply_received_ == -1)
-    return -1;
-
-  // Return an error if there was a problem receiving the reply...
-  if (max_wait_time != 0)
-    {
-      if (this->reply_received_ != 1
-          && *max_wait_time == ACE_Time_Value::zero)
-        {
-          result = -1;
-          errno = ETIME;
-        }
-    }
-  else
-    {
-      result = 0;
-      if (this->reply_received_ == -1)
-        result = -1;
-    }
-
-  return result;
-}
-
-int
-TAO_Wait_On_Reactor::handle_input (void)
-{
-  int result = this->transport_->handle_client_input (0);
-
-  if (result == 1)
-    {
-      this->reply_received_ = 1;
-      result = 0;
-    }
-
-  if (result == -1)
-    this->reply_received_ = -1;
-
-  return result;
-}
-
-// Register the handler with the Reactor.
-int
-TAO_Wait_On_Reactor::register_handler (void)
-{
-  return this->transport_->register_handler ();
-}
-
-// *********************************************************************
-
-// Constructor.
-TAO_Wait_On_Leader_Follower::TAO_Wait_On_Leader_Follower (TAO_Transport *transport)
-  : TAO_Wait_Strategy (transport),
-    calling_thread_ (ACE_OS::NULL_thread),
-    cond_response_available_ (0),
-    expecting_response_ (0),
-    reply_received_ (0)
-{
-}
-
-// Destructor.
-TAO_Wait_On_Leader_Follower::~TAO_Wait_On_Leader_Follower (void)
-{
-  delete this->cond_response_available_;
-  this->cond_response_available_ = 0;
-}
-
-
-// @@ Why do we need <orb_core> and the <two_way> flag? <orb_core> is
-//    with the <Transport> object and <two_way> flag wont make sense
-//    at this level since this is common for AMI also. (Alex).
-int
-TAO_Wait_On_Leader_Follower::sending_request (TAO_ORB_Core *orb_core,
-                                              int two_way)
-{
-  {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon,
-                      orb_core->leader_follower ().lock (), -1);
-
-    // The last request may have left this unitialized
-    this->reply_received_ = 0;
-
-    // Set the state so that we know we're looking for a response.
-    this->expecting_response_ = two_way;
-
-    // remember in which thread the client connection handler was running
-    this->calling_thread_ = ACE_Thread::self ();
-
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - sending request for <%x>\n",
-                  this->transport_));
-  }
-
-  // Register the handler.
-  this->transport_->register_handler ();
-  
-  // Send the request.
-  int result =
-    this->TAO_Wait_Strategy::sending_request (orb_core,
-                                              two_way);
-
-  if (result == -1)
-    {
-      ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon,
-                        orb_core->leader_follower ().lock (), -1);
-
-      this->reply_received_ = 0;
-      this->expecting_response_ = 0;
-      this->calling_thread_ = ACE_OS::NULL_thread;
-
-      //ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - failed request for <%x>\n",
-      //this->transport_));
-    }
-  return result;
-}
-
-int
-TAO_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time)
-{
-  // Cache the ORB core, it won't change and is used multiple times
-  // below:
-  TAO_ORB_Core* orb_core =
-    this->transport_->orb_core ();
-
-  TAO_Leader_Follower& leader_follower =
-    orb_core->leader_follower ();
-
-  // Obtain the lock.
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon,
-                    leader_follower.lock (), -1);
-
-  leader_follower.set_client_thread ();
-
-  ACE_Countdown_Time countdown (max_wait_time);
-
-  // Check if there is a leader, but the leader is not us
-  if (leader_follower.leader_available ()
-      && !leader_follower.is_leader_thread ())
-    {
-      // = Wait as a follower.
-
-      //ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - wait (follower) on <%x>\n",
-      //this->transport_));
-
-      // wait until we have input available or there is no leader, in
-      // which case we must become the leader anyway....
-      // @@ Alex: I am uncertain about how many condition variables
-      //    should we have, should there be one-per-thread (after all
-      //    the thread blocks on the condition variable) or there
-      //    should be one per-connection.  I think the first case is
-      //    the "Right Thing"[tm]
-      ACE_SYNCH_CONDITION* cond =
-        this->cond_response_available ();
-
-      // Add ourselves to the list, do it only once because we can
-      // wake up multiple times from the CV loop. And only do it if
-      // the reply has not been received (it could have arrived while
-      // we were preparing to receive it).
-
-      if (!this->reply_received_
-          && leader_follower.leader_available ())
-        {
-          if (leader_follower.add_follower (cond) == -1)
-            ACE_ERROR ((LM_ERROR,
-                        "TAO (%P|%t) TAO_Wait_On_Leader_Follower::wait - "
-                        "add_follower failed for <%x>\n",
-                        cond));
-        }
-
-      while (!this->reply_received_
-             && leader_follower.leader_available ())
-        {
-          if (max_wait_time == 0)
-            {
-              if (cond == 0 || cond->wait () == -1)
-                return -1;
-            }
-          else
-            {
-              countdown.update ();
-              ACE_Time_Value tv = ACE_OS::gettimeofday ();
-              tv += *max_wait_time;
-              if (cond == 0 || cond->wait (&tv) == -1)
-                return -1;
-            }
-        }
-
-      countdown.update ();
-#if 0
-      // Cannot remove the follower here, we *must* remove it when we
-      // signal it so the same condition is not signalled for both
-      // wake up as a follower and as the next leader.
-      if (leader_follower.remove_follower (cond) == -1)
-        ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) TAO_Wait_On_Leader_Follower::wait - "
-                    "remove_follower failed for <%x>\n", cond));
-#endif /* 0 */
-
-      //ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - done (follower:%d) on <%x>\n",
-      //this->reply_received_, this->transport_));
-
-      // Now somebody woke us up to become a leader or to handle
-      // our input. We are already removed from the follower queue.
-      if (this->reply_received_ == 1)
-        {
-          // But first reset our state in case we are invoked
-          // again... 
-          this->reply_received_ = 0;
-          this->expecting_response_ = 0;
-          this->calling_thread_ = ACE_OS::NULL_thread;
-
-          return 0;
-        }
-      else if (this->reply_received_ == -1)
-        {
-          // But first reset our state in case we are invoked
-          // again... 
-          this->reply_received_ = 0;
-          this->expecting_response_ = 0;
-          this->calling_thread_ = ACE_OS::NULL_thread;
-
-          return -1;
-        }
-      // FALLTHROUGH
-      // We only get here if we woke up but the reply is not complete
-      // yet, time to assume the leader role....
-      // i.e. ACE_ASSERT (this->reply_received_ == 0);
-
-    }
-
-  // = Leader Code.
-
-  // The only way to reach this point is if we must become the leader,
-  // because there is no leader or we have to update to a leader or we
-  // are doing nested upcalls in this case we do increase the refcount
-  // on the leader in TAO_ORB_Core.
-
-  // This might increase the refcount of the leader.
-  leader_follower.set_leader_thread ();
-
-  int result = 1;
-
-  {
-    ACE_GUARD_RETURN (ACE_Reverse_Lock<ACE_SYNCH_MUTEX>, rev_mon,
-                      leader_follower.reverse_lock (), -1);
-
-    // @@ Do we need to do this?
-    // Become owner of the reactor.
-    orb_core->reactor ()->owner (ACE_Thread::self ());
-
-    // Run the reactor event loop.
-
-    //ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - wait (leader) on <%x>\n",
-    //this->transport_));
-
-    while (result > 0 && this->reply_received_ == 0)
-      result = orb_core->reactor ()->handle_events (max_wait_time);
-
-    //ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - done (leader) on <%x>\n",
-    //this->transport_));
-  }
-
-  // Wake up the next leader, we cannot do that in handle_input,
-  // because the woken up thread would try to get into
-  // handle_events, which is at the time in handle_input still
-  // occupied. But do it before checking the error in <result>, even
-  // if there is an error in our input we should continue running the
-  // loop in another thread.
-
-  leader_follower.reset_leader_thread ();
-  leader_follower.reset_client_thread ();
-
-  if (leader_follower.elect_new_leader () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "TAO:%N:%l:(%P|%t):TAO_Wait_On_Leader_Follower::send_request: "
-                       "Failed to unset the leader and wake up a new follower.\n"),
-                      -1);
-
-  if (result == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "TAO:%N:%l:(%P|%t):TAO_Wait_On_Leader_Follower::wait: "
-                       "handle_events failed.\n"),
-                      -1);
-
-  // Return an error if there was a problem receiving the reply...
-  if (max_wait_time != 0)
-    {
-      if (this->reply_received_ != 1
-          && *max_wait_time == ACE_Time_Value::zero)
-        {
-          result = -1;
-          errno = ETIME;
-        }
-    }
-  else
-    {
-      result = 0;
-      if (this->reply_received_ == -1)
-        {
-          result = -1;
-        }
-    }
-
-  // Make us reusable
-  this->reply_received_ = 0;
-  this->expecting_response_ = 0;
-  this->calling_thread_ = ACE_OS::NULL_thread;
-
-  return result;
-}
-
-// Handle the input. Return -1 on error, 0 on success.
-int
-TAO_Wait_On_Leader_Follower::handle_input (void)
-{
-  TAO_ORB_Core* orb_core =
-    this->transport_->orb_core ();
-
-  // Obtain the lock.
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon,
-                    orb_core->leader_follower ().lock (), 
-                    -1);
-
-  //  ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - reading reply <%x>\n",
-  //              this->transport_));
-
-  // A message is received but not data was sent, flag this as an
-  // error, but we should do more....
-  // @@ Alex: this could be a CloseConnection message or something
-  //    similar, has to be handled...
-  if (!this->expecting_response_)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - Wait_On_LF::handle_input, "
-                    "unexpected on <%x>\n",
-                    this->transport_));
-      return -1;
-    }
-
-  // Receive any data that is available, without blocking...
-  int result = this->transport_->handle_client_input (0);
-
-  // Data was read, but there the reply has not been completely
-  // received...
-  if (result == 0)
-    return 0;
-
-  if (result == -1)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - Wait_On_LF::handle_input, "
-                    "handle_client_input == -1\n"));
-      this->reply_received_ = -1;
-    }
-
-  if (result == 1)
-    {
-      // Change the result value to something that the Reactor can
-      // understand
-      result = 0;
-      this->reply_received_ = 1;
-    }
-
-  // Wake up any threads waiting for this message, either because the
-  // message failed or because we really received it.
-  this->wake_up ();
-
-  return result;
-}
-
-// Register the handler.
-int
-TAO_Wait_On_Leader_Follower::register_handler (void)
-{
-  return this->transport_->register_handler ();
-}
-
-ACE_SYNCH_CONDITION *
-TAO_Wait_On_Leader_Follower::cond_response_available (void)
-{
-  // @@ TODO This condition variable should per-ORB-per-thread, not
-  // per-connection, it is a waste to have more than one of this in
-  // the same thread.
-  if (this->cond_response_available_ == 0)
-    {
-      ACE_SYNCH_MUTEX &lock =
-        this->transport_->orb_core ()->leader_follower().lock ();
-      ACE_NEW_RETURN (this->cond_response_available_,
-                      ACE_SYNCH_CONDITION (lock),
-                      0);
-    }
-  return this->cond_response_available_;
-}
-
-void
-TAO_Wait_On_Leader_Follower::wake_up (void)
-{
-  if (ACE_OS::thr_equal (this->calling_thread_, ACE_Thread::self ()))
-    {
-      // We are the leader thread, simply return 0, handle_events()
-      // will return because there was at least one event (this one!)
-      return;
-    }
-
-  // We are not the leader thread, but we have our data, wake up
-  // ourselves and then return 0 so the leader thread can continue
-  // doing its job....
-
-  // At this point we might fail to remove the follower, because
-  // it has been already chosen to become the leader, so it is
-  // awake and will get this too.
-  ACE_SYNCH_CONDITION* cond =
-    this->cond_response_available ();
-
-  //if (TAO_debug_level > 0)
-  //ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - wake up follower %x\n",
-  //                cond));
-
-  TAO_Leader_Follower& leader_follower =
-    this->transport_->orb_core ()->leader_follower ();
-
-  // We *must* remove it when we signal it so the same condition is
-  // not signalled for both wake up as a follower and as the next
-  // leader. 
-  // The follower may not be there if the reply is received while the
-  // consumer is not yet waiting for it (i.e. it send the request but
-  // has not blocked to receive the reply yet)
-  (void) leader_follower.remove_follower (cond); // Ignore errors
-
-  if (cond != 0)
-    (void) cond->signal ();
-}
-
-// *********************************************************************
-
-// Constructor.
-TAO_Wait_On_Read::TAO_Wait_On_Read (TAO_Transport *transport)
-  : TAO_Wait_Strategy (transport)
-{
-}
-
-// Destructor.
-TAO_Wait_On_Read::~TAO_Wait_On_Read (void)
-{
-}
-
-// Wait on the read operation.
-int
-TAO_Wait_On_Read::wait (ACE_Time_Value * max_wait_time)
-{
-  int reply_complete = 0;
-  while (reply_complete != 1)
-    {
-      reply_complete =
-        this->transport_->handle_client_input (1, max_wait_time);
-      if (reply_complete == -1)
-        return -1;
-    }
-
-  return 0;
-}
-
-// Handle the input. Delegate this job to Transport object.
-int
-TAO_Wait_On_Read::handle_input (void)
-{
-  // Block to get the whole message.
-  return this->transport_->handle_client_input (1);
-}
-
-// No-op.
-int
-TAO_Wait_On_Read::register_handler (void)
-{
-  return 0;
-}
diff --git a/TAO/tao/Wait_Strategy.h b/TAO/tao/Wait_Strategy.h
deleted file mode 100644
index 0cc8ea91ade..00000000000
--- a/TAO/tao/Wait_Strategy.h
+++ /dev/null
@@ -1,174 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     Wait_Strategy.h
-//
-// = DESCRIPTION
-//     Classes to strategize waiting for reply.
-//
-// = AUTHOR
-//     Alexander Babu Arulanthu <alex@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_WAIT_STRATEGY_H
-#define TAO_WAIT_STRATEGY_H
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_ORB_Core;
-class TAO_Transport;
-class TAO_Transport_Mux_Strategy;
-
-class TAO_Export TAO_Wait_Strategy
-{
-  // = TITLE
-  //
-  //    Strategy for waiting for the reply.
-  //
-  // = DESCRIPTION
-  //
-
-public:
-  TAO_Wait_Strategy (TAO_Transport *transport);
-  // Constructor.
-
-  virtual ~TAO_Wait_Strategy (void);
-  // Destructor.
-
-  virtual int sending_request (TAO_ORB_Core *orb_core,
-                               int two_way);
-  // The user is going to send a request, prepare any internal
-  // variables because the reply may arrive *before* the user calls
-  // wait.
-
-  virtual int wait (ACE_Time_Value *max_wait_time) = 0;
-  // Base class virtual method.
-
-  virtual int handle_input (void) = 0;
-  // Handle the input.
-
-  virtual int register_handler (void) = 0;
-  // Register the handler with the Reactor if it makes sense for the
-  // strategy.
-
-protected:
-  TAO_Transport *transport_;
-  // Transport object.
-};
-
-// @@ Alex: we should consider moving these classes to separate files,
-//    that can minimize the footprint of systems that use only one of
-//    the strategies....
-
-class TAO_Export TAO_Wait_On_Reactor : public TAO_Wait_Strategy
-{
-  // = TITLE
-  //
-  //    Wait on the Reactor. Happens in s Single Threaded client
-  //    environment.
-  //
-  // = DESCRIPTION
-  //
-
-public:
-  TAO_Wait_On_Reactor (TAO_Transport *transport);
-  // Constructor.
-
-  virtual ~TAO_Wait_On_Reactor (void);
-  // Destructor.
-
-  // = Documented in TAO_Wait_Strategy.
-
-  virtual int wait (ACE_Time_Value *max_wait_time);
-  virtual int handle_input (void);
-  virtual int register_handler (void);
-
-private:
-  int reply_received_;
-  // This flag indicates if a *complete* reply has been received. Used
-  // to exit the event loop.
-};
-
-class TAO_Export TAO_Wait_On_Leader_Follower : public TAO_Wait_Strategy
-{
-  // = TITLE
-  //
-  //    Wait according to the Leader-Follower model. Leader does the
-  //    event loop of the Reactor and the Followers wait on the
-  //    condition variable.
-  //
-  // = DESCRIPTION
-  //
-
-public:
-  TAO_Wait_On_Leader_Follower (TAO_Transport *transport);
-  // Constructor.
-
-  virtual ~TAO_Wait_On_Leader_Follower (void);
-  // Destructor.
-
-  // = Documented in TAO_Wait_Strategy.
-
-  virtual int sending_request (TAO_ORB_Core *orb_core,
-                               int two_way);
-  virtual int wait (ACE_Time_Value *max_wait_time);
-  virtual int handle_input (void);
-  virtual int register_handler (void);
-
-protected:
-  ACE_SYNCH_CONDITION* cond_response_available (void);
-  // Return the cond_response_available, initializing it if
-  // necessary.
-
-  void wake_up (void);
-  // Helper method to wake us up when we are a follower...
-
-protected:
-  ACE_thread_t calling_thread_;
-  // the thread ID of the thread we were running in.
-
-  ACE_SYNCH_CONDITION* cond_response_available_;
-  // wait on reponse if the leader-follower model is active.
-
-  int expecting_response_;
-  // State flag which, if non-zero, indicates that we were expecting
-  // respose. Otherwise, any input received is unexpected.
-
-  int reply_received_;
-  // This flag indicates if a *complete* reply was received. Until
-  // that happens we block on the leader/follower condition variable
-  // or the reactor event loop.
-};
-
-class TAO_Export TAO_Wait_On_Read :  public TAO_Wait_Strategy
-{
-  // = TITLE
-  //
-  // = DESCRIPTION
-  //   Simply block on read() to wait for the reply.
-  //
-
-public:
-  TAO_Wait_On_Read (TAO_Transport *transport);
-  // Constructor.
-
-  virtual ~TAO_Wait_On_Read (void);
-  // Destructor.
-
-  virtual int wait (ACE_Time_Value *max_wait_time);
-  virtual int handle_input (void);
-  virtual int register_handler (void);
-};
-
-#endif /* TAO_WAIT_STRATEGY_H */
diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp
deleted file mode 100644
index e85873c1b2a..00000000000
--- a/TAO/tao/WrongTransactionC.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "tao/WrongTransactionC.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-// default constructor
-CORBA_WrongTransaction::CORBA_WrongTransaction (void)
-  : CORBA_UserException (CORBA::_tc_WrongTransaction)
-{
-}
-
-// destructor - all members are of self managing types
-CORBA_WrongTransaction::~CORBA_WrongTransaction (void)
-{
-}
-
-// copy constructor
-CORBA_WrongTransaction::CORBA_WrongTransaction (const CORBA_WrongTransaction &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-}
-
-// assignment operator
-CORBA_WrongTransaction&
-CORBA_WrongTransaction::operator= (const CORBA_WrongTransaction &_tao_excp)
-{
-
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-// narrow
-CORBA_WrongTransaction_ptr
-CORBA_WrongTransaction::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/WrongTransaction:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (CORBA_WrongTransaction_ptr, exc);
-  else
-    return 0;
-}
-
-
-void CORBA_WrongTransaction::_raise ()
-{
-  TAO_RAISE(*this);
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *CORBA_WrongTransaction::_alloc (void)
-{
-  return new CORBA_WrongTransaction;
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h
deleted file mode 100644
index 580b5885ff0..00000000000
--- a/TAO/tao/WrongTransactionC.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    WrongTransactionC.h
-//
-// = AUTHOR
-//
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#ifndef TAO_IDL_WRONG_TRANSACTIONC_H
-#define TAO_IDL_WRONG_TRANSACTIONC_H
-
-#include "tao/orbconf.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#include "tao/corbafwd.h"
-#include "tao/Exception.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class TAO_Export CORBA_WrongTransaction : public CORBA::UserException
-{
-// = TITLE
-//   Exception class generated by the TAO IDL compiler.
-//
-// = DESCRIPTION
-//   This exception is thrown if a CORBA Request is implicitly
-//   associated with a transaction and is found to have an
-//   error in its parameters when checked at runtime (invocation).
-public:
-
-  CORBA_WrongTransaction (void); // default ctor
-  CORBA_WrongTransaction (const CORBA_WrongTransaction &); // copy ctor
-  ~CORBA_WrongTransaction (void); // dtor
-  CORBA_WrongTransaction &operator= (const CORBA_WrongTransaction &);
-
-
-  virtual void _raise (void);
-
-  static CORBA_WrongTransaction *_narrow (CORBA::Exception *);
-
-
-  // = TAO extension
-  static CORBA::Exception *_alloc (void);
-
-}; // exception CORBA::WrongTransaction
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#endif /* ifndef TAO_IDL_WRONG_TRANSACTIONC_H */
diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp
deleted file mode 100644
index 475577f159a..00000000000
--- a/TAO/tao/append.cpp
+++ /dev/null
@@ -1,747 +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/Marshal.h"
-#include "tao/CDR.h"
-#include "tao/Environment.h"
-#include "tao/Any.h"
-#include "tao/GIOP.h"
-#include "tao/debug.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.
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Primitive::append (CORBA::TypeCode_ptr tc,
-                               TAO_InputCDR *src,
-                               TAO_OutputCDR *dest,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Boolean continue_append = 1;
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE; // status of encode operation
-
-  switch (tc->kind_)
-    {
-    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 = CORBA::TypeCode::TRAVERSE_STOP;
-      // we are not a primitive type
-    }
-
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_append == 1)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_Primitive::append detected error\n"));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                    CORBA::COMPLETED_MAYBE),
-                    CORBA::TypeCode::TRAVERSE_STOP);
-}
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Any::append (CORBA::TypeCode_ptr,
-                         TAO_InputCDR *src,
-                         TAO_OutputCDR *dest,
-                         CORBA::Environment &ACE_TRY_ENV)
-{
-  // Typecode of the element that makes the Any.
-  CORBA::TypeCode_var elem_tc;
-
-  // Status of append operation.
-  // Decode the typecode description for the element so that we can append the
-  // data appropriately
-  CORBA::TypeCode::traverse_status retval =
-    src->decode (CORBA::_tc_TypeCode,
-                 &elem_tc.inout (),
-                 0,
-                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      // encode the typecode
-      retval = dest->encode (CORBA::_tc_TypeCode, &elem_tc, 0, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-      if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          // append the data
-          retval = dest->append (elem_tc.in (), src, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-        }
-    }
-
-  if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Any::append detected error\n"));
-
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                        CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
-    }
-
-  return retval;
-}
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
-                              TAO_InputCDR *src,
-                              TAO_OutputCDR *dest,
-                              CORBA::Environment  &ACE_TRY_ENV)
-{
-  CORBA::Boolean continue_append = 1;
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::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 = (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::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 = dest->append (CORBA::_tc_long, src, ACE_TRY_ENV);
-                ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-              }
-            break;
-
-            // Indirected typecodes, illegal at "top level"
-            case ~0u:
-              {
-                // read and write the negative offset
-                retval = dest->append (CORBA::_tc_long, src, ACE_TRY_ENV);
-                ACE_CHECK_RETURN (CORBA::TypeCode::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:
-              {
-                // write the encapsulation i.e., octet sequence
-                retval = dest->append (TC_opaque, src, ACE_TRY_ENV);
-                ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-              }
-            } // end of switch
-        }
-      else // bad kind_ value to be decoded
-        {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "TAO_Marshal_TypeCode: "
-                        "Bad kind_ value in CDR stream\n"));
-
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                            CORBA::TypeCode::TRAVERSE_STOP);
-        }
-    }
-
-  if ((continue_append == 1) &&
-      (retval == CORBA::TypeCode::TRAVERSE_CONTINUE))
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_TypeCode::append detected error\n"));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                    CORBA::COMPLETED_MAYBE),
-                    CORBA::TypeCode::TRAVERSE_STOP);
-}
-
-// Encode Principal.
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Principal::append (CORBA::TypeCode_ptr,
-                               TAO_InputCDR *src,
-                               TAO_OutputCDR *dest,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  // write the octet sequence representing the Principal
-  return dest->append (TC_opaque, src, ACE_TRY_ENV);
-}
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr,
-                            TAO_InputCDR *src,
-                            TAO_OutputCDR *dest,
-                            CORBA::Environment &ACE_TRY_ENV)
-{
-  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 = (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 = (src->read_ulong (tag) ?
-                              dest->write_ulong (tag) : 0))  == 0)
-        continue;
-
-      CORBA::ULong length = 0;
-      if ((continue_append = (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],
-                      CORBA::TypeCode::TRAVERSE_STOP);
-      continue_append = (src->read_octet_array (body, length)
-                         ? dest->write_octet_array (body, length)
-                         : 0);
-      delete [] body;
-    }
-
-  if (continue_append == 1)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_ObjRef::append detected error\n"));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                    CORBA::COMPLETED_MAYBE),
-                    CORBA::TypeCode::TRAVERSE_STOP);
-}
-
-// Decode structs.
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Struct::append (CORBA::TypeCode_ptr  tc,
-                            TAO_InputCDR *src,
-                            TAO_OutputCDR *dest,
-                            CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;
-  CORBA::Boolean continue_append = 1;
-  CORBA::TypeCode_ptr param;
-
-  // Number of fields in the struct.
-  int member_count = tc->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  for (int i = 0; i < member_count
-         && retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-         && continue_append == 1;
-       i++)
-    {
-      // get member type
-      param = tc->member_type (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      retval = dest->append (param, src, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-    }
-
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_append == 1)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_Struct::encode detected error\n"));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                    CORBA::COMPLETED_MAYBE),
-                    CORBA::TypeCode::TRAVERSE_STOP);
-}
-
-// Encode unions.
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Union::append (CORBA::TypeCode_ptr  tc,
-                           TAO_InputCDR *src,
-                           TAO_OutputCDR *dest,
-                           CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  CORBA::TypeCode_ptr discrim_tc;
-  CORBA::TypeCode_ptr member_tc;
-  CORBA::Any_ptr member_label;
-  CORBA::ULongLong discrim_val;
-  CORBA::ULong member_count;
-  CORBA::Long  default_index;
-  CORBA::ULong i;
-  CORBA::TypeCode_ptr default_tc = 0;
-  CORBA::Boolean discrim_matched = 0;
-
-  // get the discriminator type
-  discrim_tc = tc->discriminator_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  // decode the discriminator value
-  retval = src->decode (discrim_tc, &discrim_val, 0, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      // write the discriminant back to the dest
-      retval = dest->encode (discrim_tc, &discrim_val, 0, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-      if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          // now get ready to marshal the actual union value
-          default_index = tc->default_index (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-          member_count = tc->member_count (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-          // check which label value matches with the discriminator
-          // value. Accordingly, marshal the corresponding
-          // member_type. If none match, check if default exists
-          // and marshal accordingly. Otherwise it is an error.
-
-          for (i = 0; member_count-- != 0; i++)
-            {
-              member_label = tc->member_label (i, ACE_TRY_ENV);
-              ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-              CORBA::TypeCode_var type = member_label->type ();
-              // do the matching
-              switch (type->kind (ACE_TRY_ENV))
-                {
-                case CORBA::tk_short:
-                  {
-                    CORBA::Short s;
-                    *member_label >>= s;
-                    if (s == *(CORBA::Short *) &discrim_val)
-                      discrim_matched = 1;
-                  }
-                  break;
-                case CORBA::tk_ushort:
-                  {
-                    CORBA::UShort s;
-                    *member_label >>= s;
-                    if (s == *(CORBA::UShort *) &discrim_val)
-                      discrim_matched = 1;
-                  }
-                  break;
-                case CORBA::tk_long:
-                  {
-                    CORBA::Long l;
-                    *member_label >>= l;
-                    if (l == *(CORBA::Long *) &discrim_val)
-                      discrim_matched = 1;
-                  }
-                  break;
-                case CORBA::tk_ulong:
-                  {
-                    CORBA::ULong l;
-                    *member_label >>= l;
-                    if (l == *(CORBA::ULong *) &discrim_val)
-                      discrim_matched = 1;
-                  }
-                  break;
-                case CORBA::tk_enum:
-                  {
-                    CORBA::Long l;
-                    TAO_InputCDR stream (member_label->_tao_get_cdr ());
-                    (void)stream.decode (discrim_tc, &l, 0, ACE_TRY_ENV);
-                    if (l == *(CORBA::Long *) &discrim_val)
-                      discrim_matched = 1;
-                  }
-                  break;
-                case CORBA::tk_char:
-                  {
-                    CORBA::Char c;
-                    *member_label >>= CORBA::Any::to_char (c);
-                    if (c == *(CORBA::Char *) &discrim_val)
-                      discrim_matched = 1;
-                  }
-                  break;
-                case CORBA::tk_wchar:
-                  {
-                    CORBA::WChar wc;
-                    *member_label >>= CORBA::Any::to_wchar (wc);
-                    if (wc == *(CORBA::WChar *) &discrim_val)
-                      discrim_matched = 1;
-                  }
-                  break;
-                case CORBA::tk_boolean:
-                  {
-                    CORBA::Boolean b;
-                    *member_label >>= CORBA::Any::to_boolean (b);
-                    if (b == *(CORBA::Boolean *) &discrim_val)
-                      discrim_matched = 1;
-                  }
-                  break;
-                default:
-                  ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                                    CORBA::TypeCode::TRAVERSE_STOP);
-                }// end of switch
-
-              // get the member typecode
-              member_tc = tc->member_type (i, ACE_TRY_ENV);
-              ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-              if (default_index >= 0 && default_index-- == 0)
-                // have we reached the default label?, if so,
-                // save a handle to the typecode for the default
-                default_tc = member_tc;
-              if (discrim_matched)
-                {
-                  // marshal according to the matched typecode
-                  return dest->append (member_tc, src, ACE_TRY_ENV);
-                }
-            } // end of for loop
-          // we are here only if there was no match
-          if (default_tc)
-            {
-              return dest->append (default_tc, src, ACE_TRY_ENV);
-            }
-          else
-            return CORBA::TypeCode::TRAVERSE_CONTINUE;
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                            CORBA::COMPLETED_MAYBE),
-                            CORBA::TypeCode::TRAVERSE_STOP);
-        }
-    }
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                    CORBA::COMPLETED_MAYBE),
-                    CORBA::TypeCode::TRAVERSE_STOP);
-}
-
-// decode string
-CORBA::TypeCode::traverse_status
-TAO_Marshal_String::append (CORBA::TypeCode_ptr,
-                            TAO_InputCDR *src,
-                            TAO_OutputCDR *dest,
-                            CORBA::Environment &ACE_TRY_ENV)
-{
-  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 CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_TypeCode::append detected error"));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                    CORBA::COMPLETED_MAYBE),
-                    CORBA::TypeCode::TRAVERSE_STOP);
-}
-
-// Decode sequence.
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr  tc,
-                              TAO_InputCDR *src,
-                              TAO_OutputCDR *dest,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Boolean continue_append = 1;
-  // Return status.
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;
-  // Typecode of the element.
-  CORBA::TypeCode_ptr tc2;
-  // 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).
-
-  continue_append = (src->read_ulong (bounds) ?
-                     dest->write_ulong (bounds) : 0);
-
-  if (continue_append)
-    {
-      // Get element typecode.
-      tc2 = tc->content_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      // For those aggregate types whose size is
-      // constant, we compute it only once.
-      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          retval = dest->append (tc2, src, ACE_TRY_ENV);
-        }
-      // CORBA::release (tc2);
-      if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-    }
-  // error exit
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "marshaling TAO_Marshal_Sequence::append detected error\n"));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    CORBA::TypeCode::TRAVERSE_STOP);
-}
-
-// Decode array.
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Array::append (CORBA::TypeCode_ptr  tc,
-                           TAO_InputCDR *src,
-                           TAO_OutputCDR *dest,
-                           CORBA::Environment &ACE_TRY_ENV)
-{
-  // unused:  CORBA::Boolean continue_append = 1;
-
-  // Return status.
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  // Typecode of the element.
-  CORBA::TypeCode_ptr tc2;
-
-  CORBA::ULong  bounds;
-
-  // retrieve the bounds of the array
-  bounds = tc->length (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  // get element typecode
-  tc2 = tc->content_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      retval = dest->append (tc2, src, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-    }
-
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    return retval;
-
-  // error exit
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_Sequence::append detected error"));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    CORBA::TypeCode::TRAVERSE_STOP);
-}
-
-// Decode alias.
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Alias::append (CORBA::TypeCode_ptr  tc,
-                           TAO_InputCDR *src,
-                           TAO_OutputCDR *dest,
-                           CORBA::Environment &ACE_TRY_ENV)
-{
-  // Typecode of the aliased type.
-  CORBA::TypeCode_ptr tc2;
-  CORBA::Boolean continue_append = 1;
-
-  // Status of decode operation.
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  tc2 = tc->content_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  retval = dest->append (tc2, src, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  //  tc2->_decr_refcnt ();
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_append == 1)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_Alias::append detected error\n"));
-  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                    CORBA::COMPLETED_MAYBE),
-                    CORBA::TypeCode::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.
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Except::append (CORBA::TypeCode_ptr  tc,
-                            TAO_InputCDR *src,
-                            TAO_OutputCDR *dest,
-                            CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;
-  CORBA::Boolean continue_append = 1;
-  CORBA::TypeCode_ptr param;
-
-  // first append the RepositoryID
-  continue_append = dest->append_string (*src);
-
-  // Number of fields in the struct.
-  int member_count = tc->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  for (int i = 0; i < member_count
-         && retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-         && continue_append == 1; i++)
-    {
-      param = tc->member_type (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      retval = dest->append (param, src, ACE_TRY_ENV);
-    }
-
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_append == 1)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_Except::append detected error\n"));
-  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                    CORBA::COMPLETED_MAYBE),
-                    CORBA::TypeCode::TRAVERSE_STOP);
-}
-
-// decode wstring
-CORBA::TypeCode::traverse_status
-TAO_Marshal_WString::append (CORBA::TypeCode_ptr,
-                             TAO_InputCDR *src,
-                             TAO_OutputCDR *dest,
-                             CORBA::Environment &ACE_TRY_ENV)
-{
-  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 CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_WString::append detected error\n"));
-  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                    CORBA::COMPLETED_MAYBE),
-                    CORBA::TypeCode::TRAVERSE_STOP);
-}
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h
deleted file mode 100644
index 75568c5c64a..00000000000
--- a/TAO/tao/corba.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    corba.h
-//
-// = DESCRIPTION
-//     Master Header file for the TAO CORBA ORB.  Include only this
-//     file, to see all public ORB interfaces declared by TAO.
-//
-//     This follows the OMG C++ mapping for compilers that don't
-//     support C++ exceptions or namespaces.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc., Chris Cleeland,
-//     and Douglas C. Schmidt.
-//
-// ============================================================================
-
-#ifndef TAO_MASTER_CORBA_H
-#define TAO_MASTER_CORBA_H
-
-// ACE specific includes
-#include "ace/OS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/corbafwd.h"
-
-#include "tao/Environment.h"
-#include "tao/ORB.h"
-#include "tao/Exception.h"
-#include "tao/Any.h"
-#include "tao/NVList.h"
-#include "tao/Principal.h"
-#include "tao/Request.h"
-#include "tao/Server_Request.h"
-#include "tao/Object.h"
-#include "tao/Context.h"
-#include "tao/Typecode.h"
-
-#include "tao/varout.h"
-#include "tao/Marshal.h"
-#include "tao/singletons.h"
-#include "tao/CDR.h"
-
-#include "tao/PolicyC.h"
-#include "tao/CurrentC.h"
-#include "tao/POA.h"
-
-// TAO specific files, avoid them as much as possible.
-#include "tao/Stub.h"
-#include "tao/params.h"
-#include "tao/ORB_Core.h"
-#include "tao/Operation_Table.h"
-#include "tao/debug.h"
-
-#include "tao/Client_Strategy_Factory.h"
-#include "tao/Server_Strategy_Factory.h"
-#include "tao/Active_Object_Map.h"
-#include "tao/GIOP.h"
-#include "tao/Invocation.h"
-
-// Dynamic Any includes
-#include "tao/InconsistentTypeCodeC.h"
-#include "tao/DynAny_i.h"
-
-#include "tao/Managed_Types.h"
-#include "tao/Sequence.h"
-#include "tao/Object_KeyC.h"
-#include "tao/Union.h"
-#include "tao/ValueBase.h"
-#include "tao/ValueFactory.h"
-#include "tao/Services.h"
-#include "tao/ObjectIDList.h"
-#include "tao/DomainC.h"
-#include "tao/WrongTransactionC.h"
-
-#if !defined (ACE_NESTED_CLASS)
-#if defined (ACE_WIN32)
-#define ACE_NESTED_CLASS(SCOPE,CLASS) CLASS
-#else /* !ACE_WIN32 */
-#define ACE_NESTED_CLASS(SCOPE,CLASS) SCOPE::CLASS
-#endif /* ACE_WIN32 */
-#endif /* ACE_NESTED_CLASS */
-
-#endif /* TAO_MASTER_CORBA_H */
diff --git a/TAO/tao/corbafwd.cpp b/TAO/tao/corbafwd.cpp
deleted file mode 100644
index 4071ed47450..00000000000
--- a/TAO/tao/corbafwd.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// $Id$
-
-#include "tao/corbafwd.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/corbafwd.i"
-#endif /* ! __ACE_INLINE__ */
-
-CORBA::String
-CORBA::string_dup (const CORBA::Char *str)
-{
-  if (!str)
-    return 0;
-
-  size_t len = ACE_OS::strlen (str);
-
-  // This allocates an extra byte for the '\0';
-  CORBA::String copy = CORBA::string_alloc (len);
-
-  ACE_OS::memcpy (copy, str, len + 1);
-  return copy;
-}
-
-// ----------------------------------------------------------------------
-// Wide strings
-// ----------------------------------------------------------------------
-
-CORBA::WChar*
-CORBA::wstring_dup (const WChar *const str)
-{
-  if (!str)
-    return 0;
-
-  CORBA::WChar* retval = CORBA::wstring_alloc (ACE_OS::wslen (str));
-  return ACE_OS::wscpy (retval, str);
-}
-
-// ****************************************************************
-
-ACE_RCSID(tao, corbafwd, "$Id$")
-
-TAO_NAMESPACE_TYPE (const CORBA::ServiceType)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::ServiceType, Security, 1)
-TAO_NAMESPACE_END
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
deleted file mode 100644
index 10f55545c36..00000000000
--- a/TAO/tao/corbafwd.h
+++ /dev/null
@@ -1,1042 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//   corbafwd.h
-//
-// = DESCRIPTION
-//   Forward declare the basic types used in the ORB
-//   implementation. Regular users of the ORB should only include
-//   tao/corba.h, but the implementation of the ORB itself should
-//   include this file.  That reduces interdependency and speed up
-//   compilations and recompilations.
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//   Chris Cleeland
-//   Douglas C. Schmidt
-//   based on work  Copyright 1994-1995 by Sun Microsystems Inc.
-//
-// ============================================================================
-
-#ifndef TAO_CORBAFWD_H
-#define TAO_CORBAFWD_H
-
-// @@ TODO take the portion that we need of ace/CDR_Stream.h into
-// ace/CDR_Types.h
-#include "ace/CDR_Stream.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/try_macros.h"
-
-#if !defined (TAO_HAS_DLL)
-// On Windows NT, the default is to build TAO as a DLL library.
-#  define TAO_HAS_DLL 1
-#endif /* TAO_HAS_DLL */
-
-// Here are definition for TAO library.
-#if defined (TAO_HAS_DLL) && (TAO_HAS_DLL == 1)
-#  if defined (TAO_BUILD_DLL)
-#    define TAO_Export ACE_Proper_Export_Flag
-#    define TAO_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#  else
-#    define TAO_Export ACE_Proper_Import_Flag
-#    define TAO_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#  endif /* TAO_BUILD_DLL */
-#else /* TAO_HAS_DLL */
-#  define TAO_Export
-#  define TAO_SINGLETON_DECLARATION(T)
-#endif /* TAO_HAS_DLL */
-
-#if defined (_MSC_VER)
-# ifdef   _DEBUG                  // convert from VC++ convention ...
-#  define  DEBUG           // ... to normal convention
-# endif
-#endif /* _MSC_VER */
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-// Forward declarations of some data types are needed.
-
-class CORBA_Any;
-class CORBA_Any_var;
-class CORBA_Any_out;
-typedef class CORBA_Any *CORBA_Any_ptr;
-
-class CORBA_DynAny;
-typedef class CORBA_DynAny *CORBA_DynAny_ptr;
-
-class CORBA_DynStruct;
-typedef CORBA_DynStruct *CORBA_DynStruct_ptr;
-
-class CORBA_DynSequence;
-typedef CORBA_DynSequence *CORBA_DynSequence_ptr;
-
-class CORBA_DynArray;
-typedef CORBA_DynArray *CORBA_DynArray_ptr;
-
-class CORBA_DynUnion;
-typedef CORBA_DynUnion *CORBA_DynUnion_ptr;
-
-class CORBA_DynEnum;
-typedef CORBA_DynEnum *CORBA_DynEnum_ptr;
-
-class CORBA_TypeCode;
-class CORBA_TypeCode_var;
-class CORBA_TypeCode_out;
-typedef class CORBA_TypeCode *CORBA_TypeCode_ptr;
-
-class CORBA_Exception;
-class CORBA_UserException;
-class CORBA_SystemException;
-class CORBA_UnknownUserException;
-class CORBA_ExceptionList;
-class CORBA_ExceptionList_var;
-typedef class CORBA_Exception *CORBA_Exception_ptr;
-
-// all the system exception classes, the list is used as follows:
-// - Define TAO_SYSTEM_EXCEPTION
-// - Use the list to expand that macro over all the system exceptions.
-// - Undefine TAO_SYSTEM_EXCEPTION
-#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);
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-  class CORBA_ ## name
-TAO_SYSTEM_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-class CORBA_WrongTransaction;
-typedef CORBA_WrongTransaction *CORBA_WrongTransaction_ptr;
-
-struct CORBA_NameValuePair;
-class CORBA_NameValuePair_var;
-class CORBA_NameValuePair_out;
-typedef CORBA_NameValuePair *CORBA_NameValuePair_ptr;
-
-class CORBA_Request;
-class CORBA_Request_var;
-class CORBA_Request_out;
-typedef class CORBA_Request *CORBA_Request_ptr;
-
-class CORBA_ORB_RequestSeq;
-class CORBA_ORB_RequestSeq_var;
-class CORBA_ORB_RequestSeq_out;
-typedef class CORBA_ORB_RequestSeq *CORBA_ORB_RequestSeq_ptr;
-
-class CORBA_NamedValue;
-class CORBA_NamedValue_var;
-class CORBA_NamedValue_out;
-typedef class CORBA_NamedValue *CORBA_NamedValue_ptr;
-
-
-class CORBA_NVList;
-class CORBA_NVList_var;
-class CORBA_NVList_out;
-typedef class CORBA_NVList *CORBA_NVList_ptr;
-
-class CORBA_Context;
-class CORBA_Context_var;
-class CORBA_Context_out;
-typedef class CORBA_Context *CORBA_Context_ptr;
-
-class CORBA_ContextList;
-class CORBA_ContextList_var;
-class CORBA_ContextList_out;
-typedef class CORBA_ContextList *CORBA_ContextList_ptr;
-
-class CORBA_ConstructionPolicy;
-class CORBA_ConstructionPolicy_var;
-class CORBA_ConstructionPolicy_out;
-typedef class CORBA_ConstructionPolicy *CORBA_ConstructionPolicy_ptr;
-
-class CORBA_AnySeq;
-class CORBA_AnySeq_var;
-class CORBA_AnySeq_out;
-typedef class CORBA_AnySeq *CORBA_AnySeq_ptr;
-
-// Forward declarations.
-class CORBA_NameValuePairSeq;
-class CORBA_NameValuePairSeq_var;
-class CORBA_NameValuePairSeq_out;
-typedef CORBA_NameValuePairSeq *CORBA_NameValuePairSeq_ptr;
-
-#endif /* ! TAO_HAS_MINIMUM_CORBA */
-
-class CORBA_ORB;
-class CORBA_ORB_var;
-class CORBA_ORB_out;
-typedef class CORBA_ORB *CORBA_ORB_ptr;
-
-class CORBA_Object;
-class CORBA_Object_var;
-class CORBA_Object_out;
-typedef class CORBA_Object *CORBA_Object_ptr;
-
-class CORBA_Current;
-class CORBA_Current_var;
-class CORBA_Current_out;
-typedef class CORBA_Current *CORBA_Current_ptr;
-
-class CORBA_ServerRequest;
-typedef class CORBA_ServerRequest *CORBA_ServerRequest_ptr;
-
-class CORBA_Environment;
-class CORBA_Environment_var;
-class CORBA_Environment_out;
-typedef class CORBA_Environment *CORBA_Environment_ptr;
-
-// = Service Forward declaration
-struct CORBA_ServiceDetail;
-class CORBA_ServiceDetail_var;
-class CORBA_ServiceDetail_out;
-typedef CORBA_ServiceDetail * CORBA_ServiceDetail_ptr;
-
-struct CORBA_ServiceInformation;
-class CORBA_ServiceInformation_var;
-class CORBA_ServiceInformation_out;
-typedef CORBA_ServiceInformation * CORBA_ServiceInformation_ptr;
-
-class CORBA_Principal;
-class CORBA_Principal_var;
-class CORBA_Principal_out;
-typedef class CORBA_Principal *CORBA_Principal_ptr;
-
-typedef class CORBA_ImplementationDef *CORBA_ImplementationDef_ptr;
-
-class CORBA_InterfaceDef;
-class CORBA_InterfaceDef_var;
-class CORBA_InterfaceDef_out;
-typedef class CORBA_InterfaceDef *CORBA_InterfaceDef_ptr;
-
-#ifdef TAO_HAS_VALUETYPE
-class CORBA_ValueBase;
-class CORBA_ValueFactoryBase;
-typedef CORBA_ValueFactoryBase *CORBA_ValueFactory_ptr;
-class CORBA_DefaultValueRefCountBase;
-#endif /* TAO_HAS_VALUETYPE */
-
-class CORBA_String_var;
-class CORBA_String_out;
-class CORBA_WString_var;
-class CORBA_WString_out;
-
-class CORBA_ExceptionList;
-
-class CORBA_PolicyError;
-typedef CORBA_PolicyError *CORBA_PolicyError_ptr;
-
-class CORBA_InvalidPolicies;
-typedef CORBA_InvalidPolicies* CORBA_InvalidPolicies_ptr;
-
-class CORBA_PolicyTypeSeq;
-class CORBA_PolicyTypeSeq_var;
-class CORBA_PolicyTypeSeq_out;
-
-class CORBA_PolicyManager;
-class CORBA_PolicyManager_var;
-class CORBA_PolicyManager_out;
-typedef CORBA_PolicyManager *CORBA_PolicyManager_ptr;
-
-class CORBA_PolicyCurrent;
-class CORBA_PolicyCurrent_var;
-class CORBA_PolicyCurrent_out;
-typedef CORBA_PolicyCurrent *CORBA_PolicyCurrent_ptr;
-
-class CORBA_Policy;
-class CORBA_Policy_var;
-class CORBA_Policy_out;
-typedef CORBA_Policy *CORBA_Policy_ptr;
-
-class CORBA_PolicyList;
-class CORBA_PolicyList_var;
-class CORBA_PolicyList_out;
-typedef CORBA_PolicyList *CORBA_PolicyList_ptr;
-
-class CORBA_DomainManager;
-class CORBA_DomainManager_var;
-class CORBA_DomainManager_out;
-typedef CORBA_DomainManager *CORBA_DomainManager_ptr;
-
-class CORBA_DomainManagerList;
-class CORBA_DomainManagerList_var;
-class CORBA_DomainManagerList_out;
-typedef CORBA_DomainManagerList *CORBA_DomainManagerList_ptr;
-
-class CORBA_PollableSet;
-class CORBA_PollableSet_var;
-class CORBA_PollableSet_out;
-typedef CORBA_PollableSet *CORBA_PollableSet_ptr;
-
-class CORBA_Pollable;
-class CORBA_Pollable_var;
-class CORBA_Pollable_out;
-typedef CORBA_Pollable *CORBA_Pollable_ptr;
-
-class CORBA_DIIPollable;
-class CORBA_DIIPollable_var;
-class CORBA_DIIPollable_out;
-typedef CORBA_DIIPollable *CORBA_DIIPollable_ptr;
-
-class TAO_InputCDR;
-class TAO_OutputCDR;
-// @@ TODO This should be TAO_TAO_Stub
-class TAO_Stub;
-
-class CORBA_ORB_ObjectIdList;
-class CORBA_ORB_ObjectIdList_var;
-class CORBA_ORB_ObjectIdList_out;
-typedef CORBA_ORB_ObjectIdList *CORBA_ORB_ObjectIdList_ptr;
-
-// enum values defined in tao/NVList.h, bitwise ORed.
-typedef u_int CORBA_Flags;
-
-typedef void (*TAO_Skeleton)(
-    CORBA_ServerRequest &,
-    void *,
-    void *,
-    CORBA_Environment &ACE_TRY_ENV
-  );
-
-// forward declare sequences.
-template <class T> class TAO_Unbounded_Sequence;
-template <class T,class T_var> class TAO_Unbounded_Object_Sequence;
-
-// Provide a simple function to access the TSS default environment.
-// We tried with CORBA_Environment::default_environment (),
-// CORBA::default_environment() and others.
-extern TAO_Export CORBA_Environment& TAO_default_environment (void);
-
-enum TAO_SERVANT_LOCATION
-{
-  TAO_SERVANT_FOUND,
-  TAO_DEFAULT_SERVANT,
-  TAO_SERVANT_MANAGER,
-  TAO_SERVANT_NOT_FOUND
-};
-
-TAO_NAMESPACE CORBA
-{
-  // = TITLE
-  //    Provides the CORBA namespace.
-  //
-  // = DESCRIPTION
-  //    This class allows the use of CORBA::Foo, as well as CORBA_Foo
-  //    for all standard types Foo.
-
-  typedef ACE_CDR::Boolean Boolean;
-  typedef Boolean &Boolean_out;
-  // Out type for boolean.
-
-  // This and the other CORBA IDL types below are
-  // typedef'd to the corresponding CDR types
-  // already defined in ACE.
-  typedef ACE_CDR::Octet Octet;
-  typedef Octet  &Octet_out;
-
-  typedef ACE_CDR::Short Short;
-  typedef Short &Short_out;
-  typedef ACE_CDR::UShort UShort;
-  typedef UShort &UShort_out;
-
-  typedef ACE_CDR::Long Long;
-  typedef Long &Long_out;
-  typedef ACE_CDR::ULong ULong;
-  typedef ULong &ULong_out;
-
-  typedef ACE_CDR::LongLong LongLong;
-  typedef LongLong &LongLong_out;
-  typedef ACE_CDR::ULongLong ULongLong;
-  typedef ULongLong &ULongLong_out;
-
-  typedef ACE_CDR::Float Float;
-  typedef Float &Float_out;
-
-  typedef ACE_CDR::Double Double;
-  typedef Double &Double_out;
-
-  typedef ACE_CDR::LongDouble LongDouble;
-  typedef LongDouble &LongDouble_out;
-
-
-  typedef ACE_CDR::Char Char;
-  typedef Char &Char_out;
-
-  typedef Char *String;
-
-  // = String memory management.
-  TAO_NAMESPACE_INLINE_FUNCTION Char* string_alloc (ULong len);
-  TAO_NAMESPACE_STORAGE_CLASS Char* string_dup (const Char *);
-  TAO_NAMESPACE_INLINE_FUNCTION void string_free (Char *);
-
-  // This is a TAO extension and must go away....
-  TAO_NAMESPACE_STORAGE_CLASS Char* string_copy (const Char *);
-
-  typedef CORBA_String_var String_var;
-  typedef CORBA_String_out String_out;
-
-  // WChar was standarized in CORBA 2.2, but is still a bit unstable.
-
-  typedef ACE_CDR::WChar WChar;
-  typedef WChar &WChar_out;
-  // Out type for WChar.
-
-  // = String memory management routines.
-  TAO_NAMESPACE_INLINE_FUNCTION WChar* wstring_alloc (ULong len);
-  TAO_NAMESPACE_STORAGE_CLASS WChar* wstring_dup (const WChar *const);
-  TAO_NAMESPACE_INLINE_FUNCTION void wstring_free (WChar *const);
-
-  typedef CORBA_WString_var WString_var;
-  typedef CORBA_WString_out WString_out;
-
-  typedef TAO_Unbounded_Sequence<Octet> OctetSeq;
-
-  // = various CORBA defined classes.
-  typedef CORBA_Any Any;
-  typedef CORBA_Any_var Any_var;
-  typedef CORBA_Any_out Any_out;
-  typedef Any *Any_ptr;
-
-  typedef CORBA_Environment Environment;
-  typedef CORBA_Environment_var Environment_var;
-  typedef CORBA_Environment_out Environment_out;
-  typedef Environment *Environment_ptr;
-
-  typedef CORBA_Exception Exception;
-  typedef Exception *Exception_ptr;
-  typedef CORBA_SystemException SystemException;
-  typedef CORBA_UserException  UserException;
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  typedef CORBA_Request Request;
-  typedef Request *Request_ptr;
-  typedef CORBA_Request_var Request_var;
-  typedef CORBA_Request_out Request_out;
-
-  typedef CORBA_NamedValue NamedValue;
-  typedef NamedValue *NamedValue_ptr;
-  typedef CORBA_NamedValue_var NamedValue_var;
-  typedef CORBA_NamedValue_out NamedValue_out;
-
-  typedef CORBA_NVList NVList;
-  typedef NVList *NVList_ptr;
-  typedef CORBA_NVList_var NVList_var;
-  typedef CORBA_NVList_out NVList_out;
-
-  typedef CORBA_Context Context;
-  typedef CORBA_Context *Context_ptr;
-  typedef CORBA_Context_var Context_var;
-  typedef CORBA_Context_out Context_out;
-
-  typedef CORBA_ContextList ContextList;
-  typedef CORBA_ContextList *ContextList_ptr;
-  typedef CORBA_ContextList_var ContextList_var;
-  typedef CORBA_ContextList_out ContextList_out;
-
-  typedef char *CORBA_FieldName;
-  typedef CORBA_String_var CORBA_FieldName_var;
-  typedef CORBA_String_out CORBA_FieldName_out;
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  typedef CORBA_Object Object;
-  typedef CORBA_Object *Object_ptr;
-  typedef CORBA_Object_var Object_var;
-  typedef CORBA_Object_out Object_out;
-
-  typedef CORBA_Principal Principal;
-  typedef CORBA_Principal *Principal_ptr;
-  typedef CORBA_Principal_var Principal_var;
-  typedef CORBA_Principal_out Principal_out;
-
-  typedef CORBA_ORB ORB;
-  typedef CORBA_ORB *ORB_ptr;
-  typedef CORBA_ORB_var ORB_var;
-  typedef CORBA_ORB_out ORB_out;
-
-  typedef CORBA_ServerRequest ServerRequest;
-  typedef ServerRequest *ServerRequest_ptr;
-
-
-  typedef CORBA_TypeCode TypeCode;
-  typedef CORBA_TypeCode *TypeCode_ptr;
-  typedef CORBA_TypeCode_var TypeCode_var;
-  typedef CORBA_TypeCode_out TypeCode_out;
-
-  typedef CORBA_ExceptionList ExceptionList;
-  typedef CORBA_ExceptionList_var ExceptionList_var;
-  typedef CORBA_ExceptionList *ExceptionList_ptr;
-
-  typedef CORBA_ImplementationDef *ImplementationDef_ptr;
-
-  typedef CORBA_InterfaceDef InterfaceDef;
-  typedef CORBA_InterfaceDef *InterfaceDef_ptr;
-  typedef CORBA_InterfaceDef_var InterfaceDef_var;
-  typedef CORBA_InterfaceDef_out InterfaceDef_out;
-
-  typedef CORBA_Current Current;
-  typedef CORBA_Current *Current_ptr;
-  typedef CORBA_Current_var Current_var;
-  typedef CORBA_Current_out Current_out;
-
-#ifdef TAO_HAS_VALUETYPE
-  typedef CORBA_ValueBase ValueBase;
-  typedef CORBA_ValueFactoryBase ValueFactoryBase;
-  typedef CORBA_ValueFactoryBase *ValueFactory;
-  // as CORBA 2.3a C++ map. 20.17.10 says
-  typedef CORBA_ValueFactoryBase *ValueFactory_ptr;
-  // own invention, more readable
-  typedef CORBA_DefaultValueRefCountBase  DefaultValueRefCountBase;
-  TAO_NAMESPACE_INLINE_FUNCTION void add_ref (ValueBase *);
-  TAO_NAMESPACE_INLINE_FUNCTION void remove_ref (ValueBase *);
-#endif /* TAO_HAS_VALUETYPE */
-
-  // enum values defined in nvlist.hh, bitwise ORed.
-  typedef u_int Flags;
-
-  enum CompletionStatus
-  {
-    // = Completion Status for System exceptions
-
-    COMPLETED_YES,     // successful or exceptional completion
-    COMPLETED_NO,      // didn't change any state; retry is OK
-    COMPLETED_MAYBE    // can't say what happened; retry unsafe
-  };
-
-  enum exception_type
-  {
-    // = Exception type.
-
-    NO_EXCEPTION,
-    USER_EXCEPTION,
-    SYSTEM_EXCEPTION
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_exception_type;
-
-  // all the system exception classes
-#define TAO_SYSTEM_EXCEPTION(name) \
-  typedef CORBA_ ## name      name
-  TAO_SYSTEM_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
-
-    typedef CORBA_UnknownUserException UnknownUserException;
-
-  // = all the CORBA::is_nil methods.
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Object_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Environment_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (TypeCode_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (ORB_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Principal_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (ServerRequest_ptr req);
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Request_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (NamedValue_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (NVList_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Context_ptr);
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  // = all the CORBA release methods.
-  TAO_NAMESPACE_INLINE_FUNCTION void release (Object_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION void release (Environment_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION void release (Principal_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION void release (TypeCode_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION void release (ORB_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION void release (ServerRequest_ptr req);
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  TAO_NAMESPACE_INLINE_FUNCTION void release (Request_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION void release (NamedValue_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION void release (NVList_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION void release (Context_ptr);
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  enum TCKind
-  {
-    // = Kinds of typecodes.
-
-    // Do not change these enum values, or duplicate them if you need
-    // to add values.  They are used to index tables, and if you
-    // change the values you'll need to find and update all of those
-    // tables.  The values are also part of the Common Data
-    // Representation, and hence are part of IIOP and other ORB
-    // protocols.
-
-    tk_null               = 0,
-    tk_void               = 1,
-    tk_short              = 2,
-    tk_long               = 3,
-    tk_ushort             = 4,
-    tk_ulong              = 5,
-    tk_float              = 6,
-    tk_double             = 7,
-    tk_boolean            = 8,
-    tk_char               = 9,
-    tk_octet              = 10,
-    tk_any                = 11,
-    tk_TypeCode           = 12,
-    tk_Principal          = 13,
-    tk_objref             = 14,
-    tk_struct             = 15,
-    tk_union              = 16,
-    tk_enum               = 17,
-    tk_string             = 18,
-    tk_sequence           = 19,
-    tk_array              = 20,
-    tk_alias              = 21,
-    tk_except             = 22,
-
-    tk_longlong           = 23,
-    tk_ulonglong          = 24,
-    tk_longdouble         = 25,
-    tk_wchar              = 26,
-    tk_wstring            = 27,
-
-    // This symbol is not defined by CORBA 2.0.  It's used to speed up
-    // dispatch based on TCKind values, and lets many important ones
-    // just be table lookups.  It must always be the last enum value!!
-
-    TC_KIND_COUNT
-  };
-
-  // All the typecode constants
-  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_null;
-  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_void;
-  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_short;
-  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_long;
-  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_ushort;
-  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_ulong;
-  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_float;
-  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_double;
-  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_boolean;
-  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_char;
-  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_octet;
-  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_any;
-  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_TypeCode;
-  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_Principal;
-  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_Object;
-  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_string;
-  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_longlong;
-  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_ulonglong;
-  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_longdouble;
-  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_wchar;
-  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_wstring;
-
-  // = Typecode constants for system exceptions.
-#define TAO_SYSTEM_EXCEPTION(name) \
-  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_ ## name
-  TAO_SYSTEM_EXCEPTION_LIST
-#undef  TAO_SYSTEM_EXCEPTION
-
-  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_UnknownUserException;
-
-  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_Current;
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_NamedValue;
-#endif /* End of Minimum 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,
-
-    // = 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
-  };
-
-  typedef char *ORBid;
-  typedef CORBA::String_var ORBid_var;
-  typedef CORBA::String_out ORBid_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ORBid;
-
-  typedef char *Identifier;
-  typedef CORBA::String_var Identifier_var;
-  typedef CORBA::String_out Identifier_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Identifier;
-
-  typedef char *RepositoryId;
-  typedef CORBA::String_var RepositoryId_var;
-  typedef CORBA::String_out RepositoryId_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RepositoryId;
-
-  typedef CORBA::Short PolicyErrorCode;
-  typedef CORBA::Short_out PolicyErrorCode_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PolicyErrorCode;
-
-  TAO_NAMESPACE_STORAGE_CLASS const PolicyErrorCode BAD_POLICY;
-  TAO_NAMESPACE_STORAGE_CLASS const PolicyErrorCode UNSUPPORTED_POLICY;
-  TAO_NAMESPACE_STORAGE_CLASS const PolicyErrorCode BAD_POLICY_TYPE;
-  TAO_NAMESPACE_STORAGE_CLASS const PolicyErrorCode BAD_POLICY_VALUE;
-  TAO_NAMESPACE_STORAGE_CLASS const PolicyErrorCode UNSUPPORTED_POLICY_VALUE;
-
-  typedef CORBA_PolicyError PolicyError;
-  typedef CORBA_PolicyError *PolicyError_ptr;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PolicyError;
-
-  typedef CORBA_InvalidPolicies InvalidPolicies;
-  typedef CORBA_InvalidPolicies* InvalidPolicies_ptr;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_InvalidPolicies;
-
-  typedef CORBA::ULong PolicyType;
-  typedef CORBA::ULong_out PolicyType_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PolicyType;
-
-  typedef CORBA_Policy Policy;
-  typedef CORBA_Policy *Policy_ptr;
-  typedef CORBA_Policy_var Policy_var;
-  typedef CORBA_Policy_out Policy_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Policy;
-
-  typedef CORBA_PolicyList PolicyList;
-  typedef CORBA_PolicyList_var PolicyList_var;
-  typedef CORBA_PolicyList_out PolicyList_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PolicyList;
-
-  // = Service definitions
-  typedef CORBA::UShort ServiceType;
-  typedef ServiceType CORBA_ServiceType;
-  typedef CORBA::UShort_out ServiceType_out;
-  typedef ServiceType_out CORBA_ServiceType_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServiceType;
-  TAO_NAMESPACE_STORAGE_CLASS const ServiceType Security;
-
-  typedef CORBA::ULong ServiceOption;
-  typedef ServiceOption CORBA_ServiceOption;
-  typedef CORBA::ULong_out ServiceOption_out;
-  typedef ServiceOption_out CORBA_ServiceOption_out;
-  TAO_NAMESPACE_STORAGE_CLASS  CORBA::TypeCode_ptr _tc_ServiceOption;
-
-  typedef CORBA::ULong ServiceDetailType;
-  typedef ServiceDetailType CORBA_ServiceDetailType;
-  typedef CORBA::ULong_out ServiceDetailType_out;
-  typedef ServiceDetailType_out CORBA_ServiceDetailType_out;
-  TAO_NAMESPACE_STORAGE_CLASS  CORBA::TypeCode_ptr _tc_ServiceDetailType;
-
-  typedef CORBA_ServiceDetail ServiceDetail;
-  typedef CORBA_ServiceDetail_var ServiceDetail_var;
-  typedef CORBA_ServiceDetail_out ServiceDetail_out;
-  typedef CORBA_ServiceDetail *ServiceDetail_ptr;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServiceDetail;
-
-  typedef CORBA_ServiceInformation ServiceInformation;
-  typedef CORBA_ServiceInformation_var ServiceInformation_var;
-  typedef CORBA_ServiceInformation_out ServiceInformation_out;
-  typedef CORBA_ServiceInformation *ServiceInformation_ptr;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServiceInformation;
-
-  typedef CORBA_PolicyTypeSeq PolicyTypeSeq;
-  typedef CORBA_PolicyTypeSeq_var PolicyTypeSeq_var;
-  typedef CORBA_PolicyTypeSeq_out PolicyTypeSeq_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PolicyTypeSeq;
-
-  enum SetOverrideType
-  {
-    SET_OVERRIDE,
-    ADD_OVERRIDE
-  };
-  typedef SetOverrideType &SetOverrideType_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_SetOverrideType;
-
-  typedef CORBA_PolicyManager PolicyManager;
-  typedef CORBA_PolicyManager_var PolicyManager_var;
-  typedef CORBA_PolicyManager_out PolicyManager_out;
-  typedef CORBA_PolicyManager *PolicyManager_ptr;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PolicyManager;
-
-  typedef CORBA_PolicyCurrent PolicyCurrent;
-  typedef CORBA_PolicyCurrent_var PolicyCurrent_var;
-  typedef CORBA_PolicyCurrent_out PolicyCurrent_out;
-  typedef CORBA_PolicyCurrent *PolicyCurrent_ptr;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PolicyCurrent;
-
-  typedef CORBA_DomainManager DomainManager;
-  typedef CORBA_DomainManager *DomainManager_ptr;
-  typedef CORBA_DomainManager_var DomainManager_var;
-  typedef CORBA_DomainManager_out DomainManager_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_DomainManager;
-
-  typedef CORBA_DomainManagerList DomainManagerList;
-  typedef CORBA_DomainManagerList *DomainManagerList_ptr;
-  typedef CORBA_DomainManagerList_var DomainManagerList_var;
-  typedef CORBA_DomainManagerList_out DomainManagerList_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_DomainManagerList;
-
-  TAO_NAMESPACE_STORAGE_CLASS const PolicyType SecConstruction;
-
-#if ! defined (TAO_HAS_MINIMUM_CORBA)
-  typedef CORBA_ConstructionPolicy ConstructionPolicy;
-  typedef CORBA_ConstructionPolicy *ConstructionPolicy_ptr;
-  typedef CORBA_ConstructionPolicy_var ConstructionPolicy_var;
-  typedef CORBA_ConstructionPolicy_out ConstructionPolicy_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ConstructionPolicy;
-
-  typedef CORBA_WrongTransaction WrongTransaction;
-  typedef WrongTransaction *WrongTransaction_ptr;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_WrongTransaction;
-
-  typedef CORBA_AnySeq AnySeq;
-  typedef CORBA_AnySeq *AnySeq_ptr;
-  typedef CORBA_AnySeq_var AnySeq_var;
-  typedef CORBA_AnySeq_out AnySeq_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AnySeq;
-
-  typedef CORBA_FieldName FieldName;
-  typedef CORBA_FieldName_var FieldName_var;
-  typedef CORBA_FieldName_out FieldName_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_FieldName;
-
-  typedef CORBA_NameValuePair NameValuePair;
-  typedef CORBA_NameValuePair *NameValuePair_ptr;
-  typedef CORBA_NameValuePair_var NameValuePair_var;
-  typedef CORBA_NameValuePair_out NameValuePair_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_NameValuePair;
-
-  typedef CORBA_NameValuePairSeq NameValuePairSeq;
-  typedef CORBA_NameValuePairSeq *NameValuePairSeq_ptr;
-  typedef CORBA_NameValuePairSeq_var NameValuePairSeq_var;
-  typedef CORBA_NameValuePairSeq_out NameValuePairSeq_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_NameValuePairSeq;
-
-#endif /* ! defined (TAO_HAS_MINIMUM_CORBA) */
-
-  // ****************************************************************
-
-  typedef CORBA_PollableSet PollableSet;
-  typedef CORBA_PollableSet_var PollableSet_var;
-  typedef CORBA_PollableSet_out PollableSet_out;
-  typedef CORBA_PollableSet_ptr PollableSet_ptr;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PollableSet;
-
-  typedef CORBA_Pollable Pollable;
-  typedef CORBA_Pollable_var Pollable_var;
-  typedef CORBA_Pollable_out Pollable_out;
-  typedef CORBA_Pollable_ptr Pollable_ptr;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Pollable;
-
-  typedef CORBA_DIIPollable DIIPollable;
-  typedef CORBA_DIIPollable_var DIIPollable_var;
-  typedef CORBA_DIIPollable_out DIIPollable_out;
-  typedef CORBA_DIIPollable_ptr DIIPollable_ptr;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_DIIPollable;
-
-  // ****************************************************************
-
-  // There could be a single version of these methods, but g++ 2.7.2
-  // gets horribly confused if we used CORBA::default_environment() at
-  // this point.
-  TAO_NAMESPACE_STORAGE_CLASS ORB_ptr ORB_init (int &argc,
-                                                char *argv[],
-                                                const char *orb_name = 0);
-  TAO_NAMESPACE_STORAGE_CLASS ORB_ptr ORB_init (int &argc,
-                                                char *argv[],
-                                                const char *orb_name,
-                                                CORBA_Environment &ACE_TRY_ENV);
-  // ORB initialisation
-
-  // = TAO extensions...
-
-  TAO_NAMESPACE_INLINE_FUNCTION CORBA_Environment& default_environment (void);
-
-  // Obtain the thread-specific default environment.
-  // This is obsolete and only left here for backwards compatibility.
-
-};  // end of class (namespace) CORBA
-
-// ****************************************************************
-
-// Several OMG assigned numbers, for a complete list check:
-//
-// ftp://ftp.omg.org/pub/docs/ptc/99-05-02.txt
-//
-// For details on how to ask more numbers check:
-//
-// http://www.omg.org/cgi-bin/doc?ptc/99-02-01
-//
-
-// These numbers were assigned by the OMG.  Do *NOT* change.
-// The ASCII representation is "TAO\x00", we can request more ORB
-// types later.
-#define TAO_ORB_TYPE 0x54414f00U
-
-// We reserved the range 0x54414f00 - 0x54414f0f with the OMG to
-// define our own profile ids in TAO.
-#define TAO_TAG_UIOP_PROFILE   0x54414f00U /* Local IPC (Unix Domain) */
-// @@ The values below are suggestions for some of the protocols
-//    we have thought of, subject to change at any point
-// #define TAO_TAG_AIOP_PROFILE   0x54414f01U /* ATM/AAL5 */
-// #define TAO_TAG_SHMEM_PROFILE  0x54414f02U /* Shared memory */
-// #define TAO_TAG_MSGQ_PROFILE   0x54414f03U /* Message Queue */
-// #define TAO_TAG_UDP_PROFILE    0x54414f04U /* UDP */
-// #define TAO_TAG_MCAST_PROFILE  0x54414f05U /* IP/Multicast */
-// #define TAO_TAG_CPCI_PROFILE   0x54414f06U /* Compact/PCI */
-// #define TAO_TAG_VME_PROFILE    0x54414f07U /* VME Bus */
-// #define TAO_TAG_NTNP_PROFILE   0x54414f08U /* NT Named Pipes */
-// #define TAO_TAG_HTTPNG_PROFILE 0x54414f09U /* HTTP-NG */
-// #define TAO_TAG_PIPE_PROFILE   0x54414f0AU /* Pipe */
-// #define TAO_TAG_XXXX_PROFILE   0x54414f0BU /* ???? */
-
-// We reserved the range 0x54414f00 - 0x54414f0f with the OMG to
-// define our own profile tagged components in TAO.
-
-// Store the priority range in the *server* so the client can choose
-// the right endpoint
-#define TAO_TAG_PRIORITY_RANGE 0x54414f00U
-// #define TAO_TAG_ANOTHER_COMPONENT 0x54414f01U
-
-// We reserved the range 0x54414f00 - 0x54414f0f with the OMG to
-// define our own service context list entries.
-// #define TAO_SOME_SVC_CONTEXT_ENTRY 0x54414f00U
-
-// This number was assigned by the OMG.  Do *NOT* change at random.
-// The ASCII representation is TA0xxxx, close enough since they only
-// take 20 bits, the first 16 are TA, the next 4 are 0000.  Remember
-// that we can only play with the last 12 bits, TAO_MAX_MINOR_CODE is
-// there to remind us of that.
-#define TAO_DEFAULT_MINOR_CODE 0x54410000
-#define TAO_MAX_MINOR_CODE 0x54410FFF
-
-// Minor code encoding.  Encode the location in 5 bits, and the errno
-// in 7 bits:
-// 0x   0101 0100   0100 0001   0000   ____ _     ___ ____
-//          T           A        0    location      errno
-
-// Location encoding:  5 bits, after the errno encoding.
-#define TAO_INVOCATION_CONNECT_MINOR_CODE          (0x01U << 7)
-#define TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE (0x02U << 7)
-#define TAO_INVOCATION_SEND_REQUEST_MINOR_CODE     (0x03U << 7)
-#define TAO_POA_DISCARDING                         (0x04U << 7)
-#define TAO_POA_HOLDING                            (0x05U << 7)
-#define TAO_UNHANDLED_SERVER_CXX_EXCEPTION         (0x06U << 7)
-#define TAO_INVOCATION_RECV_REQUEST_MINOR_CODE     (0x07U << 7)
-#define TAO_CONNECTOR_REGISTRY_NO_USABLE_PROTOCOL  (0x08U << 7)
-#define TAO_NULL_POINTER_MINOR_CODE                (0x09U << 7)
-#define TAO_MPROFILE_CREATION_ERROR                (0x0AU << 7)
-#define TAO_TIMEOUT_CONNECT_MINOR_CODE             (0x0BU << 7)
-#define TAO_TIMEOUT_SEND_MINOR_CODE                (0x0CU << 7)
-#define TAO_TIMEOUT_RECV_MINOR_CODE                (0x0DU << 7)
-// *Don't* use TAO_<location>_MINOR_CODE greater than 0x1FU!
-
-// errno encoding:  bottom 7 bits.
-#define TAO_UNSPECIFIED_MINOR_CODE  0x0U
-#define TAO_ETIMEDOUT_MINOR_CODE    0x1U
-#define TAO_ENFILE_MINOR_CODE       0x2U
-#define TAO_EMFILE_MINOR_CODE       0x3U
-#define TAO_EPIPE_MINOR_CODE        0x4U
-#define TAO_ECONNREFUSED_MINOR_CODE 0x5U
-#define TAO_ENOENT_MINOR_CODE       0x6U
-#define TAO_EBADF_MINOR_CODE        0x7U
-#define TAO_ENOSYS_MINOR_CODE       0x8U
-#define TAO_EPERM_MINOR_CODE        0x9U
-#define TAO_EAFNOSUPPORT_MINOR_CODE 0xAU
-#define TAO_EAGAIN_MINOR_CODE       0xBU
-#define TAO_ENOMEM_MINOR_CODE       0xCU
-#define TAO_EACCES_MINOR_CODE       0xDU
-#define TAO_EFAULT_MINOR_CODE       0xEU
-#define TAO_EBUSY_MINOR_CODE        0xFU
-#define TAO_EEXIST_MINOR_CODE       0x10U
-// *Don't* use TAO_<errno>_MINOR_CODE greater than 0x7FU!
-
-// These numbers are assigned by the OpenGroup, a database is
-// available at
-//
-// ftp://ftp.opengroup.orb/pub/codeset_registry/
-//
-#define TAO_CODESET_ID_ISO8859_1 0x00010001U
-#define TAO_CODESET_ID_UNICODE   0x00010109U
-
-// These are the default codesets that TAO declares, of course they
-// will be different on each platform, once the complete support for
-// character sets is implemented
-#define TAO_DEFAULT_CHAR_CODESET_ID  TAO_CODESET_ID_ISO8859_1
-#define TAO_DEFAULT_WCHAR_CODESET_ID TAO_CODESET_ID_UNICODE
-
-// ****************************************************************
-
-// A helper class to handle the various kinds of octet sequences used
-// inside the ORB.
-
-typedef TAO_Unbounded_Sequence<CORBA::Octet> TAO_opaque;
-extern TAO_Export CORBA::TypeCode_ptr TC_opaque;
-
-extern TAO_Export CORBA::Boolean
-operator<< (TAO_OutputCDR&, const TAO_opaque&);
-
-extern TAO_Export CORBA::Boolean
-operator>> (TAO_InputCDR&, TAO_opaque&);
-
-class TAO_ObjectKey;
-class TAO_ObjectKey_var;
-class TAO_ObjectKey_out;
-typedef TAO_ObjectKey *TAO_ObjectKey_ptr;
-
-#if defined (__ACE_INLINE__)
-# include "tao/corbafwd.i"
-#endif /* ! __ACE_INLINE__ */
-
-#endif /* TAO_CORBAFWD_H */
diff --git a/TAO/tao/corbafwd.i b/TAO/tao/corbafwd.i
deleted file mode 100644
index 3a074b08759..00000000000
--- a/TAO/tao/corbafwd.i
+++ /dev/null
@@ -1,33 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-ACE_INLINE CORBA::String
-CORBA::string_alloc (CORBA::ULong len)
-{
-  // Allocate 1 + strlen to accomodate the null terminating character.
-  return new CORBA::Char[size_t (len + 1)];
-}
-
-ACE_INLINE void
-CORBA::string_free (CORBA::Char *str)
-{
-  delete [] str;
-}
-
-ACE_INLINE CORBA::WChar*
-CORBA::wstring_alloc (CORBA::ULong len)
-{
-  return new CORBA::WChar [(size_t) (len + 1)];
-}
-
-ACE_INLINE void
-CORBA::wstring_free (CORBA::WChar *const str)
-{
-  delete [] str;
-}
-
-ACE_INLINE CORBA_Environment&
-CORBA::default_environment ()
-{
-  return TAO_default_environment ();
-}
diff --git a/TAO/tao/debug.cpp b/TAO/tao/debug.cpp
deleted file mode 100644
index f78bfe0e602..00000000000
--- a/TAO/tao/debug.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-// $Id$
-// @ (#)debug.cpp       1.3 95/10/02
-
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// ORB:         Simple debug/trace support
-//
-// THREADING NOTE: the global values here  (debug_{level,filter,stream)
-// are assumed to be modified "safely", e.g. in the main thread as
-// part of process initialization.  They are treated as immutable
-// values through all of this debuging package.
-//
-// XXX on Windows, make it always use OutputDebugString () instead of stdio. 
-
-#include "tao/debug.h"
-
-ACE_RCSID(tao, debug, "$Id$")
-
-TAO_Export u_int TAO_debug_level = 0;
-TAO_Export u_int TAO_orbdebug = 0;
diff --git a/TAO/tao/debug.h b/TAO/tao/debug.h
deleted file mode 100644
index a090e159fe6..00000000000
--- a/TAO/tao/debug.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// $Id$
-
-// This may look like C, but it's really -*- C++ -*-
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    debug.h
-//
-// = DESCRIPTION
-//     debug/trace support.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//
-// ============================================================================
-
-#ifndef TAO_DEBUG_H
-#define TAO_DEBUG_H
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// These are global to simplify is use by other code, very much in
-// particular by getopt and related argument-parsing code
-//
-// THREADING NOTE: don't set them except in an unthreaded environment
-// such as process initialization.  They're treated as immutable.
-
-// 0 to ??; higher == more
-extern TAO_Export u_int TAO_debug_level;
-
-// debug messages on (1) or off (0)
-extern TAO_Export u_int TAO_orbdebug;
-
-#endif /* TAO_DEBUG_H */
diff --git a/TAO/tao/decode.cpp b/TAO/tao/decode.cpp
deleted file mode 100644
index 6cb581ac6cc..00000000000
--- a/TAO/tao/decode.cpp
+++ /dev/null
@@ -1,1588 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    decode.cpp
-//
-// = DESCRIPTION
-//   Code for decoding different data types
-//
-//   The original code had a single static decoder function defined on
-//   the CDR class that called traverse to interpret the data
-//   types. This version defines a virtual method "decode" on each
-//   class and avoids calling traverse.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//     and
-//     Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "tao/Marshal.h"
-#include "tao/CDR.h"
-#include "tao/Environment.h"
-#include "tao/GIOP.h"
-#include "tao/Any.h"
-#include "tao/Principal.h"
-#include "tao/MProfile.h"
-#include "tao/Object.h"
-#include "tao/Stub.h"
-#include "tao/varout.h"
-#include "tao/ORB.h"
-#include "tao/Union.h"
-#include "tao/ORB_Core.h"
-#include "tao/debug.h"
-
-ACE_RCSID(tao, decode, "$Id$")
-
-// The decoder is exactly the reverse of the encoder, except that:
-//
-//      * Unmarshaling some data types involve allocating memory.  Such
-//        types include sequences (the buffer), objrefs, Principals, Anys,
-//        TypeCodes, and strings.
-//
-//      * The decoder is used when retrieving typecode parameters from
-//        encapsulations.  This means it must deal with "CORBA::tk_indirect",
-//        the magic value (~0u) signifying typecode indirection.
-//
-// This second case is identified by a bit of a hack: the second
-// "data" value is used to hold the parent typecode, rather than being
-// ignored.  This means that all other invocations of decoder () **
-// MUST ** pass zero for the second data parameter, in case they
-// decode a TypeCode.  If they didn't, this case might be signified
-// inappropriately.
-//
-// XXX desirable to have a less hacky solution to that ... pull that
-// code out into a separate routine called both by CDR::decoder () and
-// by the code retrieving typecode parameters from encapsulations.
-
-typedef TAO_Object_Field_T<CORBA::Object,CORBA::Object_var> TAO_Object_Field_Class;
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Primitive::decode (CORBA::TypeCode_ptr  tc,
-                               const void *data,
-                               const void *,
-                               void *context,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Boolean continue_decoding = 1;
-  TAO_InputCDR *stream = (TAO_InputCDR *) context;
-  CORBA::TypeCode::traverse_status   retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE; // status of encode operation
-
-  switch (tc->kind_)
-    {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-      break;
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-      continue_decoding = stream->read_short (*(CORBA::Short *) data);
-      break;
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_enum:
-      continue_decoding = stream->read_long (*(CORBA::Long *) data);
-      break;
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-      continue_decoding = stream->read_longlong (*(CORBA::LongLong *) data);
-      break;
-    case CORBA::tk_boolean:
-      continue_decoding = stream->read_boolean (*(CORBA::Boolean *) data);
-      break;
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-      continue_decoding = stream->read_char (*(CORBA::Char *) data);
-      break;
-    case CORBA::tk_longdouble:
-      continue_decoding = stream->read_longdouble (*(CORBA::LongDouble *) data);
-      break;
-    case CORBA::tk_wchar:
-      continue_decoding = stream->read_wchar (*(CORBA::WChar *) data);
-      break;
-    default:
-      retval = CORBA::TypeCode::TRAVERSE_STOP;
-      // we are not a primitive type
-    }
-  if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE
-      || continue_decoding != 1)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Primitive::decode detected error\n"));
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
-    }
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Any::decode (CORBA::TypeCode_ptr,
-                         const void *data,
-                         const void *,
-                         void *context,
-                         CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Any *any = (CORBA::Any *) data;
-
-  // Typecode of the element that makes the Any.
-  CORBA::TypeCode_var elem_tc;
-
-  // Context is the CDR stream.
-  TAO_InputCDR *stream = (TAO_InputCDR *) context;
-
-  // Status of encode operation.
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  // Decode the typecode description for the element.
-  retval = stream->decode (CORBA::_tc_TypeCode,
-                           &elem_tc.out (),
-                           0,
-                           ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-  if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
-    return retval;
-
-  // Let the Any maintain a pointer to the CDR stream
-  // @@ ASG + CORYAN - The following commented line would have been a great
-  // optimization. However, it turns out that although the Message_Block is
-  // heap-allocated, the actual buffer i.e., data block is allocated on the
-  // function call stack. Once we are out of these chain of functions and
-  // return into the stub, we have lost the activation record for the
-  // actual buffer. Hence it makes no sense keeping pointers to stack
-  // memory.
-  //
-  // See TAO_Stub.cpp::do_static_call in which a GIOP_Invocation is
-  // allocated on stack
-#if 0
-  any->cdr_ = ACE_Message_Block::duplicate ((ACE_Message_Block *)
-                                            stream->start ());
-#endif
-  // one solution is to heap allocate the GIOP_Invocation. However, that
-  // would be bad since not all requests will use Anys.
-  //
-  // One solution is to allocate a new Message_Block with its own heap
-  // allocated data_block. (We may optimize this using allocators for known
-  // sizes). We allocate a Message_Block of the size that is required by
-  // the data type held by the Any. To find what is the size of this data
-  // in the CDR, we traverse the CDR by skipping past this data type. We
-  // then get an offset using the "begin" and "end" shown below that tells
-  // us the size. The skipping is done on a temporary CDR stream and not on
-  // the actual incoming CDR stream. Once we have allocated a new
-  // Message_Block, we simply append the data into it from the original CDR
-  // stream.
-  char *begin, *end;
-  TAO_InputCDR temp (*stream);
-
-  begin = stream->rd_ptr ();
-  retval = temp.skip (elem_tc.in (), ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-
-  if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
-    return retval;
-
-  end = temp.rd_ptr ();
-
-  // We need to allocate more memory than in the original
-  // stream, first to guarantee that the buffer is aligned in
-  // memory and next because the realignment may introduce
-  // extra padding. 2*MAX_ALIGNMENT should be enough.
-  // @@EXC@@ This doesn't seem to be exception safe.
-  TAO_OutputCDR out (end - begin + 2 * ACE_CDR::MAX_ALIGNMENT);
-
-  retval = out.append (elem_tc.in (), stream, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
-  if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
-    return retval;
-
-  ACE_Message_Block::release (any->cdr_);
-  if (any->any_owns_data_ && any->value_ != 0)
-    DEEP_FREE (any->type_, any->value_, 0, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  any->cdr_ = ACE_Message_Block::duplicate (out.begin ());
-  any->value_ = 0;
-
-  if (any->type_)
-    CORBA::release (any->type_);
-
-  any->type_ = elem_tc._retn ();
-  any->any_owns_data_ = 0;
-
-  if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Any::decode detected error\n"));
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                        retval);
-    }
-  return retval;
-}
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_TypeCode::decode (CORBA::TypeCode_ptr,
-                              const void *data,
-                              const void *parent_typecode,
-                              void *context,
-                              CORBA::Environment  &ACE_TRY_ENV)
-{
-  CORBA::Boolean continue_decoding = 1;
-
-  // Context is the CDR stream.
-  TAO_InputCDR *stream = (TAO_InputCDR *) context;
-
-  // Typecode to be decoded.
-  CORBA::TypeCode_ptr *tcp;
-
-  // Typecode kind.
-  CORBA::ULong kind;
-
-  static CORBA::TypeCode_ptr tc_consts [CORBA::TC_KIND_COUNT] =
-  {
-    CORBA::_tc_null,
-    CORBA::_tc_void,
-    CORBA::_tc_short,
-    CORBA::_tc_long,
-    CORBA::_tc_ushort,
-
-    CORBA::_tc_ulong,
-    CORBA::_tc_float,
-    CORBA::_tc_double,
-    CORBA::_tc_boolean,
-    CORBA::_tc_char,
-
-    CORBA::_tc_octet,
-    CORBA::_tc_any,
-    CORBA::_tc_TypeCode,
-    CORBA::_tc_Principal,
-
-    0, // CORBA::_tc_Object ... type ID is CORBA_Object
-    0, // CORBA_tk_struct
-    0, // CORBA_tk_union
-    0, // CORBA_tk_enum
-    0, // CORBA::_tc_string ... unbounded
-    0, // CORBA_tk_sequence
-    0, // CORBA_tk_array
-    0, // CORBA_tk_alias
-    0, // CORBA_tk_except
-
-    CORBA::_tc_longlong,
-    CORBA::_tc_ulonglong,
-    CORBA::_tc_longdouble,
-    CORBA::_tc_wchar,
-    0           // CORBA::_tc_wstring ... unbounded
-  };
-
-  // TypeCode for the parent. The most likely situation when a parent will be
-  // provided is when we are precomputing the private state of an IDL compiler
-  // generated or an ORB owned TypeCode, OR we are decoding an indirected
-  // TypeCode. In such circumstances, the decoded
-  // TypeCode will share resources with its parent and cannot be freed until
-  // its parent is being freed.
-  CORBA::TypeCode_ptr parent = (CORBA::TypeCode_ptr) parent_typecode;
-
-  // Decode the "kind" field of the typecode from the stream
-  continue_decoding = stream->read_ulong (kind);
-
-  if (continue_decoding == 1)
-    {
-      // The data has to be a TypeCode_ptr *.
-      tcp = (CORBA::TypeCode_ptr *) data;
-
-      // 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::TC_KIND_COUNT
-          && (*tcp = tc_consts [(u_int) kind]) != 0)
-        // parent is ignored
-        *tcp = CORBA::TypeCode::_duplicate (tc_consts [(u_int) kind]);
-      else if (kind == ~0u || kind < CORBA::TC_KIND_COUNT)
-        {
-          // 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:
-              // Error: missed a case!
-              ACE_THROW_RETURN (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP);
-
-              // Some have "simple" parameter lists ... some of these
-              // also have preallocated constants that could be used.
-            case CORBA::tk_string:
-            case CORBA::tk_wstring:
-              {
-                CORBA::ULong bound;
-
-                continue_decoding = stream->read_ulong (bound);
-                if (continue_decoding)
-                  {
-                    if (bound == 0)
-                      {
-                        // unbounded string. Let us reuse the ORB owned
-                        // _tc_string or _tc_wstring
-                        if (kind == CORBA::tk_string)
-                          *tcp = CORBA::TypeCode::_duplicate
-                            (CORBA::_tc_string);
-                        else
-                          *tcp = CORBA::TypeCode::_duplicate
-                            (CORBA::_tc_wstring);
-                      }
-                    else
-                      {
-                        // bounded string. Create a TypeCode. If it is does not
-                        // have a parent, then the application must free it.
-
-                        // allocate a new TypeCode
-#if 1
-                        // This may produce a memory leak, because
-                        // callers are sloppy about removing this
-                        // objects.
-                        CORBA::Long _oc_bounded_string [] =
-                        {TAO_ENCAP_BYTE_ORDER, 0};
-                        // Bounded string. Save the bounds
-                        _oc_bounded_string [1] = (CORBA::Long) bound;
-                        *tcp = new CORBA::TypeCode (ACE_static_cast(CORBA::TCKind, kind),
-                                                    8,
-                                                    ACE_reinterpret_cast(char*,_oc_bounded_string),
-                                                    0, sizeof
-                                                    (CORBA::String_var), 0);
-#elif 0
-                        // This one fails because we are passing the
-                        // parent but the buffer (_oc_bounded_string) is
-                        // not pointing to the parent CDR stream
-                        // (hence no sharing) and the length is wrong
-                        // (should be 8 not bounds).
-                        CORBA::Long _oc_bounded_string [] =
-                        {TAO_ENCAP_BYTE_ORDER, 0};
-                        // Bounded string. Save the bounds
-                        _oc_bounded_string [1] = (CORBA::Long) bound;
-                        *tcp = new CORBA::TypeCode ((CORBA::TCKind) kind,
-                                                    bound, (char *) &_oc_bounded_string,
-                                                    0, sizeof
-                                                    (CORBA::String_var), parent);
-#else
-                        // This depends on the fact that <stream> is
-                        // actually pointing to the parent CDR stream,
-                        // it is untested.
-                        *tcp = new CORBA::TypeCode ((CORBA::TCKind) kind,
-                                                    8,
-                                                    stream->rd_ptr () - 8,
-                                                    0, 0, parent);
-#endif
-                      }
-                  }
-              }
-            break;
-
-            // Indirected typecodes, illegal at "top level" but we
-            // allow unmarshaling of them here because we use the same
-            // code to read "off the wire" (where they're illegal) and
-            // to read out of an encapsulation stream.  We distinguish
-            // the case where this is legal as described above.
-            case ~0u:
-              {
-                if (parent_typecode == 0)
-                    ACE_THROW_RETURN (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP);
-
-                // Get the long indicating the encapsulation offset,
-                // then set up indirection stream that's like "stream"
-                // but has space enough only for the typecode and the
-                // length for the encapsulated parameters.
-                //
-                // The offset must be negative
-                CORBA::Long offset;
-
-                continue_decoding = stream->read_long (offset);
-                if (continue_decoding)
-                  {
-                    // Since indirected typecodes cannot occur at the
-                    // topmost level, they can occur starting only at the
-                    // second and subsequent levels. This means that a
-                    // normal encoding of that typecode occurred somewhere
-                    // before in the stream. As a result the offset field
-                    // must always be negative. See the CORBA spec for details.
-                    continue_decoding = (offset < 0);
-                  }
-
-                // Slava Galperin <galperin@teknowledge.com> clarifies
-                // this:
-                // CORBA Spec says:
-                //
-                // The encoding of such an indirection is as a
-                // TypeCode with a TCKind value that has the special
-                // value 2^32 -1 (0xffffffff, all ones). Such
-                // typecodes have a single (simple) parameter, which
-                // is the long offset (in units of octets) from the
-                // simple parameter. (This means that an offset of
-                // negative four (-4) is illegal because it will be
-                // self-indirecting.)
-                // (CORBA V2.2 CDR Transfer Syntax February 1998 page 13-17)
-                //
-                // This apparently assumes offset from the <em>
-                // beginning </em> of the simple parameter.
-                // [Right, because otherwise the value -8 would be
-                // illegal]
-                // Because at this point stream is positioned after
-                // the parameter, we need to account for that when
-                // constructing indir_stream by subtracting 4 (length
-                // of the offset parameter itself).
-
-                //                TAO_InputCDR indir_stream (*stream, 8, offset
-                //                - 4);
-                ACE_Message_Block *mb = (ACE_Message_Block *)stream->start ();
-                TAO_InputCDR indir_stream (mb->rd_ptr () + offset - 4,
-                                           -1 * (offset - 4));
-
-
-                continue_decoding = indir_stream.good_bit ();
-
-                // Get "kind" and length of target typecode
-                //
-                // XXX this currently assumes the TCKind to which we
-                // indirect is the same byte order as the "parent"
-                // typecode -- not the right assumption; see how the
-                // TypeCode interpreter does it.
-
-                CORBA::ULong indir_kind;
-                CORBA::ULong indir_len;
-
-                // retrieve the typecode kind
-                if (continue_decoding)
-                  continue_decoding = indir_stream.read_ulong (indir_kind);
-
-                if (continue_decoding
-                    && indir_kind >= CORBA::TC_KIND_COUNT)
-                  continue_decoding = 0;
-
-                // now retrieve the encapsulation length
-                if (continue_decoding)
-                  continue_decoding = indir_stream.read_ulong (indir_len);
-
-                // Now construct indirected typecode.  This shares the
-                // typecode octets with the "parent" typecode,
-                // increasing the amount of memory sharing and
-                // reducing the cost of getting typecodes.
-                if (continue_decoding)
-                  {
-                    *tcp = new CORBA::TypeCode ((CORBA::TCKind) indir_kind,
-                                                indir_len,
-                                                indir_stream.rd_ptr(),
-                                                0,
-                                                0,
-                                                parent);
-                  }
-              }
-            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:
-              {
-                CORBA::ULong length;
-
-                // get the encapsulation length
-                continue_decoding = stream->read_ulong (length);
-                if (!continue_decoding)
-                  break;
-
-                // if length > MAXUNSIGNED, error ...
-                u_int len = (u_int) length;
-
-                // create a new typecode
-                *tcp = new CORBA::TypeCode ((CORBA::TCKind) kind,
-                                            len,
-                                            stream->rd_ptr (),
-                                            0,
-                                            0,
-                                            parent);
-                // skip length number of bytes in the stream, else we may
-                // leave the stream in an undefined state
-                (void) stream->skip_bytes (length);
-              }
-            } // end of switch
-        }
-      else // bad kind_ value to be decoded
-        {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "TAO_Marshal_TypeCode:decode: "
-                        "Bad kind_ value in CDR stream\n"));
-          ACE_THROW_RETURN ( CORBA::BAD_TYPECODE (), CORBA::TypeCode::TRAVERSE_STOP);
-        }
-    }
-
-  if (continue_decoding != 1)
-    {
-      if (TAO_debug_level)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_TypeCode::decode detected error\n"));
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
-    }
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// Encode Principal.
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Principal::decode (CORBA::TypeCode_ptr,
-                               const void *data,
-                               const void *,
-                               void *context,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  // Context is the CDR stream.
-  TAO_InputCDR *stream = (TAO_InputCDR *) context;
-
-  CORBA::Principal_ptr x;
-
-  if ((*stream >> x) == 0)
-    {
-      *(CORBA_Principal_ptr*)data = CORBA::Principal::_nil ();
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
-    }
-
-  *(CORBA_Principal **)data = x;
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// Decode obj ref.  An IOR
-CORBA::TypeCode::traverse_status
-TAO_Marshal_ObjRef::decode (CORBA::TypeCode_ptr,
-                            const void *data, // where the result will go
-                            const void *,
-                            void *context,
-                            CORBA::Environment &ACE_TRY_ENV)
-{
-  // Context is the CDR stream.
-  TAO_InputCDR *stream = (TAO_InputCDR *) context;
-
-  CORBA::Object_ptr object;
-
-  if ((*stream >> object) == 0)
-    {
-      *(CORBA_Object_ptr*)data = CORBA::Object::_nil ();
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP);
-    }
-
-  *(CORBA_Object **)data = object;
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// Decode structs.
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Struct::decode (CORBA::TypeCode_ptr  tc,
-                            const void *data,
-                            const void *,
-                            void *context,
-                            CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_InputCDR *stream = (TAO_InputCDR *) context;
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;
-  CORBA::Boolean continue_decoding = 1;
-  CORBA::TypeCode_ptr param;
-  CORBA::Long size, alignment, align_offset;
-
-  void *start_addr = (void *)data;
-
-  // Number of fields in the struct.
-  int member_count = tc->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  for (int i = 0; i < member_count
-         && retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-         && continue_decoding == 1;
-       i++)
-    {
-      param = tc->member_type (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      size = param->size (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      alignment = param->alignment (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      align_offset =
-        (ptr_arith_t) ptr_align_binary (data, alignment)
-        - (ptr_arith_t) data
-        + (ptr_arith_t) ptr_align_binary (start_addr, alignment)
-        - (ptr_arith_t) start_addr;
-      // if both the start_addr and data are not aligned as per
-      // the alignment, we do not add the offset
-      data = (const void *) ((ptr_arith_t) data +
-                             ((align_offset == alignment) ?
-                              0 : align_offset));
-      switch (param->kind_)
-        {
-        case CORBA::tk_null:
-        case CORBA::tk_void:
-          break;
-        case CORBA::tk_short:
-        case CORBA::tk_ushort:
-          continue_decoding =
-            stream->read_short (*(CORBA::Short *) data);
-          break;
-        case CORBA::tk_long:
-        case CORBA::tk_ulong:
-        case CORBA::tk_float:
-        case CORBA::tk_enum:
-          continue_decoding =
-            stream->read_long (*(CORBA::Long *) data);
-          break;
-        case CORBA::tk_double:
-        case CORBA::tk_longlong:
-        case CORBA::tk_ulonglong:
-          continue_decoding =
-            stream->read_longlong (*(CORBA::LongLong *) data);
-          break;
-        case CORBA::tk_boolean:
-          continue_decoding =
-            stream->read_boolean (*(CORBA::Boolean *) data);
-          break;
-        case CORBA::tk_char:
-        case CORBA::tk_octet:
-          continue_decoding =
-            stream->read_char (*(CORBA::Char *) data);
-          break;
-        case CORBA::tk_longdouble:
-          continue_decoding =
-            stream->read_longdouble (*(CORBA::LongDouble *) data);
-          break;
-        case CORBA::tk_wchar:
-          continue_decoding =
-            stream->read_wchar (*(CORBA::WChar *) data);
-          break;
-        case CORBA::tk_TypeCode:
-        case CORBA::tk_any:
-        case CORBA::tk_Principal:
-        case CORBA::tk_struct:
-        case CORBA::tk_union:
-        case CORBA::tk_sequence:
-        case CORBA::tk_array:
-        case CORBA::tk_alias:
-        case CORBA::tk_except:
-        case CORBA::tk_string:
-        case CORBA::tk_wstring:
-          retval = stream->decode (param, data, 0, ACE_TRY_ENV);
-          break;
-
-        case CORBA::tk_objref:
-          {
-            CORBA_Object_ptr object;
-            retval = stream->decode (param, &object, 0, ACE_TRY_ENV);
-            ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-            if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-              {
-                TAO_Object_Field_Class* field =
-                  ACE_reinterpret_cast (TAO_Object_Field_Class *,
-                                        ACE_const_cast (void *, data));
-                field->_downcast (object, ACE_TRY_ENV);
-              }
-          }
-          break;
-
-        default:
-          break;
-        }
-      data = (char *) data + size;
-    }
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Struct::decode detected error\n"));
-
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
-    }
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// Encode unions.
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Union::decode (CORBA::TypeCode_ptr  tc,
-                           const void *data,
-                           const void *data2,
-                           void *context,
-                           CORBA::Environment &ACE_TRY_ENV)
-{
-  // Context is the CDR stream.
-  TAO_InputCDR *stream = (TAO_InputCDR *) context;
-
-  CORBA::TypeCode_ptr discrim_tc;
-  CORBA::TypeCode_ptr member_tc = 0;
-  CORBA::Any_ptr member_label;
-  CORBA::ULong discrim_size_with_pad;
-  const void *discrim_val;
-  CORBA::ULong member_count;
-  CORBA::Long  default_index;
-  CORBA::ULong i;
-  CORBA::TypeCode_ptr default_tc = 0;
-  CORBA::Boolean discrim_matched = 0;
-  TAO_Base_Union *base_union = (TAO_Base_Union *)data;
-  void *member_val;
-
-  discrim_tc = tc->discriminator_type (ACE_TRY_ENV);
-  // get the discriminator type
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  // decode the discriminator value
-  discrim_val = base_union->_discriminant ();
-  stream->decode (discrim_tc, discrim_val, data2, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  discrim_size_with_pad = tc->TAO_discrim_pad_size (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  // move the pointer to point to the actual value
-  data = (char *) data + discrim_size_with_pad;
-  data2 = (char *) data2 + discrim_size_with_pad;
-
-  // now get ready to marshal the actual union value
-  default_index = tc->default_index (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  member_count = tc->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  // check which label value matches with the discriminator
-  // value. Accordingly, marshal the corresponding
-  // member_type. If none match, check if default exists
-  // and marshal accordingly. Otherwise it is an error.
-
-  for (i = 0; member_count-- != 0; i++)
-    {
-      member_label = tc->member_label (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      // do the matching
-      CORBA::TypeCode_var type = member_label->type ();
-      switch (type->kind (ACE_TRY_ENV)) // kind() doesn't throw any exception.
-        {
-        case CORBA::tk_short:
-          {
-            CORBA::Short s;
-            *member_label >>= s;
-            if (s == *(CORBA::Short *) discrim_val)
-              discrim_matched = 1;
-          }
-          break;
-        case CORBA::tk_ushort:
-          {
-            CORBA::UShort s;
-            *member_label >>= s;
-            if (s == *(CORBA::UShort *) discrim_val)
-              discrim_matched = 1;
-          }
-          break;
-        case CORBA::tk_long:
-          {
-            CORBA::Long l;
-            *member_label >>= l;
-            if (l == *(CORBA::Long *) discrim_val)
-              discrim_matched = 1;
-          }
-          break;
-        case CORBA::tk_ulong:
-          {
-            CORBA::ULong l;
-            *member_label >>= l;
-            if (l == *(CORBA::ULong *) discrim_val)
-              discrim_matched = 1;
-          }
-          break;
-        case CORBA::tk_enum:
-          {
-            CORBA::ULong ul;
-            TAO_InputCDR stream ((ACE_Message_Block *)
-                                 member_label->_tao_get_cdr ());
-            (void)stream.decode (discrim_tc, &ul, 0, ACE_TRY_ENV);
-            //@@EXC@@ Rethrow CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)?
-            ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-            if (ul == *(CORBA::ULong *) discrim_val)
-              discrim_matched = 1;
-          }
-          break;
-        case CORBA::tk_char:
-          {
-            CORBA::Char c;
-            *member_label >>= CORBA::Any::to_char (c);
-            if (c == *(CORBA::Char *) discrim_val)
-              discrim_matched = 1;
-          }
-          break;
-        case CORBA::tk_wchar:
-          CORBA::WChar wc;
-          *member_label >>= CORBA::Any::to_wchar (wc);
-          if (wc == *(CORBA::WChar *) discrim_val)
-            discrim_matched = 1;
-          break;
-        case CORBA::tk_boolean:
-          {
-            CORBA::Boolean b;
-            *member_label >>= CORBA::Any::to_boolean (b);
-            if (b == *(CORBA::Boolean *) discrim_val)
-              discrim_matched = 1;
-          }
-          break;
-        default:
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), CORBA::TypeCode::TRAVERSE_STOP);
-        }// end of switch
-
-      // get the member typecode
-      member_tc = tc->member_type (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      // have we reached the default label?, if so,
-      // save a handle to the typecode for the default
-      if (default_index >= 0 && default_index-- == 0)
-        default_tc = member_tc;
-      if (discrim_matched)
-        {
-          member_val = base_union->_access (1);
-          // marshal according to the matched typecode
-          if (member_tc->kind () == CORBA::tk_objref)
-            {
-              CORBA_Object_ptr object;
-              int retval =
-                stream->decode (member_tc, &object, data2, ACE_TRY_ENV);
-              ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-              if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                {
-                  // we know that the object pointer is stored in a
-                  // TAO_Object_Field_T parametrized type
-                  TAO_Object_Field_Class* field =
-                    ACE_reinterpret_cast (TAO_Object_Field_Class *,
-                                          member_val);
-                  field->_downcast (object, ACE_TRY_ENV);
-                  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-                }
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-            }
-          else
-            {
-              return stream->decode (member_tc, member_val,
-                                     data2, ACE_TRY_ENV);
-            }
-        }
-    } // end of for loop
-
-  // we are here only if there was no match
-  if (default_tc)
-    {
-      member_val = base_union->_access (1);
-      if (default_tc->kind () == CORBA::tk_objref)
-        {
-          CORBA_Object_ptr object;
-          int retval =
-            stream->decode (member_tc, &object, data2, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-          if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-            {
-              // we know that the object pointer is stored in a
-              // TAO_Object_Field_T parametrized type
-              TAO_Object_Field_Class* field =
-                ACE_reinterpret_cast (TAO_Object_Field_Class *,
-                                      member_val);
-              field->_downcast (object, ACE_TRY_ENV);
-              ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-            }
-          return CORBA::TypeCode::TRAVERSE_CONTINUE;
-        }
-      else
-        {
-          return stream->decode (default_tc, member_val,
-                                 data2, ACE_TRY_ENV);
-        }
-    }
-  else
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// decode string
-CORBA::TypeCode::traverse_status
-TAO_Marshal_String::decode (CORBA::TypeCode_ptr,
-                            const void *data,
-                            const void *,
-                            void *context,
-                            CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Boolean continue_decoding = 1;
-  // Context is the CDR stream.
-  TAO_InputCDR *stream = (TAO_InputCDR *) context;
-
-  CORBA::String* str_ptr = (CORBA::String*)data;
-
-  // 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_decoding = stream->read_string (*str_ptr);
-  if (continue_decoding != 1)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_String::decode detected error\n"));
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
-    }
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// Decode sequence.
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Sequence::decode (CORBA::TypeCode_ptr  tc,
-                              const void *data,
-                              const void *,
-                              void *context,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Boolean continue_decoding = 1;
-  TAO_InputCDR *stream = (TAO_InputCDR *) context;
-  TAO_Base_Sequence *seq = (TAO_Base_Sequence *)data;
-  // Return status.
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;
-  // Typecode of the element.
-  CORBA::TypeCode_ptr tc2;
-  // Size of element.
-  size_t size;
-  CORBA::ULong bounds;
-  char *value;
-
-  // 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).
-
-  continue_decoding = stream->read_ulong (bounds);
-
-  if (continue_decoding)
-    {
-      // No point decoding an empty sequence.
-      if (bounds > 0)
-        {
-          // Get element typecode.
-          tc2 = tc->content_type (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-          size = tc2->size (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-          // The treatment of octet sequences is completely
-          // different.
-          if (tc2->kind_ == CORBA::tk_octet
-              && ACE_BIT_DISABLED (stream->start ()->flags (),
-                                   ACE_Message_Block::DONT_DELETE))
-            {
-              TAO_Unbounded_Sequence<CORBA::Octet>* seq2 =
-                ACE_dynamic_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, seq);
-              seq2->replace (bounds, stream->start ());
-              seq2->mb ()->wr_ptr (seq2->mb ()->rd_ptr () + bounds);
-              stream->skip_bytes (bounds);
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-            }
-#endif /* defined (TAO_NO_COPY_OCTET_SEQUENCES) */
-
-          // Allocate the buffer using the virtual
-          // _allocate_buffer method, hence the right
-          // constructors are invoked and size for the array
-          // is OK.  The sequence will release it, since its
-          // release_ field is 1.
-          if (seq->maximum_ < bounds)
-            {
-              seq->_deallocate_buffer ();
-              seq->maximum_ = bounds;
-              seq->release_ = 1;
-              seq->buffer_ = 0;
-              seq->_allocate_buffer (bounds);
-            }
-          // In any case the sequence length is changed.
-          seq->length_ = bounds;
-
-
-          value = (char *) seq->buffer_;
-
-          switch (tc2->kind_)
-            {
-            case CORBA::tk_null:
-            case CORBA::tk_void:
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-            case CORBA::tk_short:
-            case CORBA::tk_ushort:
-              // For primitives, compute the size only once
-              continue_decoding = continue_decoding &&
-                stream->read_short_array
-                ((CORBA::Short *) value, bounds);
-              if (continue_decoding == 1)
-                return CORBA::TypeCode::TRAVERSE_CONTINUE;
-              break;
-
-            case CORBA::tk_long:
-            case CORBA::tk_ulong:
-            case CORBA::tk_float:
-            case CORBA::tk_enum:
-              // For primitives, compute the size only once
-              continue_decoding = continue_decoding &&
-                stream->read_long_array
-                ((CORBA::Long *) value, bounds);
-              if (continue_decoding == 1)
-                return CORBA::TypeCode::TRAVERSE_CONTINUE;
-              break;
-
-            case CORBA::tk_double:
-            case CORBA::tk_longlong:
-            case CORBA::tk_ulonglong:
-              // For primitives, compute the size only once
-              continue_decoding = continue_decoding &&
-                stream->read_longlong_array
-                ((CORBA::LongLong *) value, bounds);
-              if (continue_decoding == 1)
-                return CORBA::TypeCode::TRAVERSE_CONTINUE;
-              break;
-
-            case CORBA::tk_boolean:
-              // For primitives, compute the size only once
-              continue_decoding = continue_decoding &&
-                stream->read_octet_array
-                ((CORBA::Octet *) value, bounds);
-              if (continue_decoding == 1)
-                return CORBA::TypeCode::TRAVERSE_CONTINUE;
-              break;
-
-            case CORBA::tk_char:
-              // For primitives, compute the size only once
-              continue_decoding = continue_decoding &&
-                stream->read_char_array
-                ((CORBA::Char *) value, bounds);
-              if (continue_decoding == 1)
-                return CORBA::TypeCode::TRAVERSE_CONTINUE;
-              break;
-
-            case CORBA::tk_octet:
-              // For primitives, compute the size only once
-              continue_decoding = continue_decoding &&
-                stream->read_octet_array
-                ((CORBA::Octet *) value, bounds);
-              if (continue_decoding == 1)
-                return CORBA::TypeCode::TRAVERSE_CONTINUE;
-              break;
-
-            case CORBA::tk_longdouble:
-              // For primitives, compute the size only once
-              continue_decoding = continue_decoding &&
-                stream->read_longdouble_array
-                ((CORBA::LongDouble *) value, bounds);
-              if (continue_decoding == 1)
-                return CORBA::TypeCode::TRAVERSE_CONTINUE;
-              break;
-
-            case CORBA::tk_wchar:
-              // For primitives, compute the size only once
-              continue_decoding = continue_decoding &&
-                stream->read_wchar_array
-                ((CORBA::WChar *) value, bounds);
-              if (continue_decoding == 1)
-                return CORBA::TypeCode::TRAVERSE_CONTINUE;
-              break;
-
-              // handle all aggregate types here
-            case CORBA::tk_string:
-            case CORBA::tk_wstring:
-            case CORBA::tk_any:
-            case CORBA::tk_TypeCode:
-            case CORBA::tk_Principal:
-            case CORBA::tk_struct:
-            case CORBA::tk_union:
-            case CORBA::tk_sequence:
-            case CORBA::tk_array:
-            case CORBA::tk_alias:
-            case CORBA::tk_except:
-              // For those aggregate types whose size is
-              // constant, we compute it only once.
-              while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                {
-                  retval = stream->decode (tc2, value, 0, ACE_TRY_ENV);
-                  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-                  value += size;
-                }
-              // CORBA::release (tc2);
-              return retval;
-
-            case CORBA::tk_objref:
-              {
-                size = sizeof (CORBA_Object_ptr);
-                while (bounds-- &&
-                       retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                  {
-                    CORBA_Object_ptr ptr;
-                    retval = stream->decode (tc2, &ptr, 0,  ACE_TRY_ENV);
-                    ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-                    seq->_downcast (value, ptr, ACE_TRY_ENV);
-                    ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-                    CORBA::release (ptr);
-                    value += size;
-                  }
-                return retval;
-              }
-
-            default:
-              break;
-            } // end of switch
-        } // length is > 0
-      else
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-    }
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    CORBA::TypeCode::TRAVERSE_STOP);
-}
-
-// Decode array.
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Array::decode (CORBA::TypeCode_ptr  tc,
-                           const void *data,
-                           const void *,
-                           void *context,
-                           CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Boolean continue_decoding = 1;
-  TAO_InputCDR *stream = (TAO_InputCDR *) context;
-
-  // Return status.
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  // Typecode of the element.
-  CORBA::TypeCode_ptr tc2;
-
-  // Size of element.
-  size_t  size;
-  CORBA::ULong  bounds;
-  char *value = (char *) data;
-
-  // retrieve the bounds of the array
-  bounds = tc->length (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  // get element typecode
-  tc2 = tc->content_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  size = tc2->size (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  switch (tc2->kind_)
-    {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-      // For primitives, compute the size only once
-      continue_decoding = continue_decoding &&
-        stream->read_short_array
-        ((CORBA::Short *) value, bounds);
-      if (continue_decoding == 1)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-      break;
-
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_enum:
-      // For primitives, compute the size only once
-      continue_decoding = continue_decoding &&
-        stream->read_long_array
-        ((CORBA::Long *) value, bounds);
-      if (continue_decoding == 1)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-      break;
-
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-      // For primitives, compute the size only once
-      continue_decoding = continue_decoding &&
-        stream->read_longlong_array
-        ((CORBA::LongLong *) value, bounds);
-      if (continue_decoding == 1)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-      break;
-
-    case CORBA::tk_boolean:
-      // For primitives, compute the size only once
-      continue_decoding = continue_decoding &&
-        stream->read_octet_array
-        ((CORBA::Octet *) value, bounds);
-      if (continue_decoding == 1)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-      break;
-
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-      // For primitives, compute the size only once
-      continue_decoding = continue_decoding &&
-        stream->read_octet_array
-        ((CORBA::Octet *) value, bounds);
-      if (continue_decoding == 1)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-      break;
-
-    case CORBA::tk_longdouble:
-      // For primitives, compute the size only once
-      continue_decoding = continue_decoding &&
-        stream->read_longdouble_array
-        ((CORBA::LongDouble *) value, bounds);
-      if (continue_decoding == 1)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-      break;
-
-    case CORBA::tk_wchar:
-      // For primitives, compute the size only once
-      continue_decoding = continue_decoding &&
-        stream->read_wchar_array
-        ((CORBA::WChar *) value, bounds);
-      if (continue_decoding == 1)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-      break;
-
-      // handle all aggregate types here
-    case CORBA::tk_any:
-    case CORBA::tk_TypeCode:
-    case CORBA::tk_Principal:
-    case CORBA::tk_objref:
-    case CORBA::tk_struct:
-    case CORBA::tk_union:
-    case CORBA::tk_string:
-    case CORBA::tk_sequence:
-    case CORBA::tk_array:
-    case CORBA::tk_alias:
-    case CORBA::tk_except:
-    case CORBA::tk_wstring:
-      // For those aggregate types whose size is constant, we
-      // compute it only once
-      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          retval = stream->decode (tc2, value, 0, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-          value += size;
-        }
-      // CORBA::release (tc2);
-      return retval;
-    default:
-      break;
-    } // end of switch
-
-  // error exit
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_Sequence::decode detected error\n"));
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    CORBA::TypeCode::TRAVERSE_STOP);
-}
-
-// Decode alias.
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Alias::decode (CORBA::TypeCode_ptr  tc,
-                           const void *data,
-                           const void *,
-                           void *context,
-                           CORBA::Environment &ACE_TRY_ENV)
-{
-  // Typecode of the aliased type.
-  CORBA::TypeCode_ptr tc2;
-  CORBA::Boolean continue_decoding = 1;
-
-  // Context is the CDR stream.
-  TAO_InputCDR *stream = (TAO_InputCDR *) context;
-
-  // Status of decode operation.
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;
-  char *value = (char *) data;
-
-  tc2 = tc->content_type (ACE_TRY_ENV);
-  // @@EXC@@ Rethrow CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)?
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  // Switch on the data type and handle the cases for primitives
-  // here for efficiency rather than calling.
-  switch (tc2->kind_)
-    {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-      break;
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-      continue_decoding =
-        stream->read_short (*(CORBA::Short *) value);
-      break;
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_enum:
-      continue_decoding =
-        stream->read_long (*(CORBA::Long *) value);
-      break;
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-      continue_decoding =
-        stream->read_longlong (*(CORBA::LongLong *) value);
-      break;
-    case CORBA::tk_boolean:
-      continue_decoding =
-        stream->read_boolean (*(CORBA::Boolean *) value);
-      break;
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-      continue_decoding =
-        stream->read_char (*(CORBA::Char *) value);
-      break;
-    case CORBA::tk_longdouble:
-      continue_decoding =
-        stream->read_longdouble (*(CORBA::LongDouble *) value);
-      break;
-    case CORBA::tk_wchar:
-      continue_decoding =
-        stream->read_wchar (*(CORBA::WChar *) value);
-      break;
-    case CORBA::tk_string:
-    case CORBA::tk_wstring:
-    case CORBA::tk_any:
-    case CORBA::tk_TypeCode:
-    case CORBA::tk_Principal:
-    case CORBA::tk_objref:
-    case CORBA::tk_struct:
-    case CORBA::tk_union:
-    case CORBA::tk_sequence:
-    case CORBA::tk_array:
-    case CORBA::tk_alias:
-    case CORBA::tk_except:
-      retval = stream->decode (tc2, data, 0, ACE_TRY_ENV);
-      // @@EXC@@ Rethrow CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)?
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-      break;
-    default:
-      // anything else is an error
-      retval = CORBA::TypeCode::TRAVERSE_STOP;
-    }
-
-  if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE
-      || continue_decoding != 1)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Except::decode detected error\n"));
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
-    }
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// 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.
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Except::decode (CORBA::TypeCode_ptr  tc,
-                            const void *data,
-                            const void *,
-                            void *context,
-                            CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_InputCDR *stream = (TAO_InputCDR *) context;
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;
-  CORBA::Boolean continue_decoding = 1;
-  CORBA::TypeCode_ptr param;
-  CORBA::Long size, alignment;
-
-  data = (char *) data + sizeof (CORBA::Exception);
-  // @@ (ASG) The reason this is done is because we want to skip the size
-  // of the the base class and its private data members (type_ and
-  // refcount_). After skipping these data members, we will have the data
-  // members of the derived class which must be encoded.
-
-  // Number of fields in the struct.
-  int member_count = tc->member_count (ACE_TRY_ENV);
-  // @@EXC@@ Rethrow CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)?
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  for (int i = 0; i < member_count
-         && retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-         && continue_decoding == 1; i++)
-    {
-      param = tc->member_type (i, ACE_TRY_ENV);
-      // @@EXC@@ Rethrow CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)?
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      size = param->size (ACE_TRY_ENV);
-      // @@EXC@@ Rethrow CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)?
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      alignment = param->alignment (ACE_TRY_ENV);
-      // @@EXC@@ Rethrow CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)?
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      data = ptr_align_binary (data, alignment);
-      switch (param->kind_)
-        {
-        case CORBA::tk_null:
-        case CORBA::tk_void:
-          break;
-        case CORBA::tk_short:
-        case CORBA::tk_ushort:
-          continue_decoding =
-            stream->read_short (*(CORBA::Short *) data);
-          break;
-        case CORBA::tk_long:
-        case CORBA::tk_ulong:
-        case CORBA::tk_float:
-        case CORBA::tk_enum:
-          continue_decoding =
-            stream->read_long (*(CORBA::Long *) data);
-          break;
-        case CORBA::tk_double:
-        case CORBA::tk_longlong:
-        case CORBA::tk_ulonglong:
-          continue_decoding =
-            stream->read_longlong (*(CORBA::LongLong *) data);
-          break;
-        case CORBA::tk_boolean:
-          continue_decoding =
-            stream->read_boolean (*(CORBA::Boolean *) data);
-          break;
-        case CORBA::tk_char:
-        case CORBA::tk_octet:
-          continue_decoding =
-            stream->read_char (*(CORBA::Char *) data);
-          break;
-        case CORBA::tk_longdouble:
-          continue_decoding =
-            stream->read_longdouble (*(CORBA::LongDouble *) data);
-          break;
-        case CORBA::tk_wchar:
-          continue_decoding =
-            stream->read_wchar (*(CORBA::WChar *) data);
-          break;
-        case CORBA::tk_any:
-        case CORBA::tk_TypeCode:
-        case CORBA::tk_Principal:
-        case CORBA::tk_objref:
-        case CORBA::tk_struct:
-        case CORBA::tk_union:
-        case CORBA::tk_string:
-        case CORBA::tk_sequence:
-        case CORBA::tk_array:
-        case CORBA::tk_alias:
-        case CORBA::tk_except:
-        case CORBA::tk_wstring:
-          retval = stream->decode (param, data, 0, ACE_TRY_ENV);
-          // @@EXC@@ Rethrow CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)?
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-          break;
-        default:
-          break;
-        }
-      data = (char *) data + size;
-    }
-
-  if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE
-      || continue_decoding != 1)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Except::decode detected error\n"));
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
-    }
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// decode wstring
-CORBA::TypeCode::traverse_status
-TAO_Marshal_WString::decode (CORBA::TypeCode_ptr,
-                             const void *data,
-                             const void *,
-                             void *context,
-                             CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Boolean continue_decoding = 1;
-  TAO_InputCDR *stream = (TAO_InputCDR *) context;
-  CORBA::WChar *str = *(CORBA::WChar **) data;
-  CORBA::ULong len;
-
-  // 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_decoding = stream->read_ulong (len);
-
-  ACE_NEW_RETURN (str,
-                  CORBA::WChar [(size_t) (len)],
-                  CORBA::TypeCode::TRAVERSE_CONTINUE);
-  *((CORBA::WChar **) data) = str;
-
-  if (len != 0)
-    while (continue_decoding != 0 && len--)
-      {
-        continue_decoding = stream->read_wchar (*str);
-        str++;
-      }
-
-  if (continue_decoding != 1)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_WString::decode detected error\n"));
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
-    }
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
diff --git a/TAO/tao/deep_free.cpp b/TAO/tao/deep_free.cpp
deleted file mode 100644
index b3cb907dfc1..00000000000
--- a/TAO/tao/deep_free.cpp
+++ /dev/null
@@ -1,801 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    deep_free.cpp
-//
-// = DESCRIPTION
-//   Code for deep_free
-//   The original code had a single static deep_free function that called
-//   traverse to interpret the data types. This version defines a static method
-//   "deep_free" on each class and avoids calling traverse.
-//
-//   Helper routine for "Any" destructor.
-//
-//   This frees all the memory pointed to by any given value held inside
-//   of an "Any".  For most data types it does nothing, since most data
-//   types don't hold any memory.  For a few, it calls other deep_free methods
-//   to free the memory
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//     and
-//     Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "tao/Marshal.h"
-#include "tao/CDR.h"
-#include "tao/Environment.h"
-#include "tao/Any.h"
-#include "tao/Object.h"
-#include "tao/Stub.h"
-#include "tao/Principal.h"
-#include "tao/varout.h"
-#include "tao/Union.h"
-#include "tao/debug.h"
-
-ACE_RCSID(tao, deep_free, "$Id$")
-
-CORBA::TypeCode::traverse_status
-DEEP_FREE (CORBA::TypeCode_ptr  param,
-           const void *source,
-           const void *dest,
-           CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  // Since every exception-throwing function is followed by break and then return,
-  // we'll just skip the checking here.
-  switch (param->kind_)
-    {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_enum:
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-    case CORBA::tk_boolean:
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-    case CORBA::tk_longdouble:
-    case CORBA::tk_wchar:
-      break;
-    case CORBA::tk_any:
-      retval = TAO_Marshal_Any::deep_free (param, source, dest, ACE_TRY_ENV);
-      break;
-    case CORBA::tk_TypeCode:
-      retval = TAO_Marshal_TypeCode::deep_free (param, source, dest, ACE_TRY_ENV);
-      break;
-    case CORBA::tk_Principal:
-      retval = TAO_Marshal_Principal::deep_free (param, source, dest, ACE_TRY_ENV);
-      break;
-    case CORBA::tk_objref:
-      retval = TAO_Marshal_ObjRef::deep_free (param, source, dest, ACE_TRY_ENV);
-      break;
-    case CORBA::tk_struct:
-      retval = TAO_Marshal_Struct::deep_free (param, source, dest, ACE_TRY_ENV);
-
-      // @@ It's likely that other types will need their top-level
-      // memory freed as well. --- Carlos (and Seth).
-      // delete source;
-      break;
-    case CORBA::tk_union:
-      retval = TAO_Marshal_Union::deep_free (param, source, dest, ACE_TRY_ENV);
-      break;
-    case CORBA::tk_string:
-      retval = TAO_Marshal_String::deep_free (param, source, dest, ACE_TRY_ENV);
-      break;
-    case CORBA::tk_sequence:
-      retval = TAO_Marshal_Sequence::deep_free (param, source, dest, ACE_TRY_ENV);
-      break;
-    case CORBA::tk_array:
-      retval = TAO_Marshal_Array::deep_free (param, source, dest, ACE_TRY_ENV);
-      break;
-    case CORBA::tk_alias:
-      retval = TAO_Marshal_Alias::deep_free (param, source, dest, ACE_TRY_ENV);
-      break;
-    case CORBA::tk_except:
-      retval = TAO_Marshal_Except::deep_free (param, source, dest, ACE_TRY_ENV);
-      break;
-    case CORBA::tk_wstring:
-      retval = TAO_Marshal_WString::deep_free (param, source, dest, ACE_TRY_ENV);
-      break;
-    default:
-      retval = CORBA::TypeCode::TRAVERSE_STOP;
-    } // end of switch
-
-  return retval;
-}
-
-// deep free for primitives
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Primitive::deep_free (CORBA::TypeCode_ptr  tc,
-                                  const void *,
-                                  const void *,
-                                  CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TCKind my_kind;
-
-  if (!tc)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Primitive::deep_free detected error\n"));
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP);
-    }
-
-  my_kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  switch (my_kind)
-    {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-    case CORBA::tk_wchar:
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_enum:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-    case CORBA::tk_double:
-    case CORBA::tk_longdouble:
-    case CORBA::tk_boolean:
-      break;
-    default:
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Primitive::deep_free detected error\n"));
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
-    }
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// deep_free structs
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Struct::deep_free (CORBA::TypeCode_ptr  tc,
-                               const void *source,
-                               const void *dest,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  if (!tc)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Struct::deep_free detected error\n"));
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP);
-    }
-
-  // In case this hasn't been done yet.
-  source = ptr_align_binary (source, 
-                             tc->alignment (ACE_TRY_ENV));
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
-  CORBA::TypeCode_ptr param;
-  CORBA::Long size, alignment, align_offset;
-
-  void *start_addr = (void *)source;
-
-  // Number of fields in the struct.
-  // compute the number of fields in the struct
-  int member_count = tc->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  for (int i = 0; i < member_count && retval ==
-         CORBA::TypeCode::TRAVERSE_CONTINUE; i++)
-    {
-      // get the typecode for the ith field
-      param = tc->member_type (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      // get the size of the field
-      size = param->size (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      alignment = param->alignment (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      align_offset =
-        (ptr_arith_t) ptr_align_binary (source, alignment)
-        - (ptr_arith_t) source
-        + (ptr_arith_t) ptr_align_binary (start_addr, alignment)
-        - (ptr_arith_t) start_addr;
-      // if both the start_addr and data are not aligned as per
-      // the alignment, we do not add the offset
-      source = (const void *) ((ptr_arith_t) source +
-                               ((align_offset == alignment) ?
-                               0 : align_offset));
-
-      // Since every exception-throwing function is followed by a break, we'll just
-      // check for exception after the switch.
-      switch (param->kind_)
-        {
-        case CORBA::tk_null:
-        case CORBA::tk_void:
-        case CORBA::tk_short:
-        case CORBA::tk_ushort:
-        case CORBA::tk_long:
-        case CORBA::tk_ulong:
-        case CORBA::tk_float:
-        case CORBA::tk_enum:
-        case CORBA::tk_double:
-        case CORBA::tk_longlong:
-        case CORBA::tk_ulonglong:
-        case CORBA::tk_boolean:
-        case CORBA::tk_char:
-        case CORBA::tk_octet:
-        case CORBA::tk_longdouble:
-        case CORBA::tk_wchar:
-          break;
-        case CORBA::tk_any:
-          retval = TAO_Marshal_Any::deep_free (param, source, dest, ACE_TRY_ENV);
-          break;
-        case CORBA::tk_TypeCode:
-          retval = TAO_Marshal_TypeCode::deep_free (param, source, dest, ACE_TRY_ENV);
-          break;
-        case CORBA::tk_Principal:
-          retval = TAO_Marshal_Principal::deep_free (param, source, dest, ACE_TRY_ENV);
-          break;
-
-        case CORBA::tk_objref:
-          {
-            typedef TAO_Object_Field_T<CORBA::Object,CORBA::Object_var>
-              TAO_Object_Field_Class;
-            TAO_Object_Field_Class* field =
-              ACE_reinterpret_cast (TAO_Object_Field_Class *,
-                                    ACE_const_cast (void *, source));
-            field->_release ();
-            retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
-          }
-        break;
-
-        case CORBA::tk_struct:
-          retval = TAO_Marshal_Struct::deep_free (param, source, dest, ACE_TRY_ENV);
-          break;
-        case CORBA::tk_union:
-          retval = TAO_Marshal_Union::deep_free (param, source, dest, ACE_TRY_ENV);
-          break;
-        case CORBA::tk_string:
-          retval = TAO_Marshal_String::deep_free (param, source, dest, ACE_TRY_ENV);
-          break;
-        case CORBA::tk_sequence:
-          retval = TAO_Marshal_Sequence::deep_free (param, source, dest, ACE_TRY_ENV);
-          break;
-        case CORBA::tk_array:
-          retval = TAO_Marshal_Array::deep_free (param, source, dest, ACE_TRY_ENV);
-          break;
-        case CORBA::tk_alias:
-          retval = TAO_Marshal_Alias::deep_free (param, source, dest, ACE_TRY_ENV);
-          break;
-        case CORBA::tk_except:
-          retval = TAO_Marshal_Except::deep_free (param, source, dest, ACE_TRY_ENV);
-          break;
-        case CORBA::tk_wstring:
-          retval = TAO_Marshal_WString::deep_free (param, source, dest, ACE_TRY_ENV);
-          break;
-        default:
-          retval = CORBA::TypeCode::TRAVERSE_STOP;
-        } // end of switch
-      source = (char *)source + size;
-    } // end of loop
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Struct::deep_free detected error\n"));
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
-    }
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// deep_free for union
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Union::deep_free (CORBA::TypeCode_ptr  tc,
-                              const void *data,
-                              const void *data2,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
-  CORBA::TypeCode_ptr discrim_tc;
-  CORBA::TypeCode_ptr member_tc;
-  CORBA::Any_ptr member_label;
-  const void *discrim_val;
-  CORBA::ULong member_count;
-  CORBA::Long  default_index;
-  CORBA::ULong i;
-  CORBA::TypeCode_ptr default_tc = 0;
-  CORBA::Boolean discrim_matched = 0;
-  TAO_Base_Union *base_union;
-  void *member_val;
-
-  // Get a base pointer so we can use the union's virtual functions.
-  base_union = ACE_reinterpret_cast (TAO_Base_Union *,
-                                     ACE_const_cast (void *,
-                                                     data));
-
-  discrim_tc = tc->discriminator_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  discrim_val = base_union->_discriminant ();
-  // Get a pointer to the discriminator value.
-
-  member_val = base_union->_access (0);
-  // Get a pointer to the member, but don't allocate new storage.
-
-  default_index = tc->default_index (ACE_TRY_ENV);
-  // now get ready to marshal the actual union value
-  ACE_CHECK_RETURN ( CORBA::TypeCode::TRAVERSE_STOP);
-
-  member_count = tc->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  // check which label value matches with the discriminator
-  // value. Accordingly, marshal the corresponding
-  // member_type. If none match, check if default exists
-  // and marshal accordingly. Otherwise it is an error.
-  for (i = 0; member_count-- != 0; i++)
-    {
-      member_label = tc->member_label (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN ( CORBA::TypeCode::TRAVERSE_STOP);
-
-      // do the matching
-      CORBA::TypeCode_var type = member_label->type ();
-      switch (type->kind (ACE_TRY_ENV))
-        {
-        case CORBA::tk_short:
-          if (*(CORBA::Short *)member_label->_tao_get_cdr ()->base () ==
-              *(CORBA::Short *)discrim_val)
-            discrim_matched = 1;
-          break;
-        case CORBA::tk_ushort:
-          if (*(CORBA::UShort *)member_label->_tao_get_cdr ()->base () ==
-              *(CORBA::UShort *)discrim_val)
-            discrim_matched = 1;
-          break;
-        case CORBA::tk_long:
-          if (*(CORBA::Long *)member_label->_tao_get_cdr ()->base () ==
-              *(CORBA::Long *)discrim_val)
-            discrim_matched = 1;
-          break;
-        case CORBA::tk_ulong:
-        case CORBA::tk_enum:
-          if (*(CORBA::ULong *)member_label->_tao_get_cdr ()->base () ==
-              *(CORBA::ULong *)discrim_val)
-            discrim_matched = 1;
-          break;
-        case CORBA::tk_char:
-          if (*(CORBA::Char *)member_label->_tao_get_cdr ()->base () ==
-              *(CORBA::Char *)discrim_val)
-            discrim_matched = 1;
-          break;
-        case CORBA::tk_wchar:
-          if (*(CORBA::WChar *)member_label->_tao_get_cdr ()->base () ==
-              *(CORBA::WChar *)discrim_val)
-            discrim_matched = 1;
-          break;
-        case CORBA::tk_boolean:
-          if (*(CORBA::Boolean *)member_label->_tao_get_cdr ()->base () ==
-              *(CORBA::Boolean *)discrim_val)
-            discrim_matched = 1;
-          break;
-        default:
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                            CORBA::TypeCode::TRAVERSE_STOP);
-        }// end of switch
-
-      // get the member typecode
-      member_tc = tc->member_type (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN ( CORBA::TypeCode::TRAVERSE_STOP);
-
-      if (default_index >= 0 && default_index-- == 0)
-        {
-          // have we reached the default label?, if so,
-          // save a handle to the typecode for the default
-          default_tc = member_tc;
-        }
-      if (discrim_matched)
-        {
-          // deep_free the discriminator value
-          retval = DEEP_FREE (discrim_tc,
-                              discrim_val,
-                              data2,
-                              ACE_TRY_ENV);
-
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-          if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
-            ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                              CORBA::TypeCode::TRAVERSE_STOP);
-
-          // marshal according to the matched typecode
-          return DEEP_FREE (member_tc,
-                            member_val,
-                            data2,
-                            ACE_TRY_ENV);
-        } // end of if
-    } // end of for
-
-  // we are here only if there was no match
-
-  // deep_free the discriminator value
-  retval = DEEP_FREE (discrim_tc,
-                      discrim_val,
-                      data2,
-                      ACE_TRY_ENV);
-
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                      CORBA::TypeCode::TRAVERSE_STOP);
-
-  if (default_tc)
-    return DEEP_FREE (default_tc,
-                      member_val,
-                      data2,
-                      ACE_TRY_ENV);
-  else
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// deep_free for Sequence
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Sequence::deep_free (CORBA::TypeCode_ptr  tc,
-                                 const void *source,
-                                 const void *,
-                                 CORBA::Environment &)
-{
-  // TAO implements sequences using inheritance from a base
-  // class. That class allocate  and deallocates the buffer, using
-  // virtual methods.
-
-  if (tc)
-    {
-      TAO_Base_Sequence *src =
-        ACE_reinterpret_cast(TAO_Base_Sequence*,ACE_const_cast(void*,source));
-
-      src->_deallocate_buffer ();
-      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-    }
-  return CORBA::TypeCode::TRAVERSE_STOP;
-}
-
-// deep_free for Array
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Array::deep_free (CORBA::TypeCode_ptr  tc,
-                              const void *source,
-                              const void *dest,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;  // return status
-  CORBA::TypeCode_ptr   tc2;  // typecode of the element
-  size_t  size; // size of element
-  CORBA::ULong  bounds;
-
-  // Rely on binary format of sequences -- all are the same
-  // except for the type pointed to by "buffer"
-
-  if (!tc)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Struct::deep_free detected error\n"));
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
-    }
-
-  bounds = tc->length (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
- // exception getting bounds
-
-  // get element typecode
-  tc2 = tc->content_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-  // exception computing content type
-
-  // get the size of the element type
-  size = tc2->size (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  switch (tc2->kind_)
-    {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-    case CORBA::tk_boolean:
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-    case CORBA::tk_longdouble:
-    case CORBA::tk_wchar:
-    case CORBA::tk_enum:
-      //                      CORBA::release (tc2);
-      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-      // handle all aggregate types here
-    case CORBA::tk_any:
-      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          retval = TAO_Marshal_Any::deep_free (tc2, source, dest, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-          source = (char *)source + size;
-        }
-      break;
-    case CORBA::tk_TypeCode:
-      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          retval = TAO_Marshal_TypeCode::deep_free (tc2, source, dest, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-          source = (char *)source + size;
-        }
-      break;
-    case CORBA::tk_Principal:
-      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          retval = TAO_Marshal_Principal::deep_free (tc2, source, dest, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-          source = (char *)source + size;
-        }
-      break;
-    case CORBA::tk_objref:
-      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          retval = TAO_Marshal_ObjRef::deep_free (tc2, source, dest, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-          source = (char *)source + size;
-        }
-      break;
-    case CORBA::tk_struct:
-      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          retval = TAO_Marshal_Struct::deep_free (tc2, source, dest, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-          source = (char *)source + size;
-        }
-      break;
-    case CORBA::tk_union:
-      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          retval = TAO_Marshal_Union::deep_free (tc2, source, dest, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-          source = (char *)source + size;
-        }
-      break;
-    case CORBA::tk_string:
-      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          retval = TAO_Marshal_String::deep_free (tc2, source, dest, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-          source = (char *)source + size;
-        }
-      break;
-    case CORBA::tk_sequence:
-      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          retval = TAO_Marshal_Sequence::deep_free (tc2, source, dest, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-          source = (char *)source + size;
-        }
-      break;
-    case CORBA::tk_array:
-      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          retval = TAO_Marshal_Array::deep_free (tc2, source, dest, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-          source = (char *)source + size;
-        }
-      break;
-    case CORBA::tk_alias:
-      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          retval = TAO_Marshal_Alias::deep_free (tc2, source, dest, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-          source = (char *)source + size;
-        }
-      break;
-    case CORBA::tk_except:
-      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          retval = TAO_Marshal_Except::deep_free (tc2, source, dest, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-          source = (char *)source + size;
-        }
-      break;
-    case CORBA::tk_wstring:
-      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          retval = TAO_Marshal_WString::deep_free (tc2, source, dest, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-          source = (char *)source + size;
-        }
-      break;
-    default:
-      retval = CORBA::TypeCode::TRAVERSE_STOP;
-      break;
-    } // end of switch
-  //              CORBA::release (tc2);
-  if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Sequence::deep_free detected error\n"));
-      // error exit
-      ACE_THROW_RETURN (CORBA::MARSHAL (), CORBA::TypeCode::TRAVERSE_STOP);
-    }
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// deep_free alias
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Alias::deep_free (CORBA::TypeCode_ptr  tc,
-                              const void *source,
-                              const void *dest,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TypeCode_ptr   tc2;  // typecode of the aliased type
-  CORBA::TypeCode::traverse_status   retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE; // status of encode operation
-
-  if (!tc)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Alias::deep_free detected error\n"));
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
-    }
-
-  // get element type
-  tc2 = tc->content_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-  // exception getting content_type
-
-  // switch on the data type and handle the cases for primitives here for
-  // efficiency
-  switch (tc2->kind_)
-    {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_enum:
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-    case CORBA::tk_boolean:
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-    case CORBA::tk_longdouble:
-    case CORBA::tk_wchar:
-      //              CORBA::release (tc2);
-      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-    case CORBA::tk_any:
-      retval = TAO_Marshal_Any::deep_free (tc2, source, dest, ACE_TRY_ENV);
-      break;
-    case CORBA::tk_TypeCode:
-      retval = TAO_Marshal_TypeCode::deep_free (tc2, source, dest, ACE_TRY_ENV);
-      break;
-    case CORBA::tk_Principal:
-      retval = TAO_Marshal_Principal::deep_free (tc2, source, dest, ACE_TRY_ENV);
-      break;
-    case CORBA::tk_objref:
-      retval = TAO_Marshal_ObjRef::deep_free (tc2, source, dest, ACE_TRY_ENV);
-      break;
-    case CORBA::tk_struct:
-      retval = TAO_Marshal_Struct::deep_free (tc2, source, dest, ACE_TRY_ENV);
-      break;
-    case CORBA::tk_union:
-      retval = TAO_Marshal_Union::deep_free (tc2, source, dest, ACE_TRY_ENV);
-      break;
-    case CORBA::tk_string:
-      retval = TAO_Marshal_String::deep_free (tc2, source, dest, ACE_TRY_ENV);
-      break;
-    case CORBA::tk_sequence:
-      retval = TAO_Marshal_Sequence::deep_free (tc2, source, dest, ACE_TRY_ENV);
-      break;
-    case CORBA::tk_array:
-      retval = TAO_Marshal_Array::deep_free (tc2, source, dest, ACE_TRY_ENV);
-      break;
-    case CORBA::tk_alias:
-      retval = TAO_Marshal_Alias::deep_free (tc2, source, dest, ACE_TRY_ENV);
-      break;
-    case CORBA::tk_except:
-      retval = TAO_Marshal_Except::deep_free (tc2, source, dest, ACE_TRY_ENV);
-      break;
-    case CORBA::tk_wstring:
-      retval = TAO_Marshal_WString::deep_free (tc2, source, dest, ACE_TRY_ENV);
-      break;
-    default:
-      // anything else is an error
-      retval = CORBA::TypeCode::TRAVERSE_STOP;
-    }
-  //      CORBA::release (tc2);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      // We should never reach here.
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Alias::decode detected error\n"));
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
-    }
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// deep_free structs
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Except::deep_free (CORBA::TypeCode_ptr  tc,
-                               const void *,
-                               const void *,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-#if 0
-  // temporarily commented out to make compiler happy
-  CORBA::Long i,
-    member_count;      // number of fields in the struct
-  CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
-  CORBA::TypeCode_ptr param;
-  CORBA::Long size, alignment;
-#endif /* 0 */
-
-  if (!tc)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Except::deep_free detected error\n"));
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
-    }
-    // XXX: Exceptions are currently leaked because of bugs lurking
-    // in this area.  Keep in mind that there are two things to
-    // free: (a) the typecode in the exception base class; (b) any
-    // pointers held by a user-defined exception, such as an objref
-    // or string.
-    //
-    // Since this code does nothing, it should leak BOTH of those
-    // kinds of memory.  Since it's not supposed to be called except
-    // when the exception really is being freed, it should only be
-    // called when the reference count in the exception base class
-    // is zero.
-    //
-    // It's not clear which of those assertions actually hold.
-    //
-    // The code SHOULD be just like the traverse () call for a
-    // structure, with (a) a precondition that the reference count
-    // is zero, (b) an assertion that the typecode in the exception
-    // and "tc" are equivalent, (c) releasing that typecode found
-    // within the exception.
-    //
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
diff --git a/TAO/tao/default.bld b/TAO/tao/default.bld
deleted file mode 100644
index 46fd517391f..00000000000
--- a/TAO/tao/default.bld
+++ /dev/null
@@ -1,24 +0,0 @@
-#!build
-default:
-	nobuild
-	:cx_template_option=noautomatic
-	:optimize=standard
-	:optimize=memory
-	:optimize=loop
-	:debuglevel=multi
-	:cx_template=never
-	:defines=TAO_PLATFORM_SVC_CONF_FILE_NOTSUP
-tao.bld
-	library
-	:cx_e_option=msgnumbers
-	:dependency=nodepend
-	:object_dir=./.obj
-	:cx_silent=21
-	:cx_silent=191
-	:cx_silent=610
-	:sourcedirs=/home/ace/ACE_wrappers.latest
-	:sourcedirs=..
-	:sourcedirs=./compat
-	:libraries=/appl/newgreen/vxppc603/ghsbltin.o
-	:libraries=/appl/newgreen/vxppc603/ghsmath.o
-	:defines=DEBUG
diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp
deleted file mode 100644
index d9e3afd421a..00000000000
--- a/TAO/tao/default_client.cpp
+++ /dev/null
@@ -1,240 +0,0 @@
-// $Id$
-
-#include "tao/default_client.h"
-#include "tao/ORB_Core.h"
-#include "tao/Wait_Strategy.h"
-#include "tao/Transport_Mux_Strategy.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/default_client.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, default_client, "$Id$")
-
-TAO_Default_Client_Strategy_Factory::TAO_Default_Client_Strategy_Factory (void)
-  : profile_lock_type_ (TAO_THREAD_LOCK),
-    cached_connector_lock_type_ (TAO_THREAD_LOCK)
-{
-  // Use single thread client connection handler
-#if defined (TAO_USE_ST_CLIENT_CONNECTION_HANDLER)
-  this->wait_strategy_ = TAO_WAIT_ON_REACTOR;
-#else
-  this->wait_strategy_ = TAO_WAIT_ON_LEADER_FOLLOWER;
-#endif /* TAO_USE_ST_CLIENT_CONNECTION_HANDLER */
-
-#if defined (TAO_USE_MUXED_TRANSPORT_MUX_STRATEGY)
-  this->transport_mux_strategy_ = TAO_MUXED_TMS;
-#else
-  this->transport_mux_strategy_ = TAO_EXCLUSIVE_TMS;
-#endif /* TAO_USE_MUXED_TRANSPORT_MUX_STRATEGY */
-
-// #if defined (TAO_USE_WAIT_ON_READ)
-//   this->wait_strategy_ = TAO_WAIT_ON_LEADER_FOLLOWER;
-// #elif defined (TAO_USE_WAIT_ON_REACTOR)
-//   this->wait_strategy_ = TAO_WAIT_ON_REACTOR;
-// #else
-//   this->wait_strategy_ = TAO_WAIT_ON_READ;
-// #endif /* TAO_USE_WAIT_ON_LEADER_FOLLOWER */
-}
-
-TAO_Default_Client_Strategy_Factory::~TAO_Default_Client_Strategy_Factory (void)
-{
-}
-
-int
-TAO_Default_Client_Strategy_Factory::init (int argc, char *argv[])
-{
-  return this->parse_args (argc, argv);
-}
-
-int
-TAO_Default_Client_Strategy_Factory::parse_args (int argc, char ** argv)
-{
-  ACE_TRACE ("TAO_Default_Client_Strategy_Factory::parse_args");
-
-  int curarg;
-
-  for (curarg = 0; curarg < argc && argv[curarg]; curarg++)
-    {
-      if (ACE_OS::strcasecmp (argv[curarg],
-                              "-ORBProfileLock") == 0)
-        {
-        curarg++;
-        if (curarg < argc)
-          {
-            char *name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    "thread") == 0)
-              this->profile_lock_type_ = TAO_THREAD_LOCK;
-            else if (ACE_OS::strcasecmp (name,
-                                         "null") == 0)
-              this->profile_lock_type_ = TAO_NULL_LOCK;
-          }
-        }
-
-      else if (ACE_OS::strcasecmp (argv[curarg],
-                                   "-ORBIIOPProfileLock") == 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "WARNING: The -ORBIIOPProfileLock option"
-                      " is deprecated and will be removed.\n"
-                      "         Please use -ORBProfileLock instead\n"));
-          curarg++;
-          if (curarg < argc)
-            {
-              char *name = argv[curarg];
-
-              if (ACE_OS::strcasecmp (name,
-                                      "thread") == 0)
-                this->profile_lock_type_ = TAO_THREAD_LOCK;
-              else if (ACE_OS::strcasecmp (name,
-                                           "null") == 0)
-                this->profile_lock_type_ = TAO_NULL_LOCK;
-            }
-        }
-
-      else if (ACE_OS::strcasecmp (argv[curarg],
-                                   "-ORBClientConnectionHandler") == 0)
-        {
-          curarg++;
-          if (curarg < argc)
-            {
-              char *name = argv[curarg];
-
-              if (ACE_OS::strcasecmp (name,
-                                      "MT") == 0)
-                this->wait_strategy_ = TAO_WAIT_ON_LEADER_FOLLOWER;
-              else if (ACE_OS::strcasecmp (name,
-                                           "ST") == 0)
-                this->wait_strategy_ = TAO_WAIT_ON_REACTOR;
-              else if (ACE_OS::strcasecmp (name,
-                                           "RW") == 0)
-                this->wait_strategy_ = TAO_WAIT_ON_READ;
-            }
-        }
-      else if (ACE_OS::strcmp (argv[curarg],
-                               "-ORBTransportMuxStrategy") == 0)
-        {
-          curarg++;
-          if (curarg < argc)
-            {
-              char *name = argv[curarg];
-
-              if (ACE_OS::strcasecmp (name,
-                                      "MUXED") == 0)
-                this->transport_mux_strategy_ = TAO_MUXED_TMS;
-              else if (ACE_OS::strcasecmp (name,
-                                           "EXCLUSIVE") == 0)
-                this->transport_mux_strategy_ = TAO_EXCLUSIVE_TMS;
-            }
-        }
-
-      else if (ACE_OS::strcasecmp (argv[curarg],
-                                   "-ORBConnectorLock") == 0)
-        {
-          curarg++;
-          if (curarg < argc)
-            {
-              char *name = argv[curarg];
-              
-              if (ACE_OS::strcasecmp (name,
-                                      "thread") == 0)
-                this->cached_connector_lock_type_ = TAO_THREAD_LOCK;
-              else if (ACE_OS::strcasecmp (name,
-                                           "null") == 0)
-                this->cached_connector_lock_type_ = TAO_NULL_LOCK;
-            }
-        }
-    }
-  return 0;
-}
-
-ACE_Lock *
-TAO_Default_Client_Strategy_Factory::create_profile_lock (void)
-{
-  ACE_Lock *the_lock = 0;
-
-  if (this->profile_lock_type_ == TAO_NULL_LOCK)
-    ACE_NEW_RETURN (the_lock,
-                    ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX> (),
-                    0);
-  else
-    ACE_NEW_RETURN (the_lock,
-                    ACE_Lock_Adapter<ACE_SYNCH_MUTEX> (),
-                    0);
-
-  return the_lock;
-}
-
-// @@ Alex: implement the WS and TMS methods here, similar to the
-//    create_profile_lock above...
-// @@ Alex: remember your idea of using the
-//    -ORBclientconnectionhandler option to implement the WS factory,
-//    but you need new options for the TMS...
-
-// Create the correct client transport muxing strategy.
-TAO_Transport_Mux_Strategy *
-TAO_Default_Client_Strategy_Factory::create_transport_mux_strategy (TAO_ORB_Core *orb_core)
-{
-  TAO_Transport_Mux_Strategy *tms = 0;
-
-  if (this->transport_mux_strategy_ == TAO_MUXED_TMS)
-    ACE_NEW_RETURN (tms,
-                    TAO_Muxed_TMS (orb_core),
-                    0);
-  else
-    ACE_NEW_RETURN (tms,
-                    TAO_Exclusive_TMS (orb_core),
-                    0);
-
-  return tms;
-}
-
-TAO_Wait_Strategy *
-TAO_Default_Client_Strategy_Factory::create_wait_strategy (TAO_Transport *transport)
-{
-  TAO_Wait_Strategy *ws = 0;
-
-  if (this->wait_strategy_ == TAO_WAIT_ON_READ)
-    ACE_NEW_RETURN (ws,
-                    TAO_Wait_On_Read (transport),
-                    0);
-  else if (this->wait_strategy_ == TAO_WAIT_ON_REACTOR)
-    ACE_NEW_RETURN (ws,
-                    TAO_Wait_On_Reactor (transport),
-                    0);
-  else
-    ACE_NEW_RETURN (ws,
-                    TAO_Wait_On_Leader_Follower (transport),
-                    0);
-
-  return ws;
-}
-
-ACE_Lock *
-TAO_Default_Client_Strategy_Factory::create_cached_connector_lock (void)
-{
-  ACE_Lock *the_lock = 0;
-
-  if (this->cached_connector_lock_type_ == TAO_NULL_LOCK)
-    ACE_NEW_RETURN (the_lock,
-                    ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX>,
-                    0);
-  else
-    ACE_NEW_RETURN (the_lock,
-                    ACE_Lock_Adapter<ACE_SYNCH_MUTEX>,
-                    0);
-
-  return the_lock;
-}
-
-// ****************************************************************
-
-ACE_STATIC_SVC_DEFINE (TAO_Default_Client_Strategy_Factory,
-                       ASYS_TEXT ("Client_Strategy_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_Default_Client_Strategy_Factory),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-ACE_FACTORY_DEFINE (TAO, TAO_Default_Client_Strategy_Factory)
diff --git a/TAO/tao/default_client.h b/TAO/tao/default_client.h
deleted file mode 100644
index 17955110798..00000000000
--- a/TAO/tao/default_client.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//     default_client.h
-//
-// = AUTHOR
-//     Chris Cleeland
-//
-// ============================================================================
-
-#ifndef TAO_DEFAULT_CLIENT_H
-#define TAO_DEFAULT_CLIENT_H
-
-#include "tao/Client_Strategy_Factory.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Config.h"
-
-class TAO_Export TAO_Default_Client_Strategy_Factory : public TAO_Client_Strategy_Factory
-{
-  // = TITLE
-  //   This is the "default" client strategy factor for TAO.  It
-  //   includes strategies that are configured through command-line
-  //   options so that everything operates as if there were no
-  //   dynamically-linkable strategies.
-public:
-  // = Initialization and termination methods.
-  TAO_Default_Client_Strategy_Factory (void);
-  // Constructor.
-
-  virtual ~TAO_Default_Client_Strategy_Factory (void);
-  // Destructor.
-
-  // = Service Configurator hooks.
-  virtual int init (int argc, char* argv[]);
-  // Dynamic linking hook
-
-  int parse_args (int argc, char* argv[]);
-  // Parse svc.conf arguments
-
-  // = Check Client_Strategy_Factory.h for the documentation of the
-  //   following methods.
-  ACE_Lock* create_profile_lock (void);
-  TAO_Transport_Mux_Strategy *create_transport_mux_strategy (TAO_ORB_Core *orb_core);
-  TAO_Wait_Strategy *create_wait_strategy (TAO_Transport *transport);
-  virtual ACE_Lock *create_cached_connector_lock (void);
-
-private:
-  enum Lock_Type
-  {
-    TAO_NULL_LOCK,
-    TAO_THREAD_LOCK
-  };
-
-  Lock_Type profile_lock_type_;
-  // the lock type for forwarding IIOP Profile
-
-  enum Transport_Mux_Strategy
-  {
-    TAO_MUXED_TMS,
-    TAO_EXCLUSIVE_TMS
-  };
-
-  Transport_Mux_Strategy transport_mux_strategy_;
-  // The client Request Mux Strategy.
-
-  enum Wait_Strategy
-  {
-    TAO_WAIT_ON_LEADER_FOLLOWER,
-    TAO_WAIT_ON_REACTOR,
-    TAO_WAIT_ON_READ
-  };
-
-  Wait_Strategy wait_strategy_;
-  // The wait-for-reply strategy.
-
-  Lock_Type cached_connector_lock_type_;
-  // Type of lock used by the cached connector.
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/default_client.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_STATIC_SVC_DECLARE (TAO_Default_Client_Strategy_Factory)
-ACE_FACTORY_DECLARE (TAO, TAO_Default_Client_Strategy_Factory)
-
-#endif /* TAO_DEFAULT_CLIENT_H */
diff --git a/TAO/tao/default_client.i b/TAO/tao/default_client.i
deleted file mode 100644
index da77e5c9936..00000000000
--- a/TAO/tao/default_client.i
+++ /dev/null
@@ -1,4 +0,0 @@
-// $Id$
-
-// This is the inline file, which probably shouldn't be used since all
-// the methods are virtual and will be dynamically linked in anyway.
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
deleted file mode 100644
index 433ac742f64..00000000000
--- a/TAO/tao/default_resource.cpp
+++ /dev/null
@@ -1,487 +0,0 @@
-// $Id$
-
-#include "tao/default_resource.h"
-#include "tao/Client_Strategy_Factory.h"
-#include "tao/Server_Strategy_Factory.h"
-#include "tao/ORB_Core.h"
-#include "tao/debug.h"
-#include "tao/IIOP_Factory.h"
-#include "tao/UIOP_Factory.h"
-#include "tao/Acceptor_Registry.h"
-#include "tao/Connector_Registry.h"
-
-#include "ace/Select_Reactor.h"
-#include "ace/FlReactor.h"
-#include "ace/WFMO_Reactor.h"
-#include "ace/Msg_WFMO_Reactor.h"
-#include "ace/TP_Reactor.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/Arg_Shifter.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/default_resource.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, default_resource, "$Id$")
-
-TAO_Default_Resource_Factory::TAO_Default_Resource_Factory (void)
-  : use_tss_resources_ (0),
-    use_locked_data_blocks_ (1),
-    reactor_type_ (TAO_REACTOR_SELECT_MT),
-    cdr_allocator_type_ (TAO_ALLOCATOR_THREAD_LOCK),
-    protocol_factories_ ()
-{
-}
-
-TAO_Default_Resource_Factory::~TAO_Default_Resource_Factory (void)
-{
-  TAO_ProtocolFactorySetItor end = this->protocol_factories_.end ();
-
-  for (TAO_ProtocolFactorySetItor iterator =
-         this->protocol_factories_.begin ();
-       iterator != end;
-       ++iterator)
-    delete *iterator;
-
-  this->protocol_factories_.reset ();
-}
-
-int
-TAO_Default_Resource_Factory::init (int argc, char **argv)
-{
-  ACE_TRACE ("TAO_Default_Server_Strategy_Factory::parse_args");
-
-  for (int curarg = 0; curarg < argc; curarg++)
-    if (ACE_OS::strcasecmp (argv[curarg],
-                            "-ORBResources") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            char *name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    "global") == 0)
-              this->use_tss_resources_ = 0;
-            else if (ACE_OS::strcasecmp (name,
-                                         "tss") == 0)
-              this->use_tss_resources_ = 1;
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBReactorLock") == 0)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Default_Resource obsolete -ORBReactorLock "
-                    "option, please use -ORBReactorType\n"));
-        curarg++;
-        if (curarg < argc)
-          {
-            char *name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name, "null") == 0)
-              reactor_type_ = TAO_REACTOR_SELECT_ST;
-            else if (ACE_OS::strcasecmp (name, "token") == 0)
-              reactor_type_= TAO_REACTOR_SELECT_MT;
-          }
-      }
-
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBReactorType") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            char *name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    "select_mt") == 0)
-              reactor_type_ = TAO_REACTOR_SELECT_MT;
-            else if (ACE_OS::strcasecmp (name,
-                                         "select_st") == 0)
-              reactor_type_ = TAO_REACTOR_SELECT_ST;
-            else if (ACE_OS::strcasecmp (name,
-                                         "fl") == 0)
-#if defined(ACE_HAS_FL)
-              reactor_type_ = TAO_REACTOR_FL;
-#else
-              ACE_DEBUG ((LM_DEBUG,
-                          "TAO_Default_Factory - FlReactor"
-                          " not supported on this platform\n"));
-#endif /* ACE_HAS_FL */
-            else if (ACE_OS::strcasecmp (name,
-                                         "wfmo") == 0)
-#if defined(ACE_WIN32)
-              reactor_type_ = TAO_REACTOR_WFMO;
-#else
-              ACE_DEBUG ((LM_DEBUG,
-                          "TAO_Default_Factory - WFMO Reactor"
-                          " not supported on this platform\n"));
-#endif /* ACE_WIN32 */
-            else if (ACE_OS::strcasecmp (name,
-                                         "msg_wfmo") == 0)
-#if defined(ACE_WIN32)
-              reactor_type_ = TAO_REACTOR_MSGWFMO;
-#else
-              ACE_DEBUG ((LM_DEBUG,
-                          "TAO_Default_Factory - MsgWFMO Reactor"
-                          " not supported on this platform\n"));
-#endif /* ACE_WIN32 */
-
-            else if (ACE_OS::strcasecmp (name,
-                                         "tp") == 0)
-              reactor_type_ = TAO_REACTOR_TP;
-            else
-              ACE_DEBUG ((LM_DEBUG,
-                          "TAO_Default_Factory - unknown argument"
-                          " <%s> for -ORBreactortype\n", name));
-          }
-      }
-
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBInputCDRAllocator") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            char *name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    "null") == 0)
-              {
-                this->cdr_allocator_type_ = TAO_ALLOCATOR_NULL_LOCK;
-                this->use_locked_data_blocks_ = 0;
-              }
-            else if (ACE_OS::strcasecmp (name,
-                                         "thread") == 0)
-              {
-                this->cdr_allocator_type_ = TAO_ALLOCATOR_THREAD_LOCK;
-                this->use_locked_data_blocks_ = 1;
-              }
-          }
-      }
-
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBProtocolFactory") == 0)
-      {
-        TAO_ProtocolFactorySet *pset = this->get_protocol_factories ();
-        curarg++;
-        if (curarg < argc)
-          {
-            TAO_Protocol_Item *item = 0;
-            ACE_NEW_RETURN (item,
-                            TAO_Protocol_Item (argv[curarg]),
-                            -1);
-            if (pset->insert (item) == -1)
-              ACE_ERROR ((LM_ERROR,
-                          "(%P|%t) Unable to add protocol factories for %s: %p\n",
-                          argv[curarg]));
-          }
-      }
-
-  return 0;
-}
-
-int
-TAO_Default_Resource_Factory::init_protocol_factories (void)
-{
-  TAO_ProtocolFactorySetItor end = protocol_factories_.end ();
-  TAO_ProtocolFactorySetItor factory = protocol_factories_.begin ();
-
-  if (factory == end)
-    {
-      TAO_Protocol_Factory *protocol_factory = 0;
-      TAO_Protocol_Item *item = 0;
-
-      protocol_factory =
-        ACE_Dynamic_Service<TAO_Protocol_Factory>::instance ("IIOP_Factory");
-
-      if (protocol_factory == 0)
-        {
-          if (TAO_orbdebug)
-            ACE_ERROR ((LM_WARNING,
-                        "TAO (%P|%t) No %s found in Service Repository.  "
-                        "Using default instance IIOP Protocol Factory.\n"));
-
-          ACE_NEW_RETURN (protocol_factory,
-                          TAO_IIOP_Protocol_Factory,
-                          -1);
-        }
-
-      ACE_NEW_RETURN (item, TAO_Protocol_Item ("IIOP_Factory"), -1);
-      item->factory (protocol_factory);
-
-      if (this->protocol_factories_.insert (item) == -1)
-        {
-          delete item;
-          delete protocol_factory;
-
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "TAO (%P|%t) Unable to add "
-                             "<%s> to protocol factory set.\n",
-                             item->protocol_name ().c_str ()),
-                            -1);
-        }
-
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) Loaded default protocol <IIOP_Factory>\n"));
-        }
-
-#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-      protocol_factory =
-        ACE_Dynamic_Service<TAO_Protocol_Factory>::instance ("UIOP_Factory");
-
-      if (protocol_factory == 0)
-        {
-          if (TAO_orbdebug)
-            ACE_ERROR ((LM_WARNING,
-                        "(%P|%t) WARNING - No %s found in Service Repository."
-                        "  Using default instance.\n",
-                        "UIOP Protocol Factory"));
-
-          ACE_NEW_RETURN (protocol_factory,
-                          TAO_UIOP_Protocol_Factory,
-                          -1);
-        }
-
-      ACE_NEW_RETURN (item, TAO_Protocol_Item ("UIOP_Factory"), -1);
-      item->factory (protocol_factory);
-
-      if (this->protocol_factories_.insert (item) == -1)
-        {
-          delete item;
-          delete protocol_factory;
-
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "TAO (%P|%t) Unable to add "
-                             "<%s> to protocol factory set.\n",
-                             item->protocol_name ().c_str ()),
-                            -1);
-        }
-
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) Loaded default protocol <UIOP_Factory>\n"));
-        }
-#endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
-      return 0;
-    }
-
-  for (; factory != end; factory++)
-    {
-      const ACE_CString &name = (*factory)->protocol_name ();
-      (*factory)->factory (
-        ACE_Dynamic_Service<TAO_Protocol_Factory>::instance (name.c_str ()));
-      if ((*factory)->factory () == 0)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "TAO (%P|%t) Unable to load protocol <%s>, %p\n",
-                             name.c_str (), ""),
-                            -1);
-        }
-
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) Loaded protocol <%s>\n",
-                      name.c_str ()));
-        }
-    }
-  return 0;
-}
-
-int
-TAO_Default_Resource_Factory::use_tss_resources (void) const
-{
-  return this->use_tss_resources_;
-}
-
-int
-TAO_Default_Resource_Factory::use_locked_data_blocks (void) const
-{
-  return this->use_locked_data_blocks_;
-}
-
-TAO_ProtocolFactorySet *
-TAO_Default_Resource_Factory::get_protocol_factories (void)
-{
-  return &protocol_factories_;
-}
-
-TAO_Acceptor_Registry*
-TAO_Default_Resource_Factory::get_acceptor_registry (void)
-{
-  return new TAO_Acceptor_Registry;
-}
-
-TAO_Connector_Registry*
-TAO_Default_Resource_Factory::get_connector_registry (void)
-{
-  return new TAO_Connector_Registry;
-}
-
-// @@ TODO We may be changing the state of the global
-//    Allocated_Resources structure, but without any locks?
-//    It seems to be done all over the place.
-
-ACE_Reactor_Impl*
-TAO_Default_Resource_Factory::allocate_reactor_impl (void) const
-{
-  ACE_Reactor_Impl *impl = 0;
-  switch (this->reactor_type_)
-    {
-    default:
-    case TAO_REACTOR_SELECT_MT:
-      ACE_NEW_RETURN (impl, TAO_REACTOR, 0);
-      break;
-
-    case TAO_REACTOR_SELECT_ST:
-      ACE_NEW_RETURN (impl, TAO_NULL_LOCK_REACTOR, 0);
-      break;
-
-    case TAO_REACTOR_FL:
-#if defined(ACE_HAS_FL)
-      ACE_NEW_RETURN (impl, ACE_FlReactor, 0);
-#endif /* ACE_HAS_FL */
-      break;
-
-    case TAO_REACTOR_WFMO:
-#if defined(ACE_WIN32) && !defined (ACE_HAS_WINCE)
-      ACE_NEW_RETURN (impl, ACE_WFMO_Reactor, 0);
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE */
-      break;
-
-    case TAO_REACTOR_MSGWFMO:
-#if defined(ACE_WIN32)
-      ACE_NEW_RETURN (impl, ACE_Msg_WFMO_Reactor, 0);
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE */
-      break;
-
-    case TAO_REACTOR_TP:
-      ACE_NEW_RETURN (impl, ACE_TP_Reactor, 0);
-      break;
-    }
-  return impl;
-}
-
-ACE_Reactor *
-TAO_Default_Resource_Factory::get_reactor (void)
-{
-  ACE_LOG_MSG->errnum (0);
-
-  ACE_Reactor *reactor = 0;
-  ACE_NEW_RETURN (reactor,
-                  ACE_Reactor (this->allocate_reactor_impl (), 1),
-                  0);
-
-  if (ACE_LOG_MSG->errnum () != 0)
-    {
-      delete reactor;
-      reactor = 0;
-    }
-
-  return reactor;
-}
-
-typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_Null_Mutex> NULL_LOCK_MALLOC;
-typedef ACE_Allocator_Adapter<NULL_LOCK_MALLOC> NULL_LOCK_ALLOCATOR;
-
-typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX> LOCKED_MALLOC;
-typedef ACE_Allocator_Adapter<LOCKED_MALLOC> LOCKED_ALLOCATOR;
-
-ACE_Allocator *
-TAO_Default_Resource_Factory::input_cdr_dblock_allocator (void)
-{
-  ACE_Allocator *allocator = 0;
-  switch (this->cdr_allocator_type_)
-    {
-    case TAO_ALLOCATOR_NULL_LOCK:
-      ACE_NEW_RETURN (allocator,
-                      NULL_LOCK_ALLOCATOR,
-                      0);
-      break;
-
-    case TAO_ALLOCATOR_THREAD_LOCK:
-    default:
-      ACE_NEW_RETURN (allocator,
-                      LOCKED_ALLOCATOR,
-                      0);
-      break;
-    }
-
-  return allocator;
-}
-
-ACE_Allocator *
-TAO_Default_Resource_Factory::input_cdr_buffer_allocator (void)
-{
-  ACE_Allocator *allocator = 0;
-  switch (this->cdr_allocator_type_)
-    {
-    case TAO_ALLOCATOR_NULL_LOCK:
-      ACE_NEW_RETURN (allocator,
-                      NULL_LOCK_ALLOCATOR,
-                      0);
-      break;
-
-    case TAO_ALLOCATOR_THREAD_LOCK:
-    default:
-      ACE_NEW_RETURN (allocator,
-                      LOCKED_ALLOCATOR,
-                      0);
-      break;
-    }
-
-  return allocator;
-}
-
-ACE_Allocator*
-TAO_Default_Resource_Factory::output_cdr_dblock_allocator (void)
-{
-  ACE_Allocator *allocator = 0;
-  ACE_NEW_RETURN (allocator, NULL_LOCK_ALLOCATOR, 0);
-  return allocator;
-}
-
-ACE_Allocator *
-TAO_Default_Resource_Factory::output_cdr_buffer_allocator (void)
-{
-  ACE_Allocator *allocator = 0;
-  ACE_NEW_RETURN (allocator, NULL_LOCK_ALLOCATOR, 0);
-  return allocator;
-}
-
-// ****************************************************************
-
-ACE_STATIC_SVC_DEFINE (TAO_Default_Resource_Factory,
-                       ASYS_TEXT ("Resource_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_Default_Resource_Factory),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-ACE_FACTORY_DEFINE (TAO, TAO_Default_Resource_Factory)
-
-// ****************************************************************
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX>;
-template class ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX> >;
-
-template class ACE_Select_Reactor_Token_T<ACE_Noop_Token>;
-template class ACE_Lock_Adapter<ACE_Select_Reactor_Token_T<ACE_Noop_Token> >;
-template class ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Noop_Token> >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX> >
-
-#pragma instantiate ACE_Select_Reactor_Token_T<ACE_Noop_Token>
-#pragma instantiate ACE_Lock_Adapter< ACE_Select_Reactor_Token_T<ACE_Noop_Token> >
-#pragma instantiate ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Noop_Token> >
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h
deleted file mode 100644
index 551311386e1..00000000000
--- a/TAO/tao/default_resource.h
+++ /dev/null
@@ -1,123 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   default_resource.h
-//
-// = AUTHOR
-//   Chris Cleeland
-//   Carlos O'Ryan
-//
-// ============================================================================
-
-#ifndef TAO_DEFAULT_RESOURCE_H
-#define TAO_DEFAULT_RESOURCE_H
-
-#include "tao/Resource_Factory.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Singleton.h"
-#include "ace/Service_Config.h"
-
-class TAO_Object_Adapter;
-
-// ****************************************************************
-
-class TAO_Default_Resource_Factory : public TAO_Resource_Factory
-{
-  // = TITLE
-  //   TAO's default resource factory
-  //
-  // = DESCRIPTION
-  //   Using a <{resource source specifier}> as a discriminator, the
-  //   factory can return resource instances which are, e.g., global,
-  //   stored in thread-specific storage, stored in shared memory,
-  //   etc.
-  //
-public:
-  // = Initialization and termination methods.
-  TAO_Default_Resource_Factory (void);
-  // Constructor.
-
-  virtual ~TAO_Default_Resource_Factory (void);
-  // Destructor.
-
-  // = Service Configurator hooks.
-  virtual int init (int argc, char* argv[]);
-  // Dynamic linking hook
-
-  int parse_args (int argc, char* argv[]);
-  // Parse svc.conf arguments
-
-  // = Member Accessors
-  enum
-  {
-    TAO_ALLOCATOR_NULL_LOCK,
-    TAO_ALLOCATOR_THREAD_LOCK
-  };
-
-  // = Type of Reactor
-  enum
-  {
-    TAO_REACTOR_SELECT_MT, // Use ACE_Token
-    TAO_REACTOR_SELECT_ST, // Use ACE_Noop_Token
-    TAO_REACTOR_FL,
-    TAO_REACTOR_WFMO,
-    TAO_REACTOR_MSGWFMO,
-    TAO_REACTOR_TP
-  };
-
-  int cdr_allocator_source (void);
-  // Modify and get the source for the CDR allocators
-
-  // = Resource Retrieval
-  virtual int use_tss_resources (void) const;
-  virtual int use_locked_data_blocks (void) const;
-  virtual ACE_Reactor *get_reactor (void);
-  virtual TAO_Acceptor_Registry  *get_acceptor_registry (void);
-  virtual TAO_Connector_Registry *get_connector_registry (void);
-  virtual ACE_Allocator* input_cdr_dblock_allocator (void);
-  virtual ACE_Allocator* input_cdr_buffer_allocator (void);
-  virtual ACE_Allocator* output_cdr_dblock_allocator (void);
-  virtual ACE_Allocator* output_cdr_buffer_allocator (void);
-  virtual TAO_ProtocolFactorySet *get_protocol_factories (void);
-  virtual int init_protocol_factories (void);
-
-protected:
-  virtual ACE_Reactor_Impl *allocate_reactor_impl (void) const;
-  // Obtain the reactor implementation
-
-protected:
-  int use_tss_resources_;
-  // Flag indicating whether resources should be global or
-  // thread-specific.
-
-  int use_locked_data_blocks_;
-  // The type of data blocks that the ORB should use
-
-  int reactor_type_;
-  // Flag indicating which kind of reactor we should use.
-
-  int cdr_allocator_type_;
-  // The type of CDR allocators.
-
-  TAO_ProtocolFactorySet protocol_factories_;
-  // list of loaded protocol factories.
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao/default_resource.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_STATIC_SVC_DECLARE (TAO_Default_Resource_Factory)
-ACE_FACTORY_DECLARE (TAO, TAO_Default_Resource_Factory)
-
-#endif /* TAO_DEFAULT_CLIENT_H */
diff --git a/TAO/tao/default_resource.i b/TAO/tao/default_resource.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/tao/default_resource.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp
deleted file mode 100644
index 227199232af..00000000000
--- a/TAO/tao/default_server.cpp
+++ /dev/null
@@ -1,371 +0,0 @@
-// $Id$
-
-#include "tao/default_server.h"
-#include "tao/ORB_Core.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/default_client.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, default_server, "$Id$")
-
-TAO_Default_Server_Strategy_Factory::TAO_Default_Server_Strategy_Factory (void)
-  : activate_server_connections_ (0),
-    thread_flags_ (THR_BOUND),
-    poa_lock_type_ (TAO_THREAD_LOCK),
-    event_loop_lock_type_ (TAO_NULL_LOCK)
-{
-}
-
-TAO_Default_Server_Strategy_Factory::~TAO_Default_Server_Strategy_Factory (void)
-{
-  // Perform appropriate cleanup.
-}
-
-int
-TAO_Default_Server_Strategy_Factory::enable_poa_locking (void)
-{
-  switch (this->poa_lock_type_)
-    {
-    case TAO_NULL_LOCK:
-      return 0;
-    case TAO_THREAD_LOCK:
-    default:
-      return 1;
-    }
-}
-
-int
-TAO_Default_Server_Strategy_Factory::activate_server_connections (void)
-{
-  return this->activate_server_connections_;
-}
-
-int
-TAO_Default_Server_Strategy_Factory::server_connection_thread_flags (void)
-{
-  return this->thread_flags_;
-}
-
-int
-TAO_Default_Server_Strategy_Factory::server_connection_thread_count (void)
-{
-  return 1;
-}
-
-ACE_Lock *
-TAO_Default_Server_Strategy_Factory::create_event_loop_lock (void)
-{
-  ACE_Lock *the_lock = 0;
-
-  if (this->event_loop_lock_type_ == TAO_NULL_LOCK)
-    ACE_NEW_RETURN (the_lock,
-                    ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX>,
-                    0);
-  else
-    ACE_NEW_RETURN (the_lock,
-                    ACE_Lock_Adapter<ACE_SYNCH_RECURSIVE_MUTEX>,
-                    0);
-
-  return the_lock;
-}
-
-// Evil macros b/c I'm lazy!
-#define TAO_BEGINCHECK  if (0)
-#define TAO_CHECKANDSET(sym) \
-  else if (ACE_OS::strcmp (flag, #sym) == 0) \
-  ACE_SET_BITS (this->thread_flags_, sym)
-#define TAO_ENDCHECK
-
-void
-TAO_Default_Server_Strategy_Factory::tokenize (char *flag_string)
-{
-  char *lasts = 0;
-
-  for (char *flag = ACE_OS::strtok_r (flag_string,
-                                      "|",
-                                      &lasts);
-       flag != 0;
-       flag = ACE_OS::strtok_r (0,
-                                "|",
-                                &lasts))
-    {
-      TAO_BEGINCHECK;
-      TAO_CHECKANDSET (THR_DETACHED);
-      TAO_CHECKANDSET (THR_BOUND);
-      TAO_CHECKANDSET (THR_NEW_LWP);
-      TAO_CHECKANDSET (THR_SUSPENDED);
-#if !defined (ACE_WIN32)
-      TAO_CHECKANDSET (THR_DAEMON);
-#endif /* ACE_WIN32 */
-      TAO_ENDCHECK;
-    }
-}
-
-int
-TAO_Default_Server_Strategy_Factory::init (int argc, char *argv[])
-{
-  return this->parse_args (argc, argv);
-}
-
-int
-TAO_Default_Server_Strategy_Factory::open (TAO_ORB_Core *)
-{
-  return 0;
-}
-
-int
-TAO_Default_Server_Strategy_Factory::parse_args (int argc, char *argv[])
-{
-  ACE_TRACE ("TAO_Default_Server_Strategy_Factory::parse_args");
-
-  int curarg;
-
-  for (curarg = 0; curarg < argc && argv[curarg]; curarg++)
-    if (ACE_OS::strcasecmp (argv[curarg],
-                            "-ORBConcurrency") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            char *name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    "reactive") == 0)
-              this->activate_server_connections_ = 0;
-            else if (ACE_OS::strcasecmp (name,
-                                         "thread-per-connection") == 0)
-              this->activate_server_connections_ = 1;
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBTableSize") == 0
-             || ACE_OS::strcasecmp (argv[curarg],
-                                    "-ORBActiveObjectMapSize") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          this->active_object_map_creation_parameters_.active_object_map_size_ =
-            ACE_OS::strtoul (argv[curarg],
-                             0,
-                             10);
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBPOAMapSize") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          this->active_object_map_creation_parameters_.poa_map_size_ =
-            ACE_OS::strtoul (argv[curarg],
-                             0,
-                             10);
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBActiveHintInIds") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            char *value = argv[curarg];
-
-            this->active_object_map_creation_parameters_.use_active_hint_in_ids_ =
-              ACE_OS::atoi (value);
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBActiveHintInPOANames") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            char *value = argv[curarg];
-
-            this->active_object_map_creation_parameters_.use_active_hint_in_poa_names_ =
-              ACE_OS::atoi (value);
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBAllowReactivationOfSystemids") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            char *value = argv[curarg];
-
-            this->active_object_map_creation_parameters_.allow_reactivation_of_system_ids_ =
-              ACE_OS::atoi (value);
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBUseridPolicyDemuxStrategy") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            char *name = argv[curarg];
-
-            // Active demux not supported with user id policy.
-            if (ACE_OS::strcasecmp (name,
-                                    "dynamic") == 0)
-              this->active_object_map_creation_parameters_.object_lookup_strategy_for_user_id_policy_ =
-                TAO_DYNAMIC_HASH;
-            else if (ACE_OS::strcasecmp (name,
-                                         "linear") == 0)
-              this->active_object_map_creation_parameters_.object_lookup_strategy_for_user_id_policy_ =
-                TAO_LINEAR;
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBSystemidPolicyDemuxStrategy") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            char *name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    "dynamic") == 0)
-              this->active_object_map_creation_parameters_.object_lookup_strategy_for_system_id_policy_ =
-                TAO_DYNAMIC_HASH;
-            else if (ACE_OS::strcasecmp (name,
-                                         "linear") == 0)
-              this->active_object_map_creation_parameters_.object_lookup_strategy_for_system_id_policy_ =
-                TAO_LINEAR;
-            else if (ACE_OS::strcasecmp (name,
-                                         "active") == 0)
-              this->active_object_map_creation_parameters_.object_lookup_strategy_for_system_id_policy_ =
-                TAO_ACTIVE_DEMUX;
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBPersistentidPolicyDemuxStrategy") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            char *name = argv[curarg];
-
-            // Active demux not supported with user id policy.
-            if (ACE_OS::strcasecmp (name,
-                                    "dynamic") == 0)
-              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_persistent_id_policy_ =
-                TAO_DYNAMIC_HASH;
-            else if (ACE_OS::strcasecmp (name,
-                                         "linear") == 0)
-              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_persistent_id_policy_ =
-                TAO_LINEAR;
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBTransientidPolicyDemuxStrategy") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            char *name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    "dynamic") == 0)
-              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_transient_id_policy_ =
-                TAO_DYNAMIC_HASH;
-            else if (ACE_OS::strcasecmp (name,
-                                         "linear") == 0)
-              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_transient_id_policy_ =
-                TAO_LINEAR;
-            else if (ACE_OS::strcasecmp (name,
-                                         "active") == 0)
-              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_transient_id_policy_ =
-                TAO_ACTIVE_DEMUX;
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBUniqueidPolicyReverseDemuxStrategy") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            char *name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    "dynamic") == 0)
-              this->active_object_map_creation_parameters_.reverse_object_lookup_strategy_for_unique_id_policy_ =
-                TAO_DYNAMIC_HASH;
-            else if (ACE_OS::strcasecmp (name,
-                                         "linear") == 0)
-              this->active_object_map_creation_parameters_.reverse_object_lookup_strategy_for_unique_id_policy_ =
-                TAO_LINEAR;
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBDemuxStrategy") == 0)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    "Warning: -ORBDemuxStrategy is deprecated.  Please use "
-                    "-ORBSystemidPolicyDemuxStrategy or -ORBUseridPolicyDemuxStrategy instead.\n"));
-        curarg++;
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBPOALock") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            char *name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    "thread") == 0)
-              this->poa_lock_type_ = TAO_THREAD_LOCK;
-            else if (ACE_OS::strcasecmp (name,
-                                         "null") == 0)
-              this->poa_lock_type_ = TAO_NULL_LOCK;
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBEventLoopLock") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            char *name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    "thread") == 0)
-              this->event_loop_lock_type_ = TAO_THREAD_LOCK;
-            else if (ACE_OS::strcasecmp (name,
-                                         "null") == 0)
-              this->event_loop_lock_type_ = TAO_NULL_LOCK;
-          }
-      }
-
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBConnectorLock") == 0)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) WARNING: the "
-                    "-ORBConnectorLock option is in the client "
-                    "strategy factory now\n"));
-      }
-
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBThreadFlags") == 0)
-      {
-        curarg++;
-
-        if (curarg < argc)
-          this->tokenize (argv[curarg]);
-      }
-
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-ACE_STATIC_SVC_DEFINE (TAO_Default_Server_Strategy_Factory,
-                       ASYS_TEXT ("Server_Strategy_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_Default_Server_Strategy_Factory),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-ACE_FACTORY_DEFINE (TAO, TAO_Default_Server_Strategy_Factory)
diff --git a/TAO/tao/default_server.h b/TAO/tao/default_server.h
deleted file mode 100644
index e0448c30e96..00000000000
--- a/TAO/tao/default_server.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     default_server.h
-//
-// = AUTHOR
-//     Chris Cleeland
-//
-// ============================================================================
-
-#ifndef TAO_DEFAULT_SERVER_FACTORY_H
-#define TAO_DEFAULT_SERVER_FACTORY_H
-
-#include "tao/Server_Strategy_Factory.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Config.h"
-
-class TAO_Export TAO_Default_Server_Strategy_Factory : public TAO_Server_Strategy_Factory
-{
-  // = TITLE
-  //   This is the default strategy factory for CORBA servers.  It
-  //   allows developers to choose strategies via argument flags.
-  //   This design gives substantial freedom for experimentation.
-  //
-  // = DESCRIPTION
-
-
-public:
-  // = Initialization and termination methods.
-  TAO_Default_Server_Strategy_Factory (void);
-  virtual ~TAO_Default_Server_Strategy_Factory (void);
-
-  // = Service Configurator hooks.
-  virtual int init (int argc, char *argv[]);
-
-  // = The TAO_Server_Strategy_Factory methods, please read the
-  //   documentation in "tao/Server_Strategy_Factory.h"
-  virtual int open (TAO_ORB_Core*);
-  virtual int enable_poa_locking (void);
-  virtual int activate_server_connections (void);
-  virtual int server_connection_thread_flags (void);
-  virtual int server_connection_thread_count (void);
-
-  virtual ACE_Lock *create_event_loop_lock (void);
-  // If the ORB is single threaded or some form of ORB-per-thread then
-  // it is more efficient to use a Null_Mutex for the variables
-  // controlling the event loop (termination). Otherwise a
-  // Recursive_Thread_Mutex or Thread_Mutex may be required.
-
-  int parse_args (int argc, char *argv[]);
-  // Parse the arguments, check the documentation in
-  // $TAO_ROOT/docs/Options.html for details
-
-protected:
-  void tokenize (char *flag_string);
-
-protected:
-  int activate_server_connections_;
-  // Should the server connection handlers run in their own thread?
-
-  u_long thread_flags_;
-  // Default thread flags passed to thr_create().
-
-  enum Lock_Type
-  {
-    TAO_NULL_LOCK,
-    TAO_THREAD_LOCK
-  };
-
-  Lock_Type poa_lock_type_;
-  // The type of lock to be returned by <create_poa_lock()>.
-
-  Lock_Type event_loop_lock_type_;
-  // The type of lock to be returned by <create_event_loop_lock()>.
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/default_server.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_STATIC_SVC_DECLARE (TAO_Default_Server_Strategy_Factory)
-ACE_FACTORY_DECLARE (TAO, TAO_Default_Server_Strategy_Factory)
-
-#endif /* TAO_DEFAULT_SERVER_FACTORY_H */
diff --git a/TAO/tao/default_server.i b/TAO/tao/default_server.i
deleted file mode 100644
index da77e5c9936..00000000000
--- a/TAO/tao/default_server.i
+++ /dev/null
@@ -1,4 +0,0 @@
-// $Id$
-
-// This is the inline file, which probably shouldn't be used since all
-// the methods are virtual and will be dynamically linked in anyway.
diff --git a/TAO/tao/encode.cpp b/TAO/tao/encode.cpp
deleted file mode 100644
index 1676ee0183d..00000000000
--- a/TAO/tao/encode.cpp
+++ /dev/null
@@ -1,1249 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    encode.cpp
-//
-// = DESCRIPTION
-//   Code for encoding different data types
-//
-//   The original code had a single static encoder function defined on
-//   the CDR class that called traverse to interpret the data types.
-//   This version defines a virtual method "encode" on each class and
-//   avoids calling traverse.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//     and Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "tao/Marshal.h"
-#include "tao/CDR.h"
-#include "tao/Environment.h"
-#include "tao/Any.h"
-#include "tao/Object.h"
-#include "tao/Stub.h"
-#include "tao/Principal.h"
-#include "tao/varout.h"
-#include "tao/Union.h"
-#include "tao/debug.h"
-
-ACE_RCSID(tao, encode, "$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.
-
-typedef TAO_Object_Field_T<CORBA::Object,CORBA::Object_var> TAO_Object_Field_Class;
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Primitive::encode (CORBA::TypeCode_ptr tc,
-                               const void *data,
-                               const void *,
-                               void *context,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Boolean continue_encoding = 1;
-  TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE; // status of encode operation
-
-  switch (tc->kind_)
-    {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-      break;
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-      continue_encoding = stream->write_short (*(CORBA::Short *) data);
-      break;
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_enum:
-      continue_encoding = stream->write_long (*(CORBA::Long *) data);
-      break;
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-      continue_encoding = stream->write_longlong (*(CORBA::LongLong *) data);
-      break;
-    case CORBA::tk_boolean:
-      continue_encoding = stream->write_boolean (*(CORBA::Boolean *) data);
-      break;
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-      continue_encoding = stream->write_char (*(CORBA::Char *) data);
-      break;
-    case CORBA::tk_longdouble:
-      continue_encoding = stream->write_longdouble (*(CORBA::LongDouble *) data);
-      break;
-    case CORBA::tk_wchar:
-      continue_encoding = stream->write_wchar (*(CORBA::WChar *) data);
-      break;
-    default:
-      retval = CORBA::TypeCode::TRAVERSE_STOP;
-      // we are not a primitive type
-    }
-
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_encoding == 1)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Primitive::encode detected error\n"));
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                        CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
-    }
-}
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Any::encode (CORBA::TypeCode_ptr,
-                         const void *data,
-                         const void *,
-                         void *context,
-                         CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Any *any = (CORBA::Any *) data;
-
-  TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
-
-  // Status of encode operation
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  // Typecode of the element that makes the Any.
-  CORBA::TypeCode_ptr elem_tc = any->type_;
-
-  // Encode the typecode description for the element.
-  retval = stream->encode (CORBA::_tc_TypeCode, &elem_tc, 0, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      // if the any owns the data, then the value is a CDR stream and
-      // we simply append the CDR stream
-      // The only exception is when the TypeCode is a tk_null, them
-      // both cdr_ and value_ are 0.
-      if (any->cdr_ != 0)
-        {
-          TAO_InputCDR in_strm (any->cdr_);
-          retval = stream->append (elem_tc, &in_strm, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-        }
-      else if (any->value_ != 0)
-        {
-          // encode the value
-          retval = stream->encode (elem_tc, any->value_, 0, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-        }
-    }
-
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Any::encode detected error\n"));
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                        CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
-    }
-}
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_TypeCode::encode (CORBA::TypeCode_ptr,
-                              const void *data,
-                              const void *,
-                              void *context,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Boolean continue_encoding = 1;
-  TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
-  CORBA::TypeCode_ptr tc2;         // typecode to be encoded
-
-  tc2 = *(CORBA::TypeCode_ptr *) data;  // the data has to be a TypeCode_ptr
-
-  // encode the "kind" field of the typecode
-  continue_encoding = stream->write_ulong ((CORBA::ULong) tc2->kind_);
-  if (continue_encoding == 1)
-    {
-      // now encode the parameters, if any
-      switch (tc2->kind_)
-        {
-          // Most TypeCodes have empty parameter lists
-        default:
-          break;
-
-          // A few have "simple" parameter lists
-        case CORBA::tk_string:
-        case CORBA::tk_wstring:
-          continue_encoding = stream->write_ulong (tc2->length (ACE_TRY_ENV));
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-          break;
-
-          // Indirected typecodes can't occur at "top level" like
-          // this, only nested inside others!
-        case ~0u:
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "indirected typecode at top level!\n"));
-          continue_encoding = 0;
-          break;
-
-          // The rest have "complex" parameter lists that are
-          // already encoded as bulk octets ... put length, then
-          // 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:
-          {
-            // simply encode the encapsulation
-            continue_encoding = stream->write_ulong (tc2->length_);
-            continue_encoding = continue_encoding
-              && stream->write_octet_array ((CORBA::Octet*)tc2->buffer_, tc2->length_);
-          }
-        }
-    }
-  if (continue_encoding == 1)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_TypeCode::encode detected error\n"));
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                        CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
-    }
-}
-
-// encode Principal
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Principal::encode (CORBA::TypeCode_ptr,
-                               const void *data,
-                               const void *,
-                               void *context,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
-
-  CORBA::Principal_ptr p = *(CORBA::Principal_ptr *) data;
-
-  if ((*stream << p) == 0)
-    {
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                        CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
-    }
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// encode obj ref
-CORBA::TypeCode::traverse_status
-TAO_Marshal_ObjRef::encode (CORBA::TypeCode_ptr,
-                            const void *data,
-                            const void *,
-                            void *context,
-                            CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
-
-  // Current version:  objref is really an TAO_Stub.
-  // @@ But, it need not be.  All IIOP specific processing has
-  //    been move to the specific transport profile class!
-  //
-  // XXX this doesn't actually verify that the stuff got written
-  // OK to the "wire" ...
-  // @@ Seems to break here!
-  CORBA::Object_ptr obj = *(CORBA::Object_ptr *) data;
-
-  if ((*stream << obj) == 0)
-    {
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                        CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
-    }
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// encode structs
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Struct::encode (CORBA::TypeCode_ptr tc,
-                            const void *data,
-                            const void *,
-                            void *context,
-                            CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
-  CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
-  CORBA::Boolean continue_encoding = 1;
-  CORBA::TypeCode_ptr param;
-  CORBA::Long size, alignment, align_offset;
-
-  void *start_addr = (void *)data;
-
-  int member_count = tc->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  for (int i = 0;
-       i < member_count && retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-         && continue_encoding == 1;
-       i++)
-    {
-      param = tc->member_type (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      size = param->size (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      alignment = param->alignment (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      align_offset =
-        (ptr_arith_t) ptr_align_binary (data, alignment)
-        - (ptr_arith_t) data
-        + (ptr_arith_t) ptr_align_binary (start_addr, alignment)
-        - (ptr_arith_t) start_addr;
-      // if both the start_addr and data are not aligned as per
-      // the alignment, we do not add the offset
-      data = (const void *) ((ptr_arith_t) data +
-                             ((align_offset == alignment) ?
-                              0 : align_offset));
-      switch (param->kind_)
-        {
-        case CORBA::tk_null:
-        case CORBA::tk_void:
-          break;
-        case CORBA::tk_short:
-        case CORBA::tk_ushort:
-          continue_encoding = stream->write_short (*(CORBA::Short *) data);
-          break;
-        case CORBA::tk_long:
-        case CORBA::tk_ulong:
-        case CORBA::tk_float:
-        case CORBA::tk_enum:
-          continue_encoding = stream->write_long (*(CORBA::Long *) data);
-          break;
-        case CORBA::tk_double:
-        case CORBA::tk_longlong:
-        case CORBA::tk_ulonglong:
-          continue_encoding = stream->write_longlong (*(CORBA::LongLong *) data);
-          break;
-        case CORBA::tk_boolean:
-          continue_encoding = stream->write_boolean (*(CORBA::Boolean *) data);
-          break;
-        case CORBA::tk_char:
-        case CORBA::tk_octet:
-          continue_encoding = stream->write_char (*(CORBA::Char *) data);
-          break;
-        case CORBA::tk_longdouble:
-          continue_encoding = stream->write_longdouble (*(CORBA::LongDouble *) data);
-          break;
-        case CORBA::tk_wchar:
-          continue_encoding = stream->write_wchar (*(CORBA::WChar *) data);
-          break;
-        case CORBA::tk_any:
-        case CORBA::tk_Principal:
-        case CORBA::tk_struct:
-        case CORBA::tk_union:
-        case CORBA::tk_sequence:
-        case CORBA::tk_array:
-        case CORBA::tk_alias:
-        case CORBA::tk_except:
-        case CORBA::tk_string:
-        case CORBA::tk_wstring:
-        case CORBA::tk_TypeCode:
-          retval = stream->encode (param, data, 0, ACE_TRY_ENV);
-          break;
-
-        case CORBA::tk_objref:
-          {
-            // we know that the object pointer is stored in a
-            // TAO_Object_Field_T parametrized type
-            TAO_Object_Field_Class* field =
-              ACE_reinterpret_cast (TAO_Object_Field_Class *,
-                                    ACE_const_cast (void *, data));
-            CORBA::Object_ptr ptr = field->_upcast ();
-            retval = stream->encode (param, &ptr, 0, ACE_TRY_ENV);
-          }
-          break;
-
-        default:
-          break;
-        }
-      data = (char *) data + size;
-    }
-
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_encoding == 1)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_Struct::encode detected error\n"));
-  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                    CORBA::COMPLETED_MAYBE),
-                    CORBA::TypeCode::TRAVERSE_STOP);
-}
-
-// encode unions
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Union::encode (CORBA::TypeCode_ptr tc,
-                           const void *data,
-                           const void *data2,
-                           void *context,
-                           CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
-
-  CORBA::TypeCode_ptr discrim_tc =
-    tc->discriminator_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-  // get the discriminator type
-
-  CORBA::TypeCode_ptr default_tc = 0;
-  CORBA::Boolean discrim_matched = 0;
-
-  TAO_Base_Union *base_union = (TAO_Base_Union *)data;
-  void *member_val;
-
-  // encode the discriminator value
-  const void *discrim_val = base_union->_discriminant ();
-  CORBA::TypeCode::traverse_status retval =
-    stream->encode (discrim_tc, discrim_val, data2, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
-    return retval;
-
-  CORBA::ULong discrim_size_with_pad =
-    tc->TAO_discrim_pad_size (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  // move the pointer to point to the actual value
-  data = (char *) data + discrim_size_with_pad;
-  data2 = (char *) data2 + discrim_size_with_pad;
-
-  // now get ready to marshal the actual union value
-  CORBA::Long default_index =
-    tc->default_index (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  // get the member count
-  CORBA::ULong member_count =
-    tc->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  // Check which label value matches with the
-  // discriminator value. Accordingly, marshal the
-  // corresponding member_type. If none match,
-  // check if default exists and marshal
-  // accordingly. Otherwise it is an error.
-  for (int i = 0; member_count-- != 0; i++)
-    {
-      CORBA::Any_ptr member_label =
-        tc->member_label (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      // do the matching
-      CORBA::TypeCode_var type = member_label->type ();
-      CORBA::ULong kind = type->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-      switch (kind)
-        {
-        case CORBA::tk_short:
-          {
-            CORBA::Short s;
-            *member_label >>= s;
-            if (s == *(CORBA::Short *) discrim_val)
-              discrim_matched = 1;
-          }
-          break;
-
-        case CORBA::tk_ushort:
-          {
-            CORBA::UShort s;
-            *member_label >>= s;
-            if (s == *(CORBA::UShort *) discrim_val)
-              discrim_matched = 1;
-          }
-          break;
-
-        case CORBA::tk_long:
-          {
-            CORBA::Long l;
-            *member_label >>= l;
-            if (l == *(CORBA::Long *) discrim_val)
-              discrim_matched = 1;
-          }
-          break;
-
-        case CORBA::tk_ulong:
-          {
-            CORBA::ULong l;
-            *member_label >>= l;
-            if (l == *(CORBA::ULong *) discrim_val)
-              discrim_matched = 1;
-          }
-          break;
-
-        case CORBA::tk_enum:
-          {
-            CORBA::ULong ul;
-            TAO_InputCDR stream (member_label->_tao_get_cdr ());
-            (void)stream.decode (discrim_tc, &ul, 0, ACE_TRY_ENV);
-            ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-            if (ul == *(CORBA::ULong *) discrim_val)
-              discrim_matched = 1;
-          }
-          break;
-
-        case CORBA::tk_char:
-          {
-            CORBA::Char c;
-            *member_label >>= CORBA::Any::to_char (c);
-            if (c == *(CORBA::Char *) discrim_val)
-              discrim_matched = 1;
-          }
-          break;
-
-        case CORBA::tk_wchar:
-          CORBA::WChar wc;
-          *member_label >>= CORBA::Any::to_wchar (wc);
-          if (wc == *(CORBA::WChar *) discrim_val)
-            discrim_matched = 1;
-          break;
-
-        case CORBA::tk_boolean:
-          {
-            CORBA::Boolean b;
-            *member_label >>= CORBA::Any::to_boolean (b);
-            if (b == *(CORBA::Boolean *) discrim_val)
-              discrim_matched = 1;
-          }
-          break;
-
-        default:
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "Union::encode - "
-                        "Bad discriminant type\n"));
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE,
-                                                 CORBA::COMPLETED_MAYBE),
-                            CORBA::TypeCode::TRAVERSE_STOP);
-        }// end of switch
-
-      // get the member typecode
-      CORBA::TypeCode_ptr member_tc =
-        tc->member_type (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      if (default_index >= 0 && default_index-- == 0)
-        {
-          // have we reached the default label?, if so,
-          // save a handle to the typecode for the default
-          default_tc = member_tc;
-        }
-      if (discrim_matched)
-        {
-          member_val = base_union->_access (0);
-          // marshal according to the matched typecode
-
-          if (member_tc->kind () == CORBA::tk_objref)
-            {
-              // we know that the object pointer is stored in a
-              // TAO_Object_Field_T parametrized type
-              TAO_Object_Field_Class* field =
-                ACE_reinterpret_cast (TAO_Object_Field_Class *,
-                                      member_val);
-              CORBA::Object_ptr ptr = field->_upcast ();
-              return stream->encode (member_tc, &ptr, data2, ACE_TRY_ENV);
-            }
-          else
-            {
-              return stream->encode (member_tc, member_val,
-                                     data2, ACE_TRY_ENV);
-            }
-        }
-    }
-  // we are here only if there was no match
-  if (default_tc)
-    {
-      member_val = base_union->_access (0);
-      if (default_tc->kind () == CORBA::tk_objref)
-        {
-          // we know that the object pointer is stored in a
-          // TAO_Object_Field_T parametrized type
-          TAO_Object_Field_Class* field =
-            ACE_reinterpret_cast (TAO_Object_Field_Class *,
-                                  member_val);
-          CORBA::Object_ptr ptr = field->_upcast ();
-          return stream->encode (default_tc, &ptr, data2, ACE_TRY_ENV);
-        }
-      else
-        {
-          return stream->encode (default_tc, member_val,
-                                 data2, ACE_TRY_ENV);
-        }
-    }
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "Union::encode - failed. "
-                "No match and no default case\n"));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    CORBA::TypeCode::TRAVERSE_STOP);
-}
-
-// encode string
-CORBA::TypeCode::traverse_status
-TAO_Marshal_String::encode (CORBA::TypeCode_ptr tc,
-                            const void *data,
-                            const void *,
-                            void *context,
-                            CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
-  CORBA::String str = *(CORBA::String *) data;
-
-  // Verify string satisfies bounds requirements.  We're not so
-  // permissive as to send messages violating the interface spec
-  // by having excessively long strings!
-  CORBA::ULong bounds = tc->length (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  if (str != 0)
-    {
-      CORBA::ULong length = ACE_OS::strlen (str);
-      if (bounds == 0 || bounds >= length)
-        if (stream->write_string (length, str))
-          return CORBA::TypeCode::TRAVERSE_CONTINUE;
-    }
-  else
-    {
-      if (stream->write_string (0, 0))
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-    }
-  return CORBA::TypeCode::TRAVERSE_STOP;
-}
-
-// encode sequence
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Sequence::encode (CORBA::TypeCode_ptr tc,
-                              const void *data,
-                              const void *,
-                              void *context,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Boolean continue_encoding = 1;
-  TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
-  TAO_Base_Sequence *seq = (TAO_Base_Sequence *)data;
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;  // return status
-  CORBA::TypeCode_ptr    tc2;  // typecode of the element
-  size_t  size; // size of element
-  CORBA::ULong  len = seq ? seq->length_ : 0;
-  char *value;
-
-  // First marshal the sequence length, verifying that it's within the
-  // sequence bounds ...
-
-  if (len > 0)
-    {
-      // retrieve the bounds of the sequence
-      CORBA::ULong bounds = tc->length (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      // encode only if it is an unbounded sequence or if length is
-      // less/equal to the bounds
-      if (bounds == 0 || len <= bounds)
-        {
-          // We just encode the current elements in the sequence
-          bounds = len;
-          continue_encoding = stream->write_ulong (bounds);
-          if (continue_encoding && bounds != 0)
-            {
-              // get element typecode
-              tc2 = tc->content_type (ACE_TRY_ENV);
-              ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-              size = tc2->size (ACE_TRY_ENV);
-              ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-              value = (char *) seq->buffer_;
-              switch (tc2->kind_)
-                {
-                case CORBA::tk_null:
-                case CORBA::tk_void:
-                  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-                case CORBA::tk_short:
-                case CORBA::tk_ushort:
-                  continue_encoding = continue_encoding &&
-                    stream->write_short_array
-                    ((CORBA::Short*)value, bounds);
-                  if (continue_encoding == 1)
-                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-
-                case CORBA::tk_long:
-                case CORBA::tk_ulong:
-                case CORBA::tk_float:
-                case CORBA::tk_enum:
-                  // For primitives, compute the size only once
-                  continue_encoding = continue_encoding &&
-                    stream->write_long_array
-                    ((CORBA::Long*)value, bounds);
-                  if (continue_encoding == 1)
-                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-
-                case CORBA::tk_double:
-                case CORBA::tk_longlong:
-                case CORBA::tk_ulonglong:
-                  // For primitives, compute the size only once
-                  continue_encoding = continue_encoding &&
-                    stream->write_longlong_array
-                    ((CORBA::LongLong*)value, bounds);
-                  if (continue_encoding == 1)
-                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-
-                case CORBA::tk_boolean:
-                  // For primitives, compute the size only once
-                  continue_encoding = continue_encoding &&
-                    stream->write_boolean_array
-                    ((CORBA::Boolean*)value, bounds);
-                  if (continue_encoding == 1)
-                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-
-                case CORBA::tk_char:
-                  // For primitives, compute the size only once
-                  continue_encoding = continue_encoding &&
-                    stream->write_char_array
-                    ((CORBA::Char*)value, bounds);
-                  if (continue_encoding == 1)
-                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-
-                case CORBA::tk_octet:
-#if !defined (TAO_NO_COPY_OCTET_SEQUENCES)
-                  // For primitives, compute the size only once
-                  continue_encoding = continue_encoding &&
-                    stream->write_octet_array
-                    ((CORBA::Octet*)value, bounds);
-#else
-                  {
-                    TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-                      ACE_dynamic_cast(TAO_Unbounded_Sequence<CORBA::Octet>*,seq);
-                    if (oseq->mb_ == 0)
-                      {
-                        continue_encoding = continue_encoding &&
-                          stream->write_octet_array
-                          ((CORBA::Octet*)value, bounds);
-                      }
-                    else
-                      {
-                        continue_encoding = continue_encoding &&
-                          stream->write_octet_array_mb (oseq->mb ());
-                      }
-                  }
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
-                  if (continue_encoding == 1)
-                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-
-                case CORBA::tk_longdouble:
-                  // For primitives, compute the size only once
-                  continue_encoding = continue_encoding &&
-                    stream->write_longdouble_array
-                    ((CORBA::LongDouble*)value, bounds);
-                  if (continue_encoding == 1)
-                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-
-                case CORBA::tk_wchar:
-                  // For primitives, compute the size only once
-                  continue_encoding = continue_encoding &&
-                    stream->write_wchar_array
-                    ((CORBA::WChar*)value, bounds);
-                  if (continue_encoding == 1)
-                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-
-                  // handle all aggregate types here
-
-                case CORBA::tk_any:
-                case CORBA::tk_TypeCode:
-                case CORBA::tk_Principal:
-                case CORBA::tk_struct:
-                case CORBA::tk_union:
-                case CORBA::tk_string:
-                case CORBA::tk_sequence:
-                case CORBA::tk_array:
-                case CORBA::tk_alias:
-                case CORBA::tk_except:
-                case CORBA::tk_wstring:
-                  // For those aggregate types whose size
-                  // is constant, we compute it only once
-                  while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                    {
-                      retval = stream->encode (tc2, value, 0, ACE_TRY_ENV);
-                      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-                      value += size;
-                    }
-                  //                              CORBA::release (tc2);
-                  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-
-                case CORBA::tk_objref:
-                  {
-                    size = sizeof (CORBA_Object_ptr);
-                    while (bounds-- &&
-                           retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                      {
-                        CORBA_Object_ptr ptr =
-                          seq->_upcast (value);
-                        retval = stream->encode (tc2, &ptr, 0,  ACE_TRY_ENV);
-                        ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-                        value += size;
-                      }
-                    if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                      return retval;
-                  }
-                  break;
-
-                default:
-                  break;
-                } // end of switch
-            } // seq length not 0
-        } // within bounds or unbounded
-    } // length is > 0
-  else
-    {
-      // length is 0, encode it
-      continue_encoding = stream->write_ulong (len);
-      if (continue_encoding == 1)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-    }
-
-  // If an error was detected but no exception was raised then raise a
-  // marshal exception.
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    CORBA::TypeCode::TRAVERSE_STOP);
-}
-
-// encode array
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Array::encode (CORBA::TypeCode_ptr tc,
-                           const void *data,
-                           const void *,
-                           void *context,
-                           CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Boolean continue_encoding = 1;
-  TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;  // return status
-  size_t  size; // size of element
-  CORBA::ULong  bounds;
-  char *value = (char *) data;
-
-  // retrieve the bounds of the array
-  bounds = tc->length (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  // get element typecode.
-  CORBA::TypeCode_ptr tc2 = tc->content_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  size = tc2->size (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  switch (tc2->kind_)
-    {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-      continue_encoding = continue_encoding &&
-        stream->write_short_array
-        ((CORBA::Short*)value, bounds);
-      if (continue_encoding == 1)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-      break;
-
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-      // For primitives, compute the size only once
-      continue_encoding = continue_encoding &&
-        stream->write_long_array
-        ((CORBA::Long*)value, bounds);
-      if (continue_encoding == 1)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-      break;
-
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-      // For primitives, compute the size only once
-      continue_encoding = continue_encoding &&
-        stream->write_longlong_array
-        ((CORBA::LongLong*)value, bounds);
-      if (continue_encoding == 1)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-      break;
-
-    case CORBA::tk_boolean:
-      // For primitives, compute the size only once
-      continue_encoding = continue_encoding &&
-        stream->write_boolean_array
-        ((CORBA::Boolean*)value, bounds);
-      if (continue_encoding == 1)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-      break;
-
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-      // For primitives, compute the size only once
-      continue_encoding = continue_encoding &&
-        stream->write_octet_array
-        ((CORBA::Octet*)value, bounds);
-      if (continue_encoding == 1)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-      break;
-
-    case CORBA::tk_longdouble:
-      // For primitives, compute the size only once
-      continue_encoding = continue_encoding &&
-        stream->write_longdouble_array
-        ((CORBA::LongDouble*)value, bounds);
-      if (continue_encoding == 1)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-      break;
-
-    case CORBA::tk_wchar:
-      // For primitives, compute the size only once
-      continue_encoding = continue_encoding &&
-        stream->write_wchar_array
-        ((CORBA::WChar*)value, bounds);
-      if (continue_encoding == 1)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-      break;
-
-    case CORBA::tk_enum:
-      // For primitives, compute the size only once
-      continue_encoding = continue_encoding &&
-        stream->write_long_array
-        ((CORBA::Long*)value, bounds);
-      if (continue_encoding == 1)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-      break;
-      // handle all aggregate types here
-
-    case CORBA::tk_any:
-    case CORBA::tk_TypeCode:
-    case CORBA::tk_Principal:
-    case CORBA::tk_objref:
-    case CORBA::tk_struct:
-    case CORBA::tk_union:
-    case CORBA::tk_string:
-    case CORBA::tk_sequence:
-    case CORBA::tk_array:
-    case CORBA::tk_alias:
-    case CORBA::tk_except:
-    case CORBA::tk_wstring:
-      // For those aggregate types whose size is constant, we
-      // compute it only once
-      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          retval = stream->encode (tc2, value, 0, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-          value += size;
-        }
-      //              CORBA::release (tc2);
-      if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-      break;
-    default:
-      break;
-    } // end of switch
-
-  // error exit
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_Sequence::encode detected error\n"));
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    CORBA::TypeCode::TRAVERSE_STOP);
-}
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Alias::encode (CORBA::TypeCode_ptr tc,
-                           const void *data,
-                           const void *,
-                           void *context,
-                           CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TypeCode_ptr tc2;  // typecode of the aliased type
-  CORBA::Boolean continue_encoding = 1;
-  TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
-  CORBA::TypeCode::traverse_status   retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE; // status of encode operation
-  char *value = (char *) data;
-
-  tc2 = tc->content_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  // switch on the data type and handle the cases for primitives here for
-  // efficiency rather than calling
-  switch (tc2->kind_)
-    {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-      break;
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-      continue_encoding = stream->write_short (*(CORBA::Short *) value);
-      break;
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_enum:
-      continue_encoding = stream->write_long (*(CORBA::Long *) value);
-      break;
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-      continue_encoding = stream->write_longlong (*(CORBA::LongLong *) value);
-      break;
-    case CORBA::tk_boolean:
-      continue_encoding = stream->write_boolean (*(CORBA::Boolean *) value);
-      break;
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-      continue_encoding = stream->write_char (*(CORBA::Char *) value);
-      break;
-    case CORBA::tk_longdouble:
-      continue_encoding = stream->write_longdouble (*(CORBA::LongDouble *) value);
-      break;
-    case CORBA::tk_wchar:
-      continue_encoding = stream->write_wchar (*(CORBA::WChar *) value);
-      break;
-    case CORBA::tk_any:
-    case CORBA::tk_TypeCode:
-    case CORBA::tk_Principal:
-    case CORBA::tk_objref:
-    case CORBA::tk_struct:
-    case CORBA::tk_union:
-    case CORBA::tk_string:
-    case CORBA::tk_sequence:
-    case CORBA::tk_array:
-    case CORBA::tk_alias:
-    case CORBA::tk_except:
-    case CORBA::tk_wstring:
-      retval = stream->encode (tc2, data, 0, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-      break;
-    default:
-      // anything else is an error
-      retval = CORBA::TypeCode::TRAVERSE_STOP;
-    }
-
-  //  tc2->_decr_refcnt ();
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_encoding == 1)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_Alias::encode detected error\n"));
-  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                    CORBA::COMPLETED_MAYBE),
-                    CORBA::TypeCode::TRAVERSE_STOP);
-}
-
-
-// encode exception
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Except::encode (CORBA::TypeCode_ptr tc,
-                            const void *data,
-                            const void *,
-                            void *context,
-                            CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
-  CORBA::Boolean continue_encoding = 1;
-  TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
-
-  CORBA::TypeCode_ptr param;
-  CORBA::Long size, alignment;
-
-  // first encode the RepositoryID which we can grab from the
-  // typecode pointer
-  continue_encoding = stream->write_string (tc->id (ACE_TRY_ENV));
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-#if defined (__BORLANDC__)
-  // Borland C++ Builder 4.0 doesn't seem to align caught exceptions
-  // along the correct boundaries!  Therefore we will assume that the
-  // data pointer passed in is already aligned correctly and we will
-  // calculate member alignments relative to this pointer.
-  char *base_ptr = (char *) data;
-#endif /* __BORLANDC__ */
-
-  data = (char *) data + sizeof (CORBA::Exception);
-  // @@ (ASG) The reason this is done is because we want to skip the size
-  // of the the base class and its private data members (type_ and
-  // refcount_). After skipping these data members, we will have the data
-  // members of the derived class which must be encoded.
-
-  int member_count = tc->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  for (int i = 0;
-       i < member_count && retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-         && continue_encoding == 1;
-       i++)
-    {
-      param = tc->member_type (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      size = param->size (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      alignment = param->alignment (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-#if defined (__BORLANDC__)
-      ptrdiff_t offset = (char *) data - base_ptr;
-      offset = (ptrdiff_t) ptr_align_binary (offset, alignment);
-      data = base_ptr + offset;
-#else
-      data = ptr_align_binary (data, alignment);
-#endif /* __BORLANDC__ */
-
-      switch (param->kind_)
-        {
-        case CORBA::tk_null:
-        case CORBA::tk_void:
-          break;
-        case CORBA::tk_short:
-        case CORBA::tk_ushort:
-          continue_encoding = stream->write_short (*(CORBA::Short *) data);
-          break;
-        case CORBA::tk_long:
-        case CORBA::tk_ulong:
-        case CORBA::tk_float:
-        case CORBA::tk_enum:
-          continue_encoding = stream->write_long (*(CORBA::Long *) data);
-          break;
-        case CORBA::tk_double:
-        case CORBA::tk_longlong:
-        case CORBA::tk_ulonglong:
-          continue_encoding = stream->write_longlong (*(CORBA::LongLong *) data);
-          break;
-        case CORBA::tk_boolean:
-          continue_encoding = stream->write_boolean (*(CORBA::Boolean *) data);
-          break;
-        case CORBA::tk_char:
-        case CORBA::tk_octet:
-          continue_encoding = stream->write_char (*(CORBA::Char *) data);
-          break;
-        case CORBA::tk_longdouble:
-          continue_encoding = stream->write_longdouble (*(CORBA::LongDouble *) data);
-          break;
-        case CORBA::tk_wchar:
-          continue_encoding = stream->write_wchar (*(CORBA::WChar *) data);
-          break;
-        case CORBA::tk_any:
-        case CORBA::tk_TypeCode:
-        case CORBA::tk_Principal:
-        case CORBA::tk_objref:
-        case CORBA::tk_struct:
-        case CORBA::tk_union:
-        case CORBA::tk_string:
-        case CORBA::tk_sequence:
-        case CORBA::tk_array:
-        case CORBA::tk_alias:
-        case CORBA::tk_except:
-        case CORBA::tk_wstring:
-          retval = stream->encode (param, data, 0, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-          break;
-        default:
-          break;
-        }
-      data = (char *) data + size;
-    }
-
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_encoding == 1)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_Except::encode detected error\n"));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                    CORBA::COMPLETED_MAYBE),
-                    CORBA::TypeCode::TRAVERSE_STOP);
-}
-
-
-// encode wstring
-CORBA::TypeCode::traverse_status
-TAO_Marshal_WString::encode (CORBA::TypeCode_ptr tc,
-                             const void *data,
-                             const void *,
-                             void *context,
-                             CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::WChar *str = *(CORBA::WChar **) data;
-  TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
-
-  // Verify string satisfies bounds requirements.  We're not so
-  // permissive as to send messages violating the interface spec
-  // by having excessively long strings!
-  CORBA::ULong bounds = tc->length (ACE_TRY_ENV);
-
-  if (str != 0)
-    {
-      // get the actual length of the string
-      CORBA::ULong len = ACE_OS::wslen ((CORBA::WChar *) str);
-
-      // if it is an unbounded string or if the length is less than the
-      // bounds for an unbounded string
-      if (bounds == 0 || len <= bounds)
-        if (stream->write_wstring (len, str))
-          return CORBA::TypeCode::TRAVERSE_CONTINUE;
-    }
-  else
-    {
-      if (stream->write_wstring (0, 0))
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-    }
-  return CORBA::TypeCode::TRAVERSE_STOP;
-}
diff --git a/TAO/tao/factories.h b/TAO/tao/factories.h
deleted file mode 100644
index 5e9d5a0001f..00000000000
--- a/TAO/tao/factories.h
+++ /dev/null
@@ -1,146 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//     factories.h
-//
-// = AUTHOR
-//     Chris Cleeland
-//
-// = VERSION
-//     $Id$
-// ============================================================================
-
-#ifndef TAO_FACTORIES_H
-#  define TAO_FACTORIES_H
-
-#if 0
-#  include "ace/SOCK_Acceptor.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#  include "ace/SOCK_Connector.h"
-#  include "ace/Strategies_T.h"
-#  include "ace/Connector.h"
-#  include "ace/Synch.h"
-
-#  include "tao/params.h"
-#  include "tao/connect.h"
-#  include "tao/objtable.h"
-#endif
-
-class TAO_Client_Connection_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-  // = TITLE
-  //      <Svc_Handler> used on the client side and returned
-  //      by the <TAO_Client_Factory::CONNECTOR>.
-{
-public:
-  TAO_Client_Connection_Handler (ACE_Thread_Manager* = 0);
-  // Do-nothing constructor
-
-  virtual int open (void*);
-  // Initialization hook
-
-  void in_use (CORBA::Boolean);
-  // Set the in-use flag.
-
-  CORBA::Boolean in_use (void);
-  // Return state of the in-use flag.
-
-private:
-  CORBA::Boolean in_use_;
-  // True value indicates that something is using this handler.
-};
-
-class TAO_Client_Factory
-  // = TITLE
-  //    Abstract factory used by the client to turn out various
-  //    strategies used on the client side.
-{
-public:
-  typedef ACE_Strategy_Connector<TAO_Client_Connection_Handler, ACE_SOCK_CONNECTOR>
-          CONNECTOR;
-  typedef ACE_NOOP_Creation_Strategy<TAO_Client_Connection_Handler>
-          NULL_CREATION_STRATEGY;
-  typedef ACE_Cached_Connect_Strategy<TAO_Client_Connection_Handler,
-                                      ACE_SOCK_CONNECTOR,
-                                      ACE_SYNCH_RW_MUTEX>
-          CACHED_CONNECT_STRATEGY;
-
-#if defined (TAO_HAS_CLIENT_CONCURRENCY)
-  CONCURRENCY_STRATEGY *concurrency_strategy (void);
-#endif
-
-  CONNECTOR *connector (void);
-  // Return a pointer to a connector using appropriate strategies.
-
-  TAO_Client_Factory (void);
-  ~TAO_Client_Factory (void);
-
-private:
-#if defined (TAO_HAS_CLIENT_CONCURRENCY)
-  CONCURRENCY_STRATEGY *concurrency_strategy_;
-#endif
-  CONNECTOR connector_;
-  NULL_CREATION_STRATEGY null_creation_strategy_;
-  CACHED_CONNECT_STRATEGY caching_connect_strategy_;
-};
-
-class TAO_Server_Factory
-  // = TITLE
-  //    Abstract factory used by the server side to turn out various
-  //    strategies of special utility to it.
-{
-public:
-  // = SERVER-SIDE
-  typedef ACE_Creation_Strategy<TAO_OA_Connection_Handler> CREATION_STRATEGY;
-  typedef ACE_Accept_Strategy<TAO_OA_Connection_Handler, ACE_SOCK_ACCEPTOR> ACCEPT_STRATEGY;
-  typedef ACE_Concurrency_Strategy<TAO_OA_Connection_Handler> CONCURRENCY_STRATEGY;
-  typedef ACE_Scheduling_Strategy<TAO_OA_Connection_Handler> SCHEDULING_STRATEGY;
-
-  CREATION_STRATEGY *creation_strategy (void);
-  // return concrete creation strategy
-
-  ACCEPT_STRATEGY *accept_strategy (void);
-  // return concrete acceptor strategy
-
-  CONCURRENCY_STRATEGY *concurrency_strategy (void);
-  // return the concurrency strategy used
-
-  SCHEDULING_STRATEGY *scheduling_strategy (void);
-  // return the scheduling strategy used
-
-  TAO_Object_Table *object_lookup_strategy (void);
-  // return the concrete object lookup strategy
-
-  TAO_Server_Factory (void);
-  // constructor
-
-private:
-  // = COMMON
-  ACE_Thread_Strategy<TAO_OA_Connection_Handler> threaded_strategy_;
-  // The threaded strategy used for passively establishing connections.
-  ACE_Reactive_Strategy<TAO_OA_Connection_Handler> reactive_strategy_;
-  // A strategy for passively establishing connections which utilizes the Reactor.
-
-  // = SERVER
-  CONCURRENCY_STRATEGY *concurrency_strategy_;
-  // concrete concurrency strategy
-
-  TAO_Object_Table *objtable_;
-  // instance of object table
-#if 0
-  // Someday we'll need these!
-  CREATION_STRATEGY *creation_strategy_;
-  ACCEPT_STRATEGY *accept_strategy_;
-  SCHEDULING_STRATEGY *scheduling_strategy_;
-#endif
-};
-
-#endif /* TAO_FACTORIES_H */
diff --git a/TAO/tao/orb.idl b/TAO/tao/orb.idl
deleted file mode 100644
index 2178f05af61..00000000000
--- a/TAO/tao/orb.idl
+++ /dev/null
@@ -1,10 +0,0 @@
-// $Id$
-
-// Included for compatibility with the CORBA 2 specification.
-
-#ifndef TAO_CORBA_IDL
-#define TAO_CORBA_IDL
-
-#include <Policy.pidl>
-
-#endif /* TAO_CORBA_IDL */
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
deleted file mode 100644
index 74bd38dd287..00000000000
--- a/TAO/tao/orbconf.h
+++ /dev/null
@@ -1,412 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// @ (#) $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     default_server.h
-//
-// = DESCRIPTION
-//     Build configuration file for the Inter-ORB Engine, and application
-//     level code using it via <corba.hh>
-//
-// = AUTHOR
-//     Copyright 1995 by Sun Microsystems, Inc.
-//
-//     TAO-specific changes by Chris Cleeland and Douglas C. Schmidt
-//
-// ============================================================================
-
-#ifndef TAO_ORB_CONFIG_H
-#define TAO_ORB_CONFIG_H
-
-#include "ace/OS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if !defined (TAO_REACTOR)
-#define TAO_REACTOR ACE_Select_Reactor
-#endif /* TAO_REACTOR */
-
-#if !defined (TAO_NULL_LOCK_REACTOR)
-#define TAO_NULL_LOCK_REACTOR ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Noop_Token> >
-#endif /* TAO_NULL_LOCK_REACTOR */
-
-// Users should override this stuff if they don't want to use the
-// default ACE Socket wrappers.  This makes it possible to change
-// TAO's transport mechanism wholesale by making a few minor changes
-// to the ACE config.h file.
-#if !defined (TAO_SOCK_STREAM)
-#define TAO_SOCK_STREAM ACE_SOCK_STREAM
-#define TAO_SOCK_Stream ACE_SOCK_Stream
-#endif /* TAO_SOCK_STREAM */
-
-#if !defined (TAO_SOCK_ACCEPTOR)
-#define TAO_SOCK_ACCEPTOR ACE_SOCK_ACCEPTOR
-#endif /* TAO_SOCK_ACCEPTOR */
-
-#if !defined (TAO_SOCK_CONNECTOR)
-#define TAO_SOCK_CONNECTOR ACE_SOCK_CONNECTOR
-#endif /* TAO_SOCK_CONNECTOR */
-
-//#define POA_NO_TIMESTAMP
-//
-// Define this if you don't want POA timestamps in the IOR.  Remember,
-// without timestamps, transient and persistent POA cannot be
-// distinguished
-
-//#define TAO_USE_DOTTED_DECIMAL_ADDRESSES
-//
-// If set the ORB will use dotted decimal addresses in the IORs it
-// exports, this is useful for platforms or environments that cannot
-// depend on a DNS beign available.
-
-// The default arguments of the resource factory for the fake service
-// configurator
-#if !defined (TAO_DEFAULT_RESOURCE_FACTORY_ARGS)
-#define TAO_DEFAULT_RESOURCE_FACTORY_ARGS "static Resource_Factory \"-ORBresources tss -ORBreactorlock null\""
-#endif /* TAO_DEFAULT_RESOURCE_FACTORY_ARGS */
-
-// The default arguments of the client strategy factory for the fake service
-// configurator
-#if !defined (TAO_DEFAULT_CLIENT_STRATEGY_FACTORY_ARGS)
-#define TAO_DEFAULT_CLIENT_STRATEGY_FACTORY_ARGS "static Client_Strategy_Factory \"\""
-#endif /* TAO_DEFAULT_CLIENT_STRATEGY_FACTORY_ARGS */
-
-// The default arguments of the server strategy factory for the fake service
-// configurator
-#if !defined (TAO_DEFAULT_SERVER_STRATEGY_FACTORY_ARGS)
-#define TAO_DEFAULT_SERVER_STRATEGY_FACTORY_ARGS  "static Server_Strategy_Factory \"-ORBconcurrency reactive -ORBsystemidpolicydemuxstrategy dynamic -ORBtablesize 128\""
-#endif /* TAO_DEFAULT_SERVER_STRATEGY_FACTORY_ARGS */
-
-// The default size of TAO's server active object map.
-#if !defined (TAO_DEFAULT_SERVER_ACTIVE_OBJECT_MAP_SIZE)
-# if defined (TAO_DEFAULT_SERVER_OBJECT_TABLE_SIZE)
-//
-// TAO_DEFAULT_SERVER_OBJECT_TABLE_SIZE is deprecated. Please use
-// TAO_DEFAULT_SERVER_ACTIVE_OBJECT_MAP_SIZE.
-//
-#  define TAO_DEFAULT_SERVER_ACTIVE_OBJECT_MAP_SIZE TAO_DEFAULT_SERVER_OBJECT_TABLE_SIZE
-# else
-#  define TAO_DEFAULT_SERVER_ACTIVE_OBJECT_MAP_SIZE 64
-# endif /* TAO_DEFAULT_SERVER_OBJECT_TABLE_SIZE */
-#endif /* ! TAO_DEFAULT_SERVER_ACTIVE_OBJECT_MAP_SIZE */
-
-// The default size of TAO's server poa map.
-#if !defined (TAO_DEFAULT_SERVER_POA_MAP_SIZE)
-#  define TAO_DEFAULT_SERVER_POA_MAP_SIZE 24
-#endif /* ! TAO_DEFAULT_SERVER_POA_MAP_SIZE */
-
-// The default UDP multicast port number for locating the TAO Naming
-// Service.
-#if !defined (TAO_DEFAULT_NAME_SERVER_REQUEST_PORT)
-#define TAO_DEFAULT_NAME_SERVER_REQUEST_PORT 10013
-#endif /* TAO_DEFAULT_NAME_SERVER_REQUEST_PORT */
-
-// The default UDP port number for replying to a location request to
-// the TAO Naming Service.
-#if !defined (TAO_DEFAULT_NAME_SERVER_REPLY_PORT)
-#define TAO_DEFAULT_NAME_SERVER_REPLY_PORT 10014
-#endif /* TAO_DEFAULT_NAME_SERVER_REPLY_PORT */
-
-// The default UDP multicast port number for locating the TAO Trading
-// Service.
-#if !defined (TAO_DEFAULT_TRADING_SERVER_REQUEST_PORT)
-#define TAO_DEFAULT_TRADING_SERVER_REQUEST_PORT 10016
-#endif /* TAO_DEFAULT_TRADING_SERVER_REQUEST_PORT */
-
-// The default UDP port number for replying to a location request to
-// the TAO Trading Service.
-#if !defined (TAO_DEFAULT_TRADING_SERVER_REPLY_PORT)
-#define TAO_DEFAULT_TRADING_SERVER_REPLY_PORT 10017
-#endif /* TAO_DEFAULT_TRADING_SERVER_REPLY_PORT */
-
-// The default UDP multicast port number for locating the TAO
-// Implementation Repository Service.
-#if !defined (TAO_DEFAULT_IMPLREPO_SERVER_REQUEST_PORT)
-#define TAO_DEFAULT_IMPLREPO_SERVER_REQUEST_PORT 10018
-#endif /* TAO_DEFAULT_IMPLREPO_SERVER_REQUEST_PORT */
-
-// The default UDP port number for replying to a location request to
-// the TAO Implementation Repository Service.
-#if !defined (TAO_DEFAULT_IMPLREPO_SERVER_REPLY_PORT)
-#define TAO_DEFAULT_IMPLREPO_SERVER_REPLY_PORT 10019
-#endif /* TAO_DEFAULT_IMPLREPO_SERVER_REPLY_PORT */
-
-
-// The default timeout receiving the location request to the TAO
-// Naming, Trading and other servicesService.
-#if !defined (TAO_DEFAULT_SERVICE_RESOLUTION_TIMEOUT)
-#define TAO_DEFAULT_SERVICE_RESOLUTION_TIMEOUT 4
-#endif /* TAO_DEFAULT_SERVICE_RESOLUTION_TIMEOUT */
-
-// The default starting port number for TAO servers.
-// @@ This assumes we are using one or more protocols that will all
-// @@ 1) know what to do with a port number and
-// @@ 2) use the same default port number.
-// @@ This shou8ld go away!
-#if !defined (TAO_DEFAULT_SERVER_PORT)
-#define TAO_DEFAULT_SERVER_PORT 0
-#endif /* TAO_DEFAULT_SERVER_PORT */
-
-// TAO's max buffer size
-#if !defined (TAO_MAXBUFSIZE)
-#define TAO_MAXBUFSIZE 1024
-#endif /* TAO_MAXBUFSIZE */
-
-// This controls the alignment for TAO structs.  It supports built-in
-// types up to and including 16 bytes (128 bits) in size.
-#if !defined (TAO_MAXIMUM_NATIVE_TYPE_SIZE)
-# define TAO_MAXIMUM_NATIVE_TYPE_SIZE 128
-#endif /* TAO_MAXIMUM_NATIVE_TYPE_SIZE */
-
-// This deals with platforms that support namespaces vs platforms that
-// don't.  @@ MSVC's namespace implementation is somehow broken.
-// The following macros are required to deal with the most bizarre and insane
-// behavior of the MSVC++ compiler
-#if defined (ACE_HAS_USING_KEYWORD)
-#define TAO_NAMESPACE namespace
-#define TAO_NAMESPACE_STORAGE_CLASS extern TAO_EXPORT_MACRO
-#define TAO_NAMESPACE_BEGIN(NS)  namespace NS {
-#define TAO_NAMESPACE_END  };
-#define TAO_NAMESPACE_TYPE(TYPE)
-#define TAO_NAMESPACE_DEFINE(TYPE,NAME,RHS) TYPE NAME = RHS;
-#else
-#define TAO_NAMESPACE struct TAO_EXPORT_MACRO
-#define TAO_NAMESPACE_STORAGE_CLASS static
-#define TAO_NAMESPACE_BEGIN(NS)  NS##::
-#define TAO_NAMESPACE_END
-#define TAO_NAMESPACE_TYPE(TYPE) TYPE
-#define TAO_NAMESPACE_DEFINE(TYPE,NAME,RHS) NAME = RHS;
-#endif /* ACE_HAS_USING_KEYWORD */
-
-# if defined (_MSC_VER) && defined (__ACE_INLINE__)
-#   define TAO_NAMESPACE_INLINE_FUNCTION inline
-# else
-#   define TAO_NAMESPACE_INLINE_FUNCTION TAO_NAMESPACE_STORAGE_CLASS
-# endif
-
-// Instead of replacing this with the ACE macro
-// in 20+ files, define it conditionally.
-// The TAO_OutputCDR class uses the ACE macro, which
-// is defined by default.
-//#if defined (ACE_NO_COPY_OCTET_SEQUENCES)
-#define TAO_NO_COPY_OCTET_SEQUENCES
-//#endif /* ACE_NO_COPY_OCTET_SEQUENCES */
-
-#if defined (ACE_HAS_EXCEPTIONS)
-# define TAO_HAS_EXCEPTIONS
-// TAO_USE_EXCEPTIONS is only here for backwards compatibility and
-// will go away shortly so don't use it...
-# define TAO_USE_EXCEPTIONS
-#elif (defined (TAO_HAS_EXCEPTIONS) || defined (TAO_USE_EXCEPTIONS)) && !defined (ACE_HAS_EXCEPTIONS)
-# error "tao/orbconf.h: You can only use exceptions in TAO if ACE supports them"
-#endif /* TAO_HAS_EXCEPTIONS */
-
-// BC++ seems to have a different convention for detecting Win32 than
-// VC++.
-
-#if defined (__WIN32__)
-# if !defined(_WIN32)
-#   define _WIN32
-# endif /* !defined(_WIN32) */
-#endif /* __WIN32__ */
-
-// Define to `int' if <sys/types.h> doesn't define.
-/* #undef pid_t */
-
-// Define if your processor does not store words with the most significant
-// byte first.
-#if defined (ACE_LITTLE_ENDIAN)
-#  define TAO_ENCAP_BYTE_ORDER 1  /* little endian encapsulation byte order has
-                                     the value = 1 */
-#else  /* ! ACE_LITTLE_ENDIAN */
-#  define TAO_ENCAP_BYTE_ORDER 0  /* big endian encapsulation byte order has
-                                     the value = 0 */
-#endif /* ! ACE_LITTLE_ENDIAN */
-
-// Define as the return type of signal handlers (int or void).
-#define RETSIGTYPE void
-
-// Define if you don't have vprintf but do have _doprnt.
-/* #undef HAVE_DOPRNT */
-
-// Define if you have the vprintf function.
-#define HAVE_VPRINTF 1
-
-// Avoid namespace pollution that's common on older UNIXes...
-#if defined (minor)
-#undef minor
-#endif /* minor */
-
-#if defined (major)
-#undef major
-#endif /* major*/
-
-#if !defined (TAO_EXPORT_NESTED_CLASSES) \
-    && defined (ACE_EXPORT_NESTED_CLASSES)
-#define TAO_EXPORT_NESTED_CLASSES
-#endif /* !defined TAO_EXPORT_NESTED_CLASSES */
-
-#if !defined (TAO_EXPORT_NESTED_MACRO)
-#define TAO_EXPORT_NESTED_MACRO
-#endif /* !defined (TAO_EXPORT_NESTED_MACRO) */
-
-// Assume DOS/Windows if "configure" didn't get run.
-
-#if defined (_WIN32)
-// "C4355: 'this' : used in base member initializer list"
-#  pragma warning (disable:4355) /* disable C4355 warning */
-#endif /* defined (_WIN32) */
-
-// The IDL compiler can generate the classes corresponding to IDL
-// sequences in two ways:
-// + Use the TAO templates for sequences,
-//   i.e. TAO_{Unb,B}ounded_Sequence<>
-// + Explicitly generate code for the sequence.
-//
-// The first approach can (potentially) produce smaller code, because
-// the code for a sequence over a particular type (say sequence<long>)
-// can be shared across multiple IDL files.
-// Unfortunately it is hard to manage the template instantiations on
-// platforms that do not automatically generate them, mainly because
-// it is hard to decide on which generated file are the templates
-// instantiated.  Thus the second approach is more convenient for most
-// applications.
-//
-// On platforms that support automatic template instantiation we use
-// the first approach.
-// On platforms that require explicit template instantiations we use
-// explicitly generated code for sequences if the platform does not.
-// If the application requires it (such as embedded systems) the
-// default can be changed, but then the application developer is
-// responsible for instantiating the templates.
-//
-#if !defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) && \
-    (defined (ACE_HAS_TEMPLATE_SPECIALIZATION) || \
-     (defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) && defined (_UNICOS)))
-#define TAO_USE_SEQUENCE_TEMPLATES
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// ObjectIds recognized by CORBA_ORB::resolve_initial_references ()...
-// of course, no guarantees are made that the call will return
-// something useful.
-#define TAO_OBJID_NAMESERVICE      "NameService"
-#define TAO_OBJID_TRADINGSERVICE   "TradingService"
-#define TAO_OBJID_IMPLREPOSERVICE  "ImplRepoService"
-#define TAO_OBJID_ROOTPOA          "RootPOA"
-#define TAO_OBJID_POACURRENT       "POACurrent"
-#define TAO_OBJID_INTERFACEREP     "InterfaceRepository"
-#define TAO_OBJID_POLICYMANAGER    "ORBPolicyManager"
-#define TAO_OBJID_POLICYCURRENT    "PolicyCurrent"
-#define TAO_OBJID_IORMANIPULATION  "IORManipulation"
-
-// TAO Naming Service.
-
-// Poa id of the root Naming Context in a Naming server.
-#if !defined (TAO_ROOT_NAMING_CONTEXT)
-#  define TAO_ROOT_NAMING_CONTEXT "NameService"
-#endif /* ! TAO_ROOT_NAMING_CONTEXT */
-
-// The name under which the index of naming contexts is stored in
-// persistent naming service.
-#if !defined (TAO_NAMING_CONTEXT_INDEX)
-#  define TAO_NAMING_CONTEXT_INDEX "Naming_Context_Index"
-#endif /* ! TAO_NAMING_CONTEXT_INDEX */
-
-// The Root POA default name.
-#define TAO_DEFAULT_ROOTPOA_NAME   ""
-
-// OBV is in experimental stage
-#define TAO_HAS_VALUETYPE
-
-// Minimum CORBA
-// #define TAO_HAS_MINIMUM_CORBA
-
-// Without Minimum CORBA, the user will get regular (no locality
-// constraints) policies by default.  With Minimum CORBA, the user
-// will get locality constraint policies by default.
-//
-// If #define TAO_HAS_REMOTE_POLICIES 0, then the user will always get
-// locality constraint policies (regardless of Minimum CORBA).
-//
-// If #define TAO_HAS_REMOTE_POLICIES 1, then the user will always get
-// regular policies (regardless of Minimum CORBA).
-
-// TAO_HAS_LOCALITY_CONSTRAINT_POLICIES is an internal macro and
-// should not be set by the user.
-#if defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-# undef TAO_HAS_LOCALITY_CONSTRAINT_POLICIES
-# warning TAO_HAS_LOCALITY_CONSTRAINT_POLICIES is an internal macro \
-and should not be set by the user. Please use TAO_HAS_REMOTE_POLICIES instead.
-#endif /* TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-#if defined (TAO_HAS_MINIMUM_CORBA)
-
-// With minimum CORBA, we don't have the ForwardRequest exception.
-// Therefore, we can't support the INS forwarding agent.
-# if !defined (TAO_NO_IOR_TABLE)
-#  define TAO_NO_IOR_TABLE
-# endif /* TAO_NO_IOR_TABLE */
-
-# if !defined (TAO_HAS_REMOTE_POLICIES)
-#  define TAO_HAS_REMOTE_POLICIES 0
-# endif /* TAO_HAS_REMOTE_POLICIES */
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-// Policies are not locality constraint by default.
-#if !defined (TAO_HAS_REMOTE_POLICIES)
-# define TAO_HAS_REMOTE_POLICIES 1
-#endif /* TAO_HAS_REMOTE_POLICIES */
-
-#if (TAO_HAS_REMOTE_POLICIES == 0)
-# define TAO_HAS_LOCALITY_CONSTRAINT_POLICIES
-#endif /* TAO_HAS_REMOTE_POLICIES */
-
-// CORBA Messaging
-#define TAO_HAS_CORBA_MESSAGING
-
-// Define the policy types as literals, so they can be used in switch
-// statements
-#define TAO_MESSAGING_REBIND_POLICY_TYPE 23
-#define TAO_MESSAGING_SYNC_SCOPE_POLICY_TYPE 24
-#define TAO_MESSAGING_REQUEST_PRIORITY_POLICY_TYPE 25
-#define TAO_MESSAGING_REPLY_PRIORITY_POLICY_TYPE 26
-#define TAO_MESSAGING_REQUEST_START_TIME_POLICY_TYPE 27
-#define TAO_MESSAGING_REQUEST_END_TIME_POLICY_TYPE 28
-#define TAO_MESSAGING_REPLY_START_TIME_POLICY_TYPE 29
-#define TAO_MESSAGING_REPLY_END_TIME_POLICY_TYPE 30
-#define TAO_MESSAGING_RELATIVE_REQ_TIMEOUT_POLICY_TYPE 31
-#define TAO_MESSAGING_RELATIVE_RT_TIMEOUT_POLICY_TYPE 32
-#define TAO_MESSAGING_ROUTING_POLICY_TYPE 33
-#define TAO_MESSAGING_MAX_HOPS_POLICY_TYPE 34
-#define TAO_MESSAGING_QUEUE_ORDER_POLICY_TYPE 35
-
-// Control the default version of GIOP used by TAO.
-// The ORB is always able to communicate with 1.0 and 1.1 servers, and
-// it creates 1.1 endpoints (and profiles).  If you need to talk to
-// old clients that only understand 1.0 (and do not attempt to use 1.0
-// with 1.1 servers), then change the values below.
-#if !defined (TAO_DEF_GIOP_MAJOR)
-#define TAO_DEF_GIOP_MAJOR 1
-#endif /* TAO_DEF_GIOP_MAJOR */
-#if !defined (TAO_DEF_GIOP_MINOR)
-#define TAO_DEF_GIOP_MINOR 1
-#endif /* TAO_DEF_GIOP_MINOR */
-
-// By default TAO generate the OMG standard profile components
-// (ORB_TYPE and CODE_SETS)
-#define TAO_STD_PROFILE_COMPONENTS
-
-#if !defined (TAO_DEFAULT_IOR_SIZE)
-// This is the default size of the buffer used for processing IORs.
-#define TAO_DEFAULT_IOR_SIZE 1024
-#endif /* TAO_DEFAULT_IOR_SIZE */
-
-#endif  /* TAO_ORB_CONFIG_H */
diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp
deleted file mode 100644
index 1ce3bd9f497..00000000000
--- a/TAO/tao/params.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-// $Id$
-
-#include "tao/params.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/params.i"
-#endif /* __ACE_INLINE__ */
-
-#include "tao/IOR_LookupTable.h"
-
-ACE_RCSID(tao, params, "$Id$")
-
-TAO_ORB_Parameters::TAO_ORB_Parameters (void)
-  : preconnects_list_ (),
-    preconnect_insertion_strategy_ (this->preconnects_list_),
-    endpoints_list_ (),
-    endpoint_insertion_strategy_ (this->endpoints_list_),
-    name_service_ior_ (),
-    name_service_port_ (0),
-    trading_service_ior_ (),
-    trading_service_port_ (0),
-    implrepo_service_ior_ (),
-    implrepo_service_port_ (0),
-    init_ref_ (),
-    ior_lookup_table_ (0),
-    default_init_ref_ (),
-    sock_rcvbuf_size_ (ACE_DEFAULT_MAX_SOCKET_BUFSIZ),
-    sock_sndbuf_size_ (ACE_DEFAULT_MAX_SOCKET_BUFSIZ),
-    cdr_memcpy_tradeoff_ (ACE_DEFAULT_CDR_MEMCPY_TRADEOFF),
-    use_lite_protocol_ (0),
-    use_dotted_decimal_addresses_ (0),
-    std_profile_components_ (1)
-{
-}
-
-TAO_ORB_Parameters::~TAO_ORB_Parameters (void)
-{
-  // Delete the table.
-  delete this->ior_lookup_table_;
-  this->ior_lookup_table_ = 0;
-}
-
-int
-TAO_ORB_Parameters::parse_endpoints (ACE_CString &endpoints,
-                                     TAO_Base_Endpoint_Insertion_Strategy &
-                                       endpoints_list)
-{
-  // Parse the string into seperate endpoints, where `endpoints' is of
-  // the form:
-  //
-  //    protocol1://V,v@addr1,...,addrN;protocol2://addr1,...,W.w@addrN;...
-  //
-  // A single endpoint, instead of several, can be added just as well.
-
-  int status = 0;
-  // Return code:  0 = success,  1 = failure
-
-  const char endpoints_delimiter = ';';
-
-  int length = endpoints.length ();
-
-  if (endpoints[0] == endpoints_delimiter ||
-      endpoints[length - 1] == endpoints_delimiter)
-    {
-      return -1;
-      // Failure: endpoints string has an empty endpoint at the
-      // beginning or the end of the string
-      // (e.g. ";uiop://foo;iiop://1.3@bar")
-    }
-
-  if (length > 0)
-    {
-      int endpoints_count = 1;
-
-      for (int j = 0; j != length; ++j)
-        {
-          if (endpoints[j] == endpoints_delimiter)
-            endpoints_count++;
-        }
-
-      int begin = 0;
-      int end = endpoints.find (endpoints_delimiter);
-
-      for (int i = 0; i < endpoints_count; ++i)
-        {
-          if (end == 0)
-            {
-              // Handle case where two consecutive endpoints `;;'
-              // delimiters are found within the endpoints set.
-              //
-              // Is it enough to just skip over it or should we return an
-              // error?
-              continue;
-            }
-
-          ACE_CString endpt = endpoints.substring (begin, end);
-          // The substring call will work even if `end' is equal to
-          // ACE_CString::npos since that will just extract the substring
-          // from the offset `begin' to the end of the string.
-
-          // Check for a valid URL style endpoint set
-          int check_offset = endpt.find ("://");
-
-          if (check_offset > 0 &&
-              check_offset != endpt.npos)
-            {
-              endpoints_list.insert (endpt);
-              // Insert endpoint into list
-            }
-          else
-            status = -1;  // Error: invalid URL style endpoint set
-
-          begin += end + 1;
-          end = endpoints.find (endpoints_delimiter, begin);
-        }
-    }
-  else
-    {
-      status = -1;
-      // Failure:  Empty string
-    }
-
-  return status;
-}
-
-// Don't bother inlining since the most used methods are virtual.
-
-TAO_Preconnect_Insertion_Strategy::
-   TAO_Preconnect_Insertion_Strategy (TAO_PreconnectSet &preconnects)
-     : preconnects_ (preconnects)
-{
-}
-
-int
-TAO_Preconnect_Insertion_Strategy::insert (const ACE_CString &preconnect)
-{
-  return this->preconnects_.enqueue_tail (preconnect);
-}
-
-TAO_Endpoint_Insertion_Strategy::
-  TAO_Endpoint_Insertion_Strategy (TAO_EndpointSet &endpoints)
-    : endpoints_ (endpoints)
-{
-}
-
-int
-TAO_Endpoint_Insertion_Strategy::insert (const ACE_CString &endpoint)
-{
-  return this->endpoints_.insert (endpoint);
-}
diff --git a/TAO/tao/params.h b/TAO/tao/params.h
deleted file mode 100644
index f8c53bddbd1..00000000000
--- a/TAO/tao/params.h
+++ /dev/null
@@ -1,301 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    params.h
-//
-// = AUTHOR
-//    Chris Cleeland
-//
-// ============================================================================
-
-#ifndef TAO_PARAMS_H
-#define TAO_PARAMS_H
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// Forward decls.
-
-class TAO_Active_Object_Map_Impl;
-class TAO_Reverse_Active_Object_Map_Impl;
-class TAO_IOR_LookupTable;
-
-// This is a quick hack to avoid having to unravel the intricacies of
-// the all the hairy order interdepencies that currently exist in TAO.
-// #if ! defined (__ACE_INLINE__)
-// #define TAO_LOCAL_INLINE
-// #else
-// #define TAO_LOCAL_INLINE ACE_INLINE
-// #endif /* ! __ACE_INLINE__ */
-
-typedef ACE_Unbounded_Set<ACE_CString> TAO_EndpointSet;
-typedef ACE_Unbounded_Set_Iterator<ACE_CString> TAO_EndpointSetIterator;
-
-// @@ Using an ACE_Unbounded_Queue to contain the preconnects may not
-//    be the best container to use.  However, it will only be used
-//    during client side initialization.  Also, a template
-//    instantiation of ACE_Unbounded_Queue<ACE_CString> already exists
-//    in ACE so we do not have to worry about increasing TAO's
-//    footprint by using this container.
-typedef ACE_Unbounded_Queue<ACE_CString> TAO_PreconnectSet;
-typedef ACE_Unbounded_Queue_Iterator<ACE_CString> TAO_PreconnectSetIterator;
-
-// -------------------------------------------------------------------
-// The following utility classes are used to insert endpoints and
-// preconnects into their corresponding containers, but at the same
-// time allow the same parsing code to be used for endpoints and
-// preconnects.
-
-// Base class that provides interface for insertion of
-class TAO_Base_Endpoint_Insertion_Strategy
-{
-public:
-  virtual int insert (const ACE_CString &endpoint) = 0;
-};
-
-// Utility class to insert endpoints into endpoint container.
-class TAO_Endpoint_Insertion_Strategy
-  : public TAO_Base_Endpoint_Insertion_Strategy
-{
-public:
-  TAO_Endpoint_Insertion_Strategy (TAO_EndpointSet &endpoint_set);
-
-  virtual int insert (const ACE_CString &endpoint);
-
-private:
-  TAO_EndpointSet &endpoints_;
-};
-
-// Utility class to insert preconnects into preconnect container.
-class TAO_Preconnect_Insertion_Strategy
-  : public TAO_Base_Endpoint_Insertion_Strategy
-{
-public:
-  TAO_Preconnect_Insertion_Strategy (TAO_PreconnectSet &preconnect_set);
-
-  virtual int insert (const ACE_CString &preconnect);
-
-private:
-  TAO_PreconnectSet &preconnects_;
-};
-// -------------------------------------------------------------------
-
-class TAO_Export TAO_ORB_Parameters
-  // = TITLE
-  //    Parameters that are specific to the ORB.  These parameters can
-  //    be for the client, the server, or for both.
-  //
-  // = NOTE
-  // Some of the functions have inline definitions in the class header
-  // below.  Please do not move them back to the .i file.
-  // cygnus-2.7.2-960126, distributed with Tornado 1.0.1, can't deal
-  // with returing a const reference here.  It raises an internal
-  // compiler error at ace/Svc_Handler.cpp:46, of all places.
-{
-public:
-  TAO_ORB_Parameters (void);
-  // Constructor.
-
-  ~TAO_ORB_Parameters (void);
-  // Destructor.
-
-  int preconnects (ACE_CString &preconnects);
-  TAO_PreconnectSet &preconnects (void);
-  void add_preconnect (ACE_CString &preconnect);
-  // Specifies the endpoints to pre-establish connections on.
-
-  int endpoints (ACE_CString &endpoints);
-  TAO_EndpointSet &endpoints (void);
-  void add_endpoint (ACE_CString &endpoint);
-  // Specifies the endpoints on which this server is willing to
-  // listen for requests.
-
-  const char *init_ref (void) const;
-  void init_ref (const ACE_CString &init_ref);
-  // Set/Get the Init Reference of an arbitrary ObjectID.
-
-  const char *name_service_ior (void) const;
-  void name_service_ior (const ACE_CString &ns);
-  // Set/Get the IOR of our name service.
-
-  CORBA::UShort name_service_port (void) const;
-  void name_service_port (CORBA::UShort port);
-  // Set/Get the port of our name service.
-
-  const char *trading_service_ior (void) const;
-  void trading_service_ior (const ACE_CString &ns);
-  // Set/Get the IOR of our trading service.
-
-  CORBA::UShort trading_service_port (void) const;
-  void trading_service_port (CORBA::UShort port);
-  // Set/Get the port of our trading service.
-
-  const char *implrepo_service_ior (void) const;
-  void implrepo_service_ior (const ACE_CString &ir);
-  // Set/Get the IOR of the Implementation Repository service.
-
-  CORBA::UShort implrepo_service_port (void) const;
-  void implrepo_service_port (CORBA::UShort port);
-  // Set/Get the port of the Implementation Repository service.
-
-  int sock_rcvbuf_size (void) const;
-  void sock_rcvbuf_size (int);
-  // Set/Get the size to be used for a socket's receive buffer.
-
-  int sock_sndbuf_size (void) const;
-  void sock_sndbuf_size (int);
-  // Set/Get the size to be used for a socket's send buffer.
-
-  int cdr_default_size (void) const;
-  void cdr_default_size (int);
-  // If the user does not specify the size of a CDR stream this is the
-  // size of its internal buffer.
-
-  int cdr_max_exp_size (void) const;
-  void cdr_max_exp_size (int);
-  // CDR streams internal buffers grow exponentially until they reach
-  // this size.
-
-  int cdr_linear_chunk (void) const;
-  void cdr_linear_chunk (int);
-  // After reaching their maximum exponential size limit CDR streams
-  // grow linearly in chunks of this size.
-
-  int cdr_memcpy_tradeoff (void) const;
-  void cdr_memcpy_tradeoff (int);
-  // Octet sequences are marshalled without doing any copies, we
-  // simply append a block to the CDR message block chain. When the
-  // octet sequence is small enough and there is room in the current
-  // message block it is more efficient just to copy the buffer.
-
-  int use_lite_protocol (void) const;
-  void use_lite_protocol (int);
-  // The ORB will use a modified version of GIOP that minimizes the
-  // header size. By default we use the standard GIOP protocol.
-
-  int use_dotted_decimal_addresses (void) const;
-  void use_dotted_decimal_addresses (int);
-  // The ORB will use the dotted decimal notation for addresses. By
-  // default we use the full ascii names.
-
-  TAO_IOR_LookupTable * ior_lookup_table (void);
-  void ior_lookup_table (TAO_IOR_LookupTable *table);
-  // The table used by the ORB for looking up the ObjectID:IOR mappings
-  // specified on the commandline through the -ORBInitRef and
-  // -ORBDefaultInitRef parameters.
-
-  char *default_init_ref (void) const;
-  void default_init_ref (const ACE_CString &default_init_ref);
-  // Set/Get the Init Reference of an arbitrary ObjectID.
-
-  int std_profile_components (void) const;
-  void std_profile_components (int x);
-  // Disable the OMG standard profile components, useful for
-  // homogenous environments.
-
-private:
-  // Each "endpoint" is of the form:
-  //
-  //   protocol://V.v@addr1,...,W.w@addrN/
-  //
-  // or:
-  //
-  //   protocol://addr1,addr2,...,addrN/
-  //
-  // where "V.v" and "W.w" are optional versions.
-  //
-  // Multiple sets of endpoints may be seperated by a semi-colon `;'.
-  // For example:
-  //
-  //   iiop://space:2001,odyssey:2010;uiop://foo,bar
-  //
-  // All preconnect or endpoint strings should be of the above form(s).
-
-  int parse_endpoints (ACE_CString &endpoints,
-                       TAO_Base_Endpoint_Insertion_Strategy &endpoints_list);
-
-  TAO_PreconnectSet preconnects_list_;
-  // List of endpoints used to pre-establish connections.
-
-  TAO_Preconnect_Insertion_Strategy preconnect_insertion_strategy_;
-  // Strategy used to insert endpoints into the endpoint container.
-
-  TAO_EndpointSet endpoints_list_;
-  // List of endpoints this server is willing to accept requests
-  // on.
-
-  TAO_Endpoint_Insertion_Strategy endpoint_insertion_strategy_;
-  // Strategy used to insert endpoints into the endpoint container.
-
-  ACE_CString name_service_ior_;
-  // The IOR of our configured Naming Service.
-
-  CORBA::UShort name_service_port_;
-  // The port number of our configured Naming Service.
-
-  ACE_CString trading_service_ior_;
-  // The IOR of our configured Trading Service.
-
-  CORBA::UShort trading_service_port_;
-  // The port number of our configured Trading Service.
-
-  ACE_CString implrepo_service_ior_;
-  // The IOR of our configured Implementation Repository.
-
-  CORBA::UShort implrepo_service_port_;
-  // The port number of our configured Implementation Repository.
-
-  ACE_CString init_ref_;
-  // Initial Reference supplied as <ObjectID>:<IOR>
-
-  TAO_IOR_LookupTable *ior_lookup_table_;
-  // Table that has the mapping <ObjectID>:<IOR>
-  // The IOR could be in any of the following formats :
-  // IOR: ...  / iiop: ...  / iioploc: ... / iiopname: ...
-
-  ACE_CString default_init_ref_;
-  // List of comma separated prefixes from ORBDefaultInitRef.
-
-  int sock_rcvbuf_size_;
-  // Size to be used for a socket's receive buffer.
-
-  int sock_sndbuf_size_;
-  // Size to be used for a socket's send buffer.
-
-  int cdr_default_size_;
-  // Default size for CDR buffers.
-
-  int cdr_max_exp_size_;
-  // Cutoff value for exponential growth of CDR buffers.
-
-  int cdr_linear_chunk_;
-  // Control for linear growth of CDR buffers.
-
-  int cdr_memcpy_tradeoff_;
-  // Control the strategy for copying vs. appeding octet sequences in
-  // CDR streams.
-
-  int use_lite_protocol_;
-  // For selecting a liteweight version of the GIOP protocol.
-
-  int use_dotted_decimal_addresses_;
-  // For selecting a address notation
-
-  int std_profile_components_;
-  // If true then the standard OMG components are not generated.
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/params.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_PARAMS_H */
diff --git a/TAO/tao/params.i b/TAO/tao/params.i
deleted file mode 100644
index c16d322c4ab..00000000000
--- a/TAO/tao/params.i
+++ /dev/null
@@ -1,234 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    params.i
-//
-// = AUTHOR
-//    Chris Cleeland
-//
-// ============================================================================
-
-ACE_INLINE int
-TAO_ORB_Parameters::preconnects (ACE_CString &preconnects)
-{
-  return this->parse_endpoints (preconnects,
-                                this->preconnect_insertion_strategy_);
-}
-
-ACE_INLINE TAO_PreconnectSet &
-TAO_ORB_Parameters::preconnects (void)
-{
-  return this->preconnects_list_;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::add_preconnect (ACE_CString &preconnect)
-{
-  this->preconnects_list_.enqueue_tail (preconnect);
-}
-
-ACE_INLINE int
-TAO_ORB_Parameters::endpoints (ACE_CString &endpoints)
-{
-  return this->parse_endpoints (endpoints,
-                                this->endpoint_insertion_strategy_);
-}
-
-ACE_INLINE TAO_EndpointSet &
-TAO_ORB_Parameters::endpoints (void)
-{
-  return this->endpoints_list_;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::add_endpoint (ACE_CString &endpoint)
-{
-  this->endpoints_list_.insert (endpoint);
-}
-
-ACE_INLINE int
-TAO_ORB_Parameters::sock_rcvbuf_size (void) const
-{
-  return sock_rcvbuf_size_;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::sock_rcvbuf_size (int s)
-{
-  sock_rcvbuf_size_ = s <= ACE_DEFAULT_MAX_SOCKET_BUFSIZ ? s : ACE_DEFAULT_MAX_SOCKET_BUFSIZ;
-}
-
-ACE_INLINE int
-TAO_ORB_Parameters::sock_sndbuf_size (void) const
-{
-  return sock_sndbuf_size_;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::sock_sndbuf_size (int s)
-{
-  sock_sndbuf_size_ = s <= ACE_DEFAULT_MAX_SOCKET_BUFSIZ ? s : ACE_DEFAULT_MAX_SOCKET_BUFSIZ;
-}
-
-ACE_INLINE int
-TAO_ORB_Parameters::cdr_memcpy_tradeoff (void) const
-{
-  return this->cdr_memcpy_tradeoff_;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::cdr_memcpy_tradeoff (int x)
-{
-  this->cdr_memcpy_tradeoff_ = x;
-}
-
-ACE_INLINE int
-TAO_ORB_Parameters::use_lite_protocol (void) const
-{
-  return this->use_lite_protocol_;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::use_lite_protocol (int x)
-{
-  this->use_lite_protocol_ = x;
-}
-
-ACE_INLINE int
-TAO_ORB_Parameters::use_dotted_decimal_addresses (void) const
-{
-  return this->use_dotted_decimal_addresses_;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::use_dotted_decimal_addresses (int x)
-{
-  this->use_dotted_decimal_addresses_ = x;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::init_ref (const ACE_CString &init_ref)
-{
-  this->init_ref_ = init_ref;
-}
-
-ACE_INLINE const char *
-TAO_ORB_Parameters::init_ref (void) const
-{
-  return this->init_ref_.c_str ();
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::name_service_ior (const ACE_CString &ns)
-{
-  this->name_service_ior_ = ns;
-}
-
-ACE_INLINE const char *
-TAO_ORB_Parameters::name_service_ior (void) const
-{
-  return this->name_service_ior_.c_str ();
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::name_service_port (CORBA::UShort port)
-{
-  this->name_service_port_ = port;
-}
-
-ACE_INLINE CORBA::UShort
-TAO_ORB_Parameters::name_service_port (void) const
-{
-  return this->name_service_port_;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::trading_service_ior (const ACE_CString &ns)
-{
-  this->trading_service_ior_ = ns;
-}
-
-ACE_INLINE const char *
-TAO_ORB_Parameters::trading_service_ior (void) const
-{
-  return this->trading_service_ior_.c_str ();
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::trading_service_port (CORBA::UShort port)
-{
-  this->trading_service_port_ = port;
-}
-
-ACE_INLINE CORBA::UShort
-TAO_ORB_Parameters::trading_service_port (void) const
-{
-  return this->trading_service_port_;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::implrepo_service_ior (const ACE_CString &ir)
-{
-  this->implrepo_service_ior_ = ir;
-}
-
-ACE_INLINE const char *
-TAO_ORB_Parameters::implrepo_service_ior (void) const
-{
-  return this->implrepo_service_ior_.c_str ();
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::implrepo_service_port (CORBA::UShort port)
-{
-  this->implrepo_service_port_ = port;
-}
-
-ACE_INLINE CORBA::UShort
-TAO_ORB_Parameters::implrepo_service_port (void) const
-{
-  return this->implrepo_service_port_;
-}
-
-ACE_INLINE TAO_IOR_LookupTable *
-TAO_ORB_Parameters::ior_lookup_table (void)
-{
-  return this->ior_lookup_table_;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::ior_lookup_table (TAO_IOR_LookupTable *table)
-{
-  this->ior_lookup_table_ = table;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::default_init_ref (const ACE_CString &default_init_ref)
-{
-  this->default_init_ref_ = default_init_ref;
-}
-
-ACE_INLINE char *
-TAO_ORB_Parameters::default_init_ref (void) const
-{
-  return this->default_init_ref_.rep ();
-}
-
-ACE_INLINE int
-TAO_ORB_Parameters::std_profile_components (void) const
-{
-  return this->std_profile_components_;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::std_profile_components (int x)
-{
-  this->std_profile_components_ = x;
-}
-
diff --git a/TAO/tao/poa_macros.h b/TAO/tao/poa_macros.h
deleted file mode 100644
index 5cd62984c98..00000000000
--- a/TAO/tao/poa_macros.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// $Id$
-
-#ifndef TAO_POA_MACROS_H
-#define TAO_POA_MACROS_H
-
-#include "tao/try_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// Convenient macro for testing for deadlock, as well as for detecting
-// when mutexes fail.
-#define TAO_POA_GUARD(MUTEX,OBJ,LOCK) \
-  ACE_GUARD_THROW_EX(MUTEX,OBJ,LOCK,CORBA::OBJ_ADAPTER ())
-
-#define TAO_POA_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN) \
-  ACE_GUARD_THROW_EX(MUTEX,OBJ,LOCK,CORBA::OBJ_ADAPTER ()); \
-  ACE_CHECK_RETURN (RETURN)
-
-#define TAO_POA_WRITE_GUARD(MUTEX,OBJ,LOCK) \
-  ACE_WRITE_GUARD_THROW_EX(MUTEX,OBJ,LOCK,CORBA::OBJ_ADAPTER ())
-
-#define TAO_POA_READ_GUARD(MUTEX,OBJ,LOCK) \
-  ACE_READ_GUARD_THROW_EX(MUTEX,OBJ,LOCK,CORBA::OBJ_ADAPTER ())
-
-#define TAO_POA_WRITE_GUARD_RETURN(MUTEX,OBJ,LOCK) \
-  ACE_WRITE_GUARD_THROW_EX(MUTEX,OBJ,LOCK,CORBA::OBJ_ADAPTER ()); \
-  ACE_CHECK_RETURN (RETURN)
-
-#define TAO_POA_READ_GUARD_RETURN(MUTEX,OBJ,LOCK) \
-  ACE_READ_GUARD_THROW_EX(MUTEX,OBJ,LOCK,CORBA::OBJ_ADAPTER ()); \
-  ACE_CHECK_RETURN (RETURN)
-
-#endif /* TAO_POA_MACROS_H */
diff --git a/TAO/tao/singletons.h b/TAO/tao/singletons.h
deleted file mode 100644
index 8a3c2c6815e..00000000000
--- a/TAO/tao/singletons.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    singletons.h
-//
-// = DESCRIPTION
-//    Type declarations for singletons used in TAO.
-//
-// = AUTHOR
-//    Chris Cleeland, WU DOC
-//
-// = COPYRIGHT
-//    Copyright 1997
-//
-// ============================================================================
-
-#ifndef TAO_SINGLETONS_H
-#define TAO_SINGLETONS_H
-
-#include "ace/Singleton.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Synch.h"
-#include "tao/Marshal.h"
-
-typedef ACE_Singleton<TAO_Marshal_Factory, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_FACTORY;
-typedef ACE_Singleton<TAO_Marshal_Primitive, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_PRIMITIVE;
-typedef ACE_Singleton<TAO_Marshal_Any, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_ANY;
-typedef ACE_Singleton<TAO_Marshal_TypeCode, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_TYPECODE;
-typedef ACE_Singleton<TAO_Marshal_Principal, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_PRINCIPAL;
-typedef ACE_Singleton<TAO_Marshal_ObjRef, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_OBJREF;
-typedef ACE_Singleton<TAO_Marshal_Struct, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_STRUCT;
-typedef ACE_Singleton<TAO_Marshal_Union, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_UNION;
-typedef ACE_Singleton<TAO_Marshal_String, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_STRING;
-typedef ACE_Singleton<TAO_Marshal_Sequence, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_SEQUENCE;
-typedef ACE_Singleton<TAO_Marshal_Array, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_ARRAY;
-typedef ACE_Singleton<TAO_Marshal_Alias, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_ALIAS;
-typedef ACE_Singleton<TAO_Marshal_Except, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_EXCEPT;
-typedef ACE_Singleton<TAO_Marshal_WString, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_WSTRING;
-
-#endif /* TAO_SINGLETONS_H */
diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp
deleted file mode 100644
index 83eba3cb119..00000000000
--- a/TAO/tao/skip.cpp
+++ /dev/null
@@ -1,737 +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 "tao/Marshal.h"
-#include "tao/CDR.h"
-#include "tao/GIOP.h"
-#include "tao/Any.h"
-#include "tao/Environment.h"
-#include "tao/debug.h"
-
-ACE_RCSID(tao, skip, "$Id$")
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr  tc,
-                             void *context,
-                             CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Boolean continue_skipping = 1;
-  TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context);
-
-  // status of skip operation
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  switch (tc->kind_)
-    {
-    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 = CORBA::TypeCode::TRAVERSE_STOP;
-      // we are not a primitive type
-    }
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_skipping == 1)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Primitive::skip detected error\n"));
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                        CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
-    }
-}
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Any::skip (CORBA::TypeCode_ptr,
-                         void *context,
-                         CORBA::Environment &ACE_TRY_ENV)
-{
-  // Typecode of the element that makes the Any.
-  CORBA::TypeCode_var elem_tc;
-
-  // Context is the CDR stream.
-  TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context);
-
-  // Status of encode operation.
-  CORBA::TypeCode::traverse_status retval =
-    stream->decode (CORBA::_tc_TypeCode,
-                    &elem_tc.inout (),
-                    0,
-                    ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      retval = stream->skip (elem_tc.in (), ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-    }
-  return retval;
-}
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr,
-                            void *context,
-                            CORBA::Environment  &ACE_TRY_ENV)
-{
-  CORBA::Boolean continue_skipping = 1;
-
-  // Context is the CDR stream.
-  TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context);
-
-#if 0
-  // Typecode to be decoded.
-  CORBA::TypeCode_ptr *tcp;
-#endif /* 0 */
-
-  // 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::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:
-              {
-                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,
-                        "TAO_Marshal_TypeCode::skip: "
-                        "Bad kind_ value in CDR stream"));
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                            CORBA::TypeCode::TRAVERSE_STOP);
-        }
-    }
-
-  if (continue_skipping == 1)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_TypeCode::skip detected error\n"));
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                        CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
-    }
-}
-
-// Encode Principal.
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr,
-                               void *context,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Boolean continue_skipping = 1;
-
-  // Context is the CDR stream.
-  TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context);
-
-  // 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 CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Principal::skip detected error\n"));
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                        CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
-    }
-}
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr,
-                          void *context,
-                          CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Boolean continue_skipping = 1;
-
-  // Context is the CDR stream.
-  TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context);
-  // return status
-  CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::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 == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_skipping == 1)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_ObjRef::skip detected error\n"));
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                        CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
-    }
-}
-
-// Decode structs.
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr  tc,
-                            void *context,
-                            CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context);
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;
-  CORBA::TypeCode_ptr param;
-
-  // Number of fields in the struct.
-  int member_count = tc->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  for (int i = 0; i < member_count
-         && retval == CORBA::TypeCode::TRAVERSE_CONTINUE;
-       i++)
-    {
-      param = tc->member_type (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      retval = stream->skip (param, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-    }
-
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_Struct::skip detected error\n"));
-  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                    CORBA::COMPLETED_MAYBE),
-                    CORBA::TypeCode::TRAVERSE_STOP);
-}
-
-// Encode unions.
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
-                         void *context,
-                         CORBA::Environment &ACE_TRY_ENV)
-{
-  // Context is the CDR stream.
-  TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context);
-
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  CORBA::TypeCode_ptr discrim_tc;
-  CORBA::TypeCode_ptr member_tc;
-  CORBA::Any_ptr member_label;
-  CORBA::ULongLong discrim_val;
-  CORBA::ULong member_count;
-  CORBA::Long  default_index;
-  CORBA::ULong i;
-  CORBA::TypeCode_ptr default_tc = 0;
-  CORBA::Boolean discrim_matched = 0;
-
-  // get the discriminator type which will enable us to skip the discriminator
-  // value
-  discrim_tc = tc->discriminator_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  // decode the discriminator value
-  retval = stream->decode (discrim_tc, &discrim_val, 0, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      // now get ready to skip the actual union value
-      default_index = tc->default_index (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      member_count = tc->member_count (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      // check which label value matches with the discriminator
-      // value. Accordingly, marshal the corresponding
-      // member_type. If none match, check if default exists
-      // and marshal accordingly. Otherwise it is an error.
-
-      for (i = 0; i < member_count; i++)
-        {
-          member_label = tc->member_label (i, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-          // do the matching
-          CORBA::TypeCode_var type = member_label->type ();
-          CORBA::ULong kind = type->kind (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-          switch (kind)
-            {
-            case CORBA::tk_short:
-              {
-                CORBA::Short s;
-                *member_label >>= s;
-                if (s == *(CORBA::Short *) &discrim_val)
-                  discrim_matched = 1;
-              }
-              break;
-            case CORBA::tk_ushort:
-              {
-                CORBA::UShort s;
-                *member_label >>= s;
-                if (s == *(CORBA::UShort *) &discrim_val)
-                  discrim_matched = 1;
-              }
-              break;
-            case CORBA::tk_long:
-              {
-                CORBA::Long l;
-                *member_label >>= l;
-                if (l == *(CORBA::Long *) &discrim_val)
-                  discrim_matched = 1;
-              }
-              break;
-            case CORBA::tk_ulong:
-              {
-                CORBA::ULong l;
-                *member_label >>= l;
-                if (l == *(CORBA::ULong *) &discrim_val)
-                  discrim_matched = 1;
-              }
-              break;
-            case CORBA::tk_enum:
-              {
-                CORBA::ULong ul;
-                TAO_InputCDR stream (member_label->_tao_get_cdr ());
-                (void)stream.decode (discrim_tc, &ul, 0, ACE_TRY_ENV);
-                if (ul == *(CORBA::ULong *) &discrim_val)
-                  discrim_matched = 1;
-              }
-              break;
-            case CORBA::tk_char:
-              {
-                CORBA::Char c;
-                *member_label >>= CORBA::Any::to_char (c);
-                if (c == *(CORBA::Char *) &discrim_val)
-                  discrim_matched = 1;
-              }
-              break;
-            case CORBA::tk_wchar:
-              CORBA::WChar wc;
-              *member_label >>= CORBA::Any::to_wchar (wc);
-              if (wc == *(CORBA::WChar *) &discrim_val)
-                discrim_matched = 1;
-              break;
-            case CORBA::tk_boolean:
-              {
-                CORBA::Boolean b;
-                *member_label >>= CORBA::Any::to_boolean (b);
-                if (b == *(CORBA::Boolean *) &discrim_val)
-                  discrim_matched = 1;
-              }
-              break;
-            default:
-              ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                                CORBA::TypeCode::TRAVERSE_STOP);
-            }// end of switch
-
-          // get the member typecode
-          member_tc = tc->member_type (i, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-          // have we reached the default label, if so save a handle to
-          // the typecode for the default
-
-          if (default_index >= 0 && default_index-- == 0)
-            default_tc = member_tc;
-          if (discrim_matched)
-            {
-              // marshal according to the matched typecode
-              return stream->skip (member_tc, ACE_TRY_ENV);
-            }
-        }
-      if (default_tc != 0)
-        return stream->skip (default_tc, ACE_TRY_ENV);
-    }
-  return retval;
-}
-
-// decode string
-CORBA::TypeCode::traverse_status
-TAO_Marshal_String::skip (CORBA::TypeCode_ptr,
-                          void *context,
-                          CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Boolean continue_skipping = 1;
-  // Context is the CDR stream.
-  TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context);
-
-
-  // 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 CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_TypeCode::skip detected error"));
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                        CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
-    }
-}
-
-// Decode sequence.
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr  tc,
-                            void *context,
-                            CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Boolean continue_skipping = 1;
-  TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context);
-  // Typecode of the element.
-  CORBA::TypeCode_ptr tc2;
-  // 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).
-
-  continue_skipping = stream->read_ulong (bounds);
-
-  if (continue_skipping)
-    {
-      // No point decoding an empty sequence.
-      if (bounds > 0)
-        {
-          // Get element typecode.
-          tc2 = tc->content_type (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-          while (bounds-- && continue_skipping == 1)
-            {
-              continue_skipping = stream->skip (tc2, ACE_TRY_ENV);
-              ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-            }
-          if (continue_skipping)
-            return CORBA::TypeCode::TRAVERSE_CONTINUE;
-        } // length is > 0
-      else
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-    }
-
-  // error exit
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_Sequence::skip detected error\n"));
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    CORBA::TypeCode::TRAVERSE_STOP);
-}
-
-// Decode array.
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Array::skip (CORBA::TypeCode_ptr  tc,
-                           void *context,
-                           CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Boolean continue_skipping = 1;
-  TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context);
-
-  // Typecode of the element.
-  CORBA::TypeCode_ptr tc2;
-
-  // retrieve the bounds of the array
-  CORBA::ULong  bounds = tc->length (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  // get element typecode
-  tc2 = tc->content_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  while (bounds-- && continue_skipping == 1)
-    {
-      continue_skipping = stream->skip (tc2, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-    }
-
-  if (continue_skipping)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  // error exit
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_Sequence::skip detected error\n"));
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    CORBA::TypeCode::TRAVERSE_STOP);
-}
-
-// Decode alias.
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr  tc,
-                         void *context,
-                         CORBA::Environment &ACE_TRY_ENV)
-{
-  // Typecode of the aliased type.
-  CORBA::TypeCode_ptr tc2;
-  CORBA::Boolean continue_skipping = 1;
-
-  // Context is the CDR stream.
-  TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context);
-
-  // Status of decode operation.
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  tc2 = tc->content_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  retval = stream->skip (tc2, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  //  tc2->_decr_refcnt ();
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_skipping == 1)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_Alias::skip detected error\n"));
-  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                    CORBA::COMPLETED_MAYBE),
-                    CORBA::TypeCode::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.
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Except::skip (CORBA::TypeCode_ptr  tc,
-                          void *context,
-                          CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context);
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;
-  CORBA::TypeCode_ptr param;
-
-  // skip the Repository ID
-  if (!stream->skip_string ())
-    return CORBA::TypeCode::TRAVERSE_STOP;
-
-  // Number of fields in the exception
-  int member_count = tc->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  for (int i = 0; i < member_count
-         && retval == CORBA::TypeCode::TRAVERSE_CONTINUE;
-       i++)
-    {
-      param = tc->member_type (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      retval = stream->skip (param, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-    }
-
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_Except::skip detected error\n"));
-  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                    CORBA::COMPLETED_MAYBE),
-                    CORBA::TypeCode::TRAVERSE_STOP);
-}
-
-// decode wstring
-CORBA::TypeCode::traverse_status
-TAO_Marshal_WString::skip (CORBA::TypeCode_ptr,
-                           void *context,
-                           CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Boolean continue_skipping = 1;
-  TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context);
-  CORBA::ULong len;
-
-  // 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_skipping = stream->read_ulong (len);
-
-  if (len != 0)
-    while (continue_skipping != 0 && len--)
-      {
-        continue_skipping = stream->skip_wchar ();
-      }
-
-  if (continue_skipping == 1)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_WString::skip detected error\n"));
-  ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                    CORBA::COMPLETED_MAYBE),
-                    CORBA::TypeCode::TRAVERSE_STOP);
-}
diff --git a/TAO/tao/t-sizes.cpp b/TAO/tao/t-sizes.cpp
deleted file mode 100644
index bba12eb1924..00000000000
--- a/TAO/tao/t-sizes.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// $Id$
-
-#include "tao/corbafwd.h"
-
-ACE_RCSID(tao, t_sizes, "$Id$")
-
-#define SHOWSIZE(t) ACE_OS::printf ("sizeof (%s) = %u\n", #t, sizeof(t));
-
-int
-main (int, char*[])
-{
-  SHOWSIZE (CORBA::Boolean);
-  SHOWSIZE (CORBA::Short);
-  SHOWSIZE (CORBA::Long);
-  SHOWSIZE (CORBA::LongLong);
-  SHOWSIZE (CORBA::Float);
-  SHOWSIZE (CORBA::Double);
-  SHOWSIZE (CORBA::LongDouble);
-}
diff --git a/TAO/tao/tao-dll.icc b/TAO/tao/tao-dll.icc
deleted file mode 100644
index a9c56a5fe9e..00000000000
--- a/TAO/tao/tao-dll.icc
+++ /dev/null
@@ -1,128 +0,0 @@
-if $__TOS_WIN__ {
-	option PlatformOptions = define ("ACE_HAS_WINSOCK2","1"),
-	         define ("WIN32","1"),
-        	 define ("_WINDOWS","1"),
-        	 define("TAO_HAS_DLL","0"),
-	         define("TAO_BUILD_DLL","0")
-	TARG = "tao.dll"
-}
-if $__TOS_AIX__ {
-	option PlatformOptions = null
-	TARG = "tao.shr.a"
-}
-
-
-option
-      	 PlatformOptions,
-         define("ACE_HAS_DLL","0"),
-         define ("__ACE_INLINE__","0"),
-         incl(searchPath,'H:\ACE_wrappers'),
-         incl(searchPath,'H:\ACE_wrappers\TAO'),
-         link(exportAll),
-         link(linkwithsharedlib),
-         link(linkWithMultiThreadLib,yes),
-         link(libSearchPath,'H:\ACE_wrappers\ace'),
-         link(linkWithMultiThreadLib,yes)
-     {
-	target type(dll) TARG
-	{
-                  option macros(global)
-                  {
-                      source type(cpp) "ace/OS.h"
-                      source type(cpp) "ace/ACE.h"
-                      source type(cpp) "tao/TAO.h"
-                  }
-
-	   source type (cpp) "Active_Object_Map.cpp"
-	   source type (cpp) "Any.cpp"
-	   source type (cpp) "CDR.cpp"
-	   source type (cpp) "Client_Strategy_Factory.cpp"
-	   source type (cpp) "Connect.cpp"
-	   source type (cpp) "CurrentC.cpp"
-	   source type (cpp) "CurrentS.cpp"
-	   source type (cpp) "DynAnyC.cpp"
-	   source type (cpp) "DynAnyS.cpp"
-	   source type (cpp) "DynAny_i.cpp"
-	   source type (cpp) "DynArray_i.cpp"
-	   source type (cpp) "DynEnum_i.cpp"
-	   source type (cpp) "DynSequence_i.cpp"
-	   source type (cpp) "DynStruct_i.cpp"
-	   source type (cpp) "DynUnion_i.cpp"
-	   source type (cpp) "DynUnion_i_T.cpp"
-	   source type (cpp) "Environment.cpp"
-	   source type (cpp) "Exception.cpp"
-	   source type (cpp) "Forwarding_Servant.cpp"
-	   source type (cpp) "GIOP.cpp"
-	   source type (cpp) "IIOP_Acceptor.cpp"
-	   source type (cpp) "IIOP_Connector.cpp"
-	   source type (cpp) "IIOP_Interpreter.cpp"
-	   source type (cpp) "IIOP_ORB.cpp"
-	   source type (cpp) "IIOP_Profile.cpp"
-	   source type (cpp) "IIOP_Transport.cpp"
-	   source type (cpp) "InconsistentTypeCodeC.cpp"
-	   source type (cpp) "Invocation.cpp"
-	   source type (cpp) "MProfile.cpp"
-	   source type (cpp) "Managed_Types.cpp"
-	   source type (cpp) "Marshal.cpp"
-	   source type (cpp) "NVList.cpp"
-	   source type (cpp) "ORB.cpp"
-	   source type (cpp) "ORB_Core.cpp"
-	   source type (cpp) "ORB_Strategies_T.cpp"
-	   source type (cpp) "Object.cpp"
-	   source type (cpp) "Object_KeyC.cpp"
-	   source type (cpp) "Operation_Table.cpp"
-	   source type (cpp) "POA.cpp"
-	   source type (cpp) "POAC.cpp"
-	   source type (cpp) "POAS.cpp"
-	   source type (cpp) "Pluggable.cpp"
-	   source type (cpp) "PolicyC.cpp"
-	   source type (cpp) "PolicyS.cpp"
-	   source type (cpp) "Principal.cpp"
-	   source type (cpp) "Request.cpp"
-	   source type (cpp) "Sequence.cpp"
-	   source type (cpp) "Sequence_T.cpp"
-	   source type (cpp) "Servant_Base.cpp"
-	   source type (cpp) "Server_Request.cpp"
-	   source type (cpp) "Server_Strategy_Factory.cpp"
-	   source type (cpp) "Stub.cpp"
-	   source type (cpp) "TAO.cpp"
-	   source type (cpp) "TAO_Internal.cpp"
-	   source type (cpp) "Typecode.cpp"
-	   source type (cpp) "Typecode_Constants.cpp"
-	   source type (cpp) "Union.cpp"
-	   source type (cpp) "append.cpp"
-	   source type (cpp) "debug.cpp"
-	   source type (cpp) "decode.cpp"
-	   source type (cpp) "deep_free.cpp"
-	   source type (cpp) "default_client.cpp"
-	   source type (cpp) "default_server.cpp"
-	   source type (cpp) "encode.cpp"
-	   source type (cpp) "params.cpp"
-	   source type (cpp) "poa_T.cpp"
-	   source type (cpp) "skip.cpp"
-	   source type (cpp) "t-sizes.cpp"
-	   source type (cpp) "varout.cpp"
-           // Template implementation files (#pragma implementation)
-           source type (cpp) "DynUnion_i_T.cpp"
-           source type (cpp) "ORB_Strategies_T.cpp"
-           source type (cpp) "Sequence_T.cpp"
-           source type (cpp) "poa_T.cpp"
-           source type (cpp) "varout.cpp"
-
-           // Libraries
-	   if $__TOS_WIN__ {
-		source type (lib) "aced.lib"
-		source type (lib) "advapi32.lib"
-		source type (lib) "user32.lib"
-		source type (lib) "ws2_32.lib"
-		source type (lib) "wsock32.lib"
-		source type (lib) "mswsock.lib"
-	   }
-	   if $__TOS_AIX__ {
-		source type (lib) "aced.shr.a"
-		source type (lib) "libtli_r.a"
-		source type (lib) "libpthreads.a"
-		source type (lib) "libc_r.a"
-	   }
-	}
-   }
diff --git a/TAO/tao/tao-lib.icc b/TAO/tao/tao-lib.icc
deleted file mode 100644
index 511ad58ec02..00000000000
--- a/TAO/tao/tao-lib.icc
+++ /dev/null
@@ -1,128 +0,0 @@
-if $__TOS_WIN__ {
-	option PlatformOptions = define ("ACE_HAS_WINSOCK2","1"),
-	         define ("WIN32","1"),
-        	 define ("_WINDOWS","1"),
-        	 define("TAO_HAS_DLL","0"),
-	         define("TAO_BUILD_DLL","0")
-	TARG = "tao.lib"
-}
-if $__TOS_AIX__ {
-	option PlatformOptions = null
-	TARG = "tao.a"
-}
-
-
-option
-      	 PlatformOptions,
-         define("ACE_HAS_DLL","0"),
-         define ("__ACE_INLINE__","0"),
-         incl(searchPath,'H:\ACE_wrappers'),
-         incl(searchPath,'H:\ACE_wrappers\TAO'),
-         link(exportAll),
-         link(linkwithsharedlib),
-         link(linkWithMultiThreadLib,yes),
-         link(libSearchPath,'H:\ACE_wrappers\ace'),
-         link(linkWithMultiThreadLib,yes)
-     {
-	target type(lib) TARG
-	{
-                  option macros(global)
-                  {
-                      source type(cpp) "ace/OS.h"
-                      source type(cpp) "ace/ACE.h"
-                      source type(cpp) "tao/TAO.h"
-                  }
-
-	   source type (cpp) "Active_Object_Map.cpp"
-	   source type (cpp) "Any.cpp"
-	   source type (cpp) "CDR.cpp"
-	   source type (cpp) "Client_Strategy_Factory.cpp"
-	   source type (cpp) "Connect.cpp"
-	   source type (cpp) "CurrentC.cpp"
-	   source type (cpp) "CurrentS.cpp"
-	   source type (cpp) "DynAnyC.cpp"
-	   source type (cpp) "DynAnyS.cpp"
-	   source type (cpp) "DynAny_i.cpp"
-	   source type (cpp) "DynArray_i.cpp"
-	   source type (cpp) "DynEnum_i.cpp"
-	   source type (cpp) "DynSequence_i.cpp"
-	   source type (cpp) "DynStruct_i.cpp"
-	   source type (cpp) "DynUnion_i.cpp"
-	   source type (cpp) "DynUnion_i_T.cpp"
-	   source type (cpp) "Environment.cpp"
-	   source type (cpp) "Exception.cpp"
-	   source type (cpp) "Forwarding_Servant.cpp"
-	   source type (cpp) "GIOP.cpp"
-	   source type (cpp) "IIOP_Acceptor.cpp"
-	   source type (cpp) "IIOP_Connector.cpp"
-	   source type (cpp) "IIOP_Interpreter.cpp"
-	   source type (cpp) "IIOP_ORB.cpp"
-	   source type (cpp) "IIOP_Profile.cpp"
-	   source type (cpp) "IIOP_Transport.cpp"
-	   source type (cpp) "InconsistentTypeCodeC.cpp"
-	   source type (cpp) "Invocation.cpp"
-	   source type (cpp) "MProfile.cpp"
-	   source type (cpp) "Managed_Types.cpp"
-	   source type (cpp) "Marshal.cpp"
-	   source type (cpp) "NVList.cpp"
-	   source type (cpp) "ORB.cpp"
-	   source type (cpp) "ORB_Core.cpp"
-	   source type (cpp) "ORB_Strategies_T.cpp"
-	   source type (cpp) "Object.cpp"
-	   source type (cpp) "Object_KeyC.cpp"
-	   source type (cpp) "Operation_Table.cpp"
-	   source type (cpp) "POA.cpp"
-	   source type (cpp) "POAC.cpp"
-	   source type (cpp) "POAS.cpp"
-	   source type (cpp) "Pluggable.cpp"
-	   source type (cpp) "PolicyC.cpp"
-	   source type (cpp) "PolicyS.cpp"
-	   source type (cpp) "Principal.cpp"
-	   source type (cpp) "Request.cpp"
-	   source type (cpp) "Sequence.cpp"
-	   source type (cpp) "Sequence_T.cpp"
-	   source type (cpp) "Servant_Base.cpp"
-	   source type (cpp) "Server_Request.cpp"
-	   source type (cpp) "Server_Strategy_Factory.cpp"
-	   source type (cpp) "Stub.cpp"
-	   source type (cpp) "TAO.cpp"
-	   source type (cpp) "TAO_Internal.cpp"
-	   source type (cpp) "Typecode.cpp"
-	   source type (cpp) "Typecode_Constants.cpp"
-	   source type (cpp) "Union.cpp"
-	   source type (cpp) "append.cpp"
-	   source type (cpp) "debug.cpp"
-	   source type (cpp) "decode.cpp"
-	   source type (cpp) "deep_free.cpp"
-	   source type (cpp) "default_client.cpp"
-	   source type (cpp) "default_server.cpp"
-	   source type (cpp) "encode.cpp"
-	   source type (cpp) "params.cpp"
-	   source type (cpp) "poa_T.cpp"
-	   source type (cpp) "skip.cpp"
-	   source type (cpp) "t-sizes.cpp"
-	   source type (cpp) "varout.cpp"
-           // Template implementation files (#pragma implementation)
-           source type (cpp) "DynUnion_i_T.cpp"
-           source type (cpp) "ORB_Strategies_T.cpp"
-           source type (cpp) "Sequence_T.cpp"
-           source type (cpp) "poa_T.cpp"
-           source type (cpp) "varout.cpp"
-
-           // Libraries
-	   if $__TOS_WIN__ {
-		source type (lib) "aced.lib"
-		source type (lib) "advapi32.lib"
-		source type (lib) "user32.lib"
-		source type (lib) "ws2_32.lib"
-		source type (lib) "wsock32.lib"
-		source type (lib) "mswsock.lib"
-	   }
-	   if $__TOS_AIX__ {
-		source type (lib) "aced.a"
-		source type (lib) "libtli_r.a"
-		source type (lib) "libpthreads.a"
-		source type (lib) "libc_r.a"
-	   }
-	}
-   }
diff --git a/TAO/tao/tao.bld b/TAO/tao/tao.bld
deleted file mode 100644
index 5114dadb183..00000000000
--- a/TAO/tao/tao.bld
+++ /dev/null
@@ -1,86 +0,0 @@
-#!build
-default:
-	library
-	:defines=DEBUG
-Any.cpp
-	C++
-CDR.cpp
-	C++
-Client_Strategy_Factory.cpp
-	C++
-Connect.cpp
-	C++
-debug.cpp
-	C++
-decode.cpp
-	C++
-deep_copy.cpp
-	C++
-deep_free.cpp
-	C++
-default_client.cpp
-	C++
-default_server.cpp
-	C++
-encode.cpp
-	C++
-Exception.cpp
-	C++
-GIOP.cpp
-	C++
-CDR_Interpreter.cpp
-	C++
-IIOP_Object.cpp
-	C++
-IIOP_ORB.cpp
-	C++
-Marshal.cpp
-	C++
-NVList.cpp
-	C++
-Object.cpp
-	C++
-Object_KeyC.cpp
-	C++
-Object_Table.cpp
-	C++
-Operation_Table.cpp
-	C++
-ORB.cpp
-	C++
-ORB_Core.cpp
-	C++
-params.cpp
-	C++
-POA.cpp
-	C++
-POAC.cpp
-	C++
-POAS.cpp
-	C++
-Principal.cpp
-	C++
-Request.cpp
-	C++
-Sequence.cpp
-	C++
-Servant_Base.cpp
-	C++
-Server_Request.cpp
-	C++
-Server_Strategy_Factory.cpp
-	C++
-Stub.cpp
-	C++
-TAO.cpp
-	C++
-TAO_Internal.cpp
-	C++
-Timeprobe.cpp
-	C++
-Typecode.cpp
-	C++
-Typecode_Constants.cpp
-	C++
-timetest.cpp
-	C++
diff --git a/TAO/tao/try_macros.h b/TAO/tao/try_macros.h
deleted file mode 100644
index ea1259d90af..00000000000
--- a/TAO/tao/try_macros.h
+++ /dev/null
@@ -1,356 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    try_macros.h
-//
-// = DESCRIPTION
-//     This file has been depricated.
-//
-// = AUTHOR
-//     Copyright by Douglas C. Schmidt.
-//
-//   *****************************************************************
-//   *                                                               *
-//   *        NOTICE !!!    NOTICE !!!   NOTICE !!!   NOTICE !!!     *
-//   *                                                               *
-//   *        The macros in this file is deprecated.                 *
-//   *                                                               *
-//   *        Please check out $ACE_ROOT/ace/CORBA_macros.h          *
-//   *        and $ACE_ROOT/docs/exceptions.html for a new           *
-//   *        set of helper macros that replace this file.           *
-//   *                                                               *
-//   *        We strongely encourage you to stop using the           *
-//   *        macros in this file.  You should try to convert        *
-//   *        your program to use the new ACE try macros             *
-//   *        which are simpler to use and easier to remember.       *
-//   *        However, if you still insist on using these old        *
-//   *        macros, you can do this by uncomment the "#define      *
-//   *        TAO_USES_DEPRECATED_TAO_TRY_MACROS" below.             *
-//   *                                                               *
-//   *        Again, we no longer maintain this file and it will     *
-//   *        eventually go away.                                    *
-//   *                                                               *
-//   *****************************************************************
-//
-// ============================================================================
-
-#ifndef TAO_TRY_MACROS_H
-#define TAO_TRY_MACROS_H
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-//   *****************************************************************
-//   *                                                               *
-//   *      Uncomment the following line to use TAO try macros.      *
-//   *                                                               *
-//   *****************************************************************
-//#define TAO_USES_DEPRECATED_TAO_TRY_MACROS
-
-#include "tao/orbconf.h"
-#include "ace/CORBA_macros.h"
-
-#if defined (TAO_USES_DEPRECATED_TAO_TRY_MACROS)
-
-// Define a local enviroment variable...
-#define TAO_IN_ENV  ACE_TRY_ENV
-#define TAO_TRY_ENV _tao_try_environment
-
-// These macros can be used to write "portable" code between platforms
-// supporting CORBA exceptions natively (using the C++ exceptions) or
-// through the Enviroment parameter.  Their use requires some
-// discipline, but they certainly help...
-
-#if defined (TAO_HAS_EXCEPTIONS)
-
-// The first "do" scope is for the TAO_TRY_ENV.
-// The second "do" scope is for the TAO_CHECK_ENV continues.
-// These are all on one line so the keywords don't confuse compilers.
-#define TAO_TRY do { CORBA_Environment TAO_TRY_ENV; try {
-#define TAO_TRY_VAR(X) do { CORBA_Environment &TAO_TRY_ENV = X; \
-                            ACE_UNUSED_ARG (TAO_TRY_ENV); try {
-
-#define TAO_TRY_EX(LABEL) do { CORBA_Environment TAO_TRY_ENV; try {
-#define TAO_TRY_VAR_EX(X,LABEL) do { CORBA_Environment &TAO_TRY_ENV = X; \
-                                ACE_UNUSED_ARG (TAO_TRY_ENV); try {
-
-#define TAO_CATCH(TYPE,VAR) } catch (TYPE & VAR) { ACE_UNUSED_ARG (VAR);
-
-// @@ @@ @@ This conditional compilation is meant to be catch abnormal
-//          exceptions so the debugger can catch the exception for us.
-#if defined (TAO_DONT_CATCH_DOT_DOT_DOT)
-#define TAO_CATCHALL TAO_CATCH (TAO_DONT_CATCH, ex)
-#else
-#define TAO_CATCHALL } catch (...) {
-#endif /* TAO_DONT_CATCH_DOT_DOT_DOT */
-
-#define TAO_ENDTRY }} while (0)
-
-// Use this macro if there's a return statement following TAO_ENDTRY
-// and the statement is the last statement in the function.
-#define TAO_ENDTRY_RETURN(X) TAO_ENDTRY; ACE_NOTREACHED (return X)
-
-// No need to do checking, exception handling does it for us.
-#define TAO_CHECK_ENV
-#define TAO_CHECK_ENV_EX(LABEL)
-#define TAO_CHECK_ENV_RETURN(X, Y)
-#define TAO_CHECK_ENV_RETURN_VOID(X)
-
-#define TAO_TRY_THROW(EXCEPTION) throw EXCEPTION
-#define TAO_TRY_THROW_EX(EXCEPTION,LABEL) throw EXCEPTION
-
-#define TAO_THROW(EXCEPTION) throw EXCEPTION
-#define TAO_THROW_ENV(EXCEPTION, ENV) do { \
-  ACE_UNUSED_ARG (ENV); \
-  throw EXCEPTION; } while (0)
-#define TAO_RETHROW throw
-
-#define TAO_GOTO(LABEL) goto LABEL
-#define TAO_LABEL(LABEL) LABEL:
-
-#if defined (ACE_WIN32)
-// MSVC++ gives a warning if there is no return after the throw
-// expression, it is possible that other compilers have the same
-// problem.
-#define TAO_THROW_ENV_RETURN(EXCEPTION, ENV, RETURN) do { \
-  throw EXCEPTION; \
-  return RETURN; } while (0)
-#define TAO_RETHROW_RETURN(RETURN) throw; \
-  return RETURN
-#define TAO_RETHROW_RETURN_VOID throw; \
-  return
-
-#else
-
-#define TAO_THROW_ENV_RETURN(EXCEPTION, ENV, RETURN) do { \
-  ACE_UNUSED_ARG (ENV); \
-  throw EXCEPTION; } while (0)
-
-#define TAO_RETHROW_RETURN(RETURN) throw
-#define TAO_RETHROW_RETURN_VOID throw
-
-#endif /* ACE_WIN32 */
-
-#define TAO_THROW_RETURN(EXCEPTION,RETURN) TAO_THROW_ENV_RETURN(EXCEPTION,TAO_IN_ENV,RETURN)
-
-#define TAO_RETHROW_SAME_ENV_RETURN(RETURN) TAO_RETHROW_RETURN (RETURN)
-#define TAO_RETHROW_SAME_ENV_RETURN_VOID TAO_RETHROW_RETURN_VOID
-
-// #define TAO_THROW_SPEC(X) ACE_THROW_SPEC(X)
-#define TAO_THROW_SPEC(X)
-// The IDL compiler is not generating throw specs, so putting them in
-// the servant implementation only results in compilation
-// errors. Further the spec does not say that we should generate them
-// and I'm concerned that putting a throw spec can result in an
-// "unexpected" exception, which *could* be translated into a
-// CORBA::UNKNOWN, but I'm not sure.
-
-#else /* ACE_HAS_EXCEPTIONS && TAO_IDL_COMPILES_HAS_EXCEPTIONS */
-
-#define TAO_TRY_VAR(X) \
-do { CORBA_Environment &TAO_TRY_ENV = X; \
-int TAO_TRY_FLAG = 1; \
-TAO_TRY_LABEL: \
-if (TAO_TRY_FLAG) \
-do {
-
-// The first "do" scope is for the TAO_TRY_ENV.
-// The second "do" scope is for the TAO_CHECK_ENV continues.
-#define TAO_TRY \
-do { CORBA_Environment TAO_TRY_ENV; \
-int TAO_TRY_FLAG = 1; \
-TAO_TRY_LABEL: \
-if (TAO_TRY_FLAG) \
-do {
-
-// This serves a similar purpose as the macro above,
-// The second "do" scope is for the TAO_CHECK_ENV continues.
-#define TAO_TRY_EX(LABEL) \
-do { \
-CORBA_Environment TAO_TRY_ENV; \
-int TAO_TRY_FLAG = 1; \
-TAO_TRY_LABEL ## LABEL: \
-if (TAO_TRY_FLAG) \
-do {
-
-#define TAO_TRY_VAR_EX(X,LABEL) \
-do { \
-CORBA_Environment &TAO_TRY_ENV = X; \
-int TAO_TRY_FLAG = 1; \
-TAO_TRY_LABEL ## LABEL: \
-if (TAO_TRY_FLAG) \
-do {
-
-// Throwing an exception within a try block must be treated differently
-// on platforms that don't support native exception because the exception
-// won't get caught by the catch clauses automatically.
-#define TAO_TRY_THROW(EXCEPTION) \
-{\
-  TAO_TRY_ENV.exception (new EXCEPTION); \
-  TAO_TRY_FLAG = 0; \
-  goto TAO_TRY_LABEL; \
-}
-
-#define TAO_TRY_THROW_EX (EXCEPTION,LABEL) \
-{\
-  TAO_TRY_ENV.exception (new EXCEPTION); \
-  TAO_TRY_FLAG = 0; \
-  goto TAO_TRY_LABEL ## LABEL; \
-}
-
-// Each CATCH statement ends the previous scope and starts a new one.
-// Since all CATCH statements can end the TAO_TRY macro, they must all
-// start a new scope for the next potential TAO_CATCH.  The TAO_ENDTRY
-// will finish them all.  Cool, eh?
-#define TAO_CATCH(TYPE,VAR) \
-} while (0); \
-do \
-if (TAO_TRY_ENV.exception () != 0 && \
-    TYPE::_narrow(TAO_TRY_ENV.exception ()) != 0) { \
-  TYPE &VAR = *TYPE::_narrow (TAO_TRY_ENV.exception ()); \
-  ACE_UNUSED_ARG (VAR);
-
-#define TAO_CATCHALL TAO_CATCH(CORBA_Exception, ex)
-
-// The first "while" closes the local scope.  The second "while"
-// closes the TAO_TRY_ENV scope.
-#define TAO_ENDTRY \
-} while (0); \
-} while (0)
-
-// Use this macro if there's a return statement following TAO_ENDTRY
-// and the statement is the last statement in the function.
-#define TAO_ENDTRY_RETURN(X) TAO_ENDTRY; return X
-
-// If continue is called, control will skip to the next TAO_CATCH
-// statement.
-#define TAO_CHECK_ENV \
-{\
-if (TAO_TRY_ENV.exception () != 0) \
-  { \
-    TAO_TRY_FLAG = 0; \
-    goto TAO_TRY_LABEL; \
-  } \
-}
-
-// Same as above but for TAO_TRY_EX
-#define TAO_CHECK_ENV_EX(LABEL) \
-{\
-if (TAO_TRY_ENV.exception () != 0) \
-  { \
-    TAO_TRY_FLAG = 0; \
-    goto TAO_TRY_LABEL ## LABEL; \
-  } \
-}
-
-#define TAO_CHECK_ENV_RETURN(X, Y) \
- if ( X . exception () != 0) return Y
-
-#define TAO_CHECK_ENV_RETURN_VOID(X) \
- if ( X . exception () != 0) return
-
-#define TAO_THROW(EXCEPTION) \
-do {\
- TAO_IN_ENV.exception (new EXCEPTION); \
-  return; } while (0)
-
-#define TAO_THROW_ENV(EXCEPTION, ENV) \
-do {\
-  ENV.exception (new EXCEPTION); \
-  return; } while (0)
-
-#define TAO_THROW_RETURN(EXCEPTION, RETURN) \
-do {\
- TAO_IN_ENV.exception (new EXCEPTION); \
- return RETURN; } while (0)
-
-#define TAO_THROW_ENV_RETURN(EXCEPTION, ENV, RETURN) \
-do {\
- ENV.exception (new EXCEPTION); \
- return RETURN; } while (0)
-
-#define TAO_RETHROW \
-TAO_IN_ENV.exception (TAO_TRY_ENV.exception ()); \
-return
-
-#define TAO_GOTO(LABEL) goto LABEL
-#define TAO_LABEL(LABEL) LABEL:
-
-#define TAO_RETHROW_RETURN(RETURN) \
-TAO_IN_ENV.exception (TAO_TRY_ENV.exception ()); \
-return RETURN
-
-#define TAO_RETHROW_RETURN_VOID \
-TAO_IN_ENV.exception (TAO_TRY_ENV.exception ()); \
-return
-
-#define TAO_RETHROW_SAME_ENV_RETURN(RETURN) return RETURN
-#define TAO_RETHROW_SAME_ENV_RETURN_VOID return
-
-#define TAO_THROW_SPEC(X)
-
-#endif /* TAO_HAS_EXCEPTIONS */
-
-#define TAO_CATCHANY TAO_CATCH(CORBA_Exception, ex)
-
-#define TAO_CHECK_RETURN(Y) TAO_CHECK_ENV_RETURN (TAO_IN_ENV, Y)
-#define TAO_CHECK_RETURN_VOID TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV)
-
-// This macros can be used even outside the TAO_TRY blocks, in fact
-// some are designed for that purpose.
-
-#define TAO_CHECK_ENV_PRINT_RETURN(ENV, PRINT_STRING, RETURN) \
- if (ENV . exception () != 0) \
-    { \
-        ENV.print_exception (PRINT_STRING); \
-        return RETURN; \
-    }
-
-#define TAO_CHECK_ENV_PRINT_RETURN_VOID(ENV, PRINT_STRING) \
- if (ENV . exception () != 0) \
-    { \
-        ENV.print_exception (PRINT_STRING); \
-        return; \
-    }
-
-// This macros are used to grab a lock using a Guard, test that the
-// lock was correctly grabbed and throw an exception on failure.
-// If you do not wish to throw an exception, but just to return a
-// value please use the ACE macros.
-#define TAO_GUARD_THROW(MUTEX,OBJ,LOCK,ENV,EXCEPTION) \
-  ACE_Guard<MUTEX> OBJ (LOCK); \
-  if (OBJ.locked () == 0) \
-      TAO_THROW_ENV (EXCEPTION,ENV)
-
-#define TAO_GUARD_THROW_RETURN(MUTEX,OBJ,LOCK,RETURN,ENV,EXCEPTION) \
-  ACE_Guard<MUTEX> OBJ (LOCK); \
-  if (OBJ.locked () == 0) \
-      TAO_THROW_ENV_RETURN (EXCEPTION,ENV,RETURN)
-
-#define TAO_READ_GUARD_THROW(MUTEX,OBJ,LOCK,ENV,EXCEPTION) \
-  ACE_Read_Guard<MUTEX> OBJ (LOCK); \
-  if (OBJ.locked () == 0) \
-      TAO_THROW_ENV (EXCEPTION,ENV)
-
-#define TAO_READ_GUARD_THROW_RETURN(MUTEX,OBJ,LOCK,RETURN,ENV,EXCEPTION) \
-  ACE_Read_Guard<MUTEX> OBJ (LOCK); \
-  if (OBJ.locked () == 0) \
-      TAO_THROW_ENV_RETURN (EXCEPTION,ENV,RETURN)
-
-#define TAO_WRITE_GUARD_THROW(MUTEX,OBJ,LOCK,ENV,EXCEPTION) \
-  ACE_Write_Guard<MUTEX> OBJ (LOCK); \
-  if (OBJ.locked () == 0) \
-      TAO_THROW_ENV (EXCEPTION,ENV)
-
-#define TAO_WRITE_GUARD_THROW_RETURN(MUTEX,OBJ,LOCK,RETURN,ENV,EXCEPTION) \
-  ACE_Write_Guard<MUTEX> OBJ (LOCK); \
-  if (OBJ.locked () == 0) \
-      TAO_THROW_ENV_RETURN (EXCEPTION,ENV,RETURN)
-#endif /* TAO_USES_DEPRECATED_TAO_TRY_MACROS */
-#endif /* TAO_TRY_MACROS_H */
diff --git a/TAO/tao/varout.cpp b/TAO/tao/varout.cpp
deleted file mode 100644
index d06b4241fb0..00000000000
--- a/TAO/tao/varout.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    varout.cpp
-//
-// = DESCRIPTION
-//     Templates for _var and _out types
-//
-// = AUTHOR
-//
-//   Aniruddha Gokhale
-//   Carlos O'Ryan
-// ============================================================================
-
-#if !defined (TAO_VAROUT_C)
-#define TAO_VAROUT_C
-
-#include "tao/varout.h"
-#include "tao/Sequence.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/varout.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(tao, varout, "$Id$")
-
-template<class T, class T_var>
-TAO_Object_Field_T<T,T_var>::
-    TAO_Object_Field_T (const TAO_Object_Manager<T,T_var> & rhs)
-  : ptr_ (T::_duplicate (rhs.in ()))
-{
-}
-
-template<class T, class T_var> TAO_Object_Field_T<T,T_var>&
-TAO_Object_Field_T<T,T_var>::
-    operator= (const TAO_Object_Manager<T,T_var> & rhs)
-{
-  T* tmp = T::_duplicate (rhs.in ());
-  CORBA::release (this->ptr_);
-  this->ptr_ = tmp;
-
-  return *this;
-}
-
-template<class T, class T_var>
-TAO_Object_Field_T<T,T_var>::
-    TAO_Object_Field_T (const T_var & rhs)
-  : ptr_ (T::_duplicate (rhs.in ()))
-{
-}
-
-template<class T, class T_var> TAO_Object_Field_T<T,T_var>&
-TAO_Object_Field_T<T,T_var>::
-    operator= (const T_var & rhs)
-{
-  T* tmp = T::_duplicate (rhs.in ());
-  CORBA::release (this->ptr_);
-  this->ptr_ = tmp;
-
-  return *this;
-}
-
-template<class T, class T_var> void
-TAO_Object_Field_T<T,T_var>::_downcast (CORBA_Object* base_ptr,
-                                        CORBA_Environment &ACE_TRY_ENV)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = 0;
-  this->ptr_ = T::_narrow (base_ptr, ACE_TRY_ENV);
-}
-
-template<class T, class T_var> CORBA_Object*
-TAO_Object_Field_T<T,T_var>::_upcast (void)
-{
-  return this->ptr_;
-}
-
-template<class T, class T_var> void
-TAO_Object_Field_T<T,T_var>::_release (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = 0;
-}
-
-#endif /* TAO_VAROUT_C */
diff --git a/TAO/tao/varout.h b/TAO/tao/varout.h
deleted file mode 100644
index 21e8f7d577d..00000000000
--- a/TAO/tao/varout.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    varout.h
-//
-// = DESCRIPTION
-//     Templates for _var and _out types
-//
-// = AUTHOR
-//   Aniruddha Gokhale <gokhale@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_VAROUT_H
-#define TAO_VAROUT_H
-
-#include "tao/Object.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-template<class T, class T_var> class TAO_Object_Manager;
-
-template <class T, class T_var>
-class TAO_Object_Field_T : public TAO_Object_Field
-{
-  // = TITLE
-  //   Parametric class to implement structure fields corresponding to
-  //   object references.
-  //
-  // = DESCRIPTION
-  //   When an object reference appears in a structure the marshaling
-  //   and demarhsaling of the structure gets complicated: the
-  //   interpreter can only marshal CORBA_Object_ptr when it
-  //   dermarshal it creates on of those objects.  The downcasting to
-  //   the right type must be executed by classes with compile-time
-  //   knowledge of the object type.  The solution addopted in TAO is
-  //   to create a special manager class for that field,
-public:
-  TAO_Object_Field_T (void);
-  // default constructor
-
-  TAO_Object_Field_T (T *object);
-  // constructor from a T *, assumes ownership of <object> i.e. it
-  // *will* release it.
-
-  TAO_Object_Field_T (const T_var &);
-  // constructor from a var
-
-  TAO_Object_Field_T (const TAO_Object_Field_T<T,T_var> &);
-  // copy constructor
-
-  TAO_Object_Field_T (const TAO_Object_Manager<T,T_var> &);
-  // constructor from an Object_Manager (sequence var-like class)
-
-  virtual ~TAO_Object_Field_T (void);
-  // destructor
-
-  TAO_Object_Field_T<T,T_var> &operator= (T *object);
-  // Assignment from a T*, it assumes ownership of <object>.
-
-  TAO_Object_Field_T<T,T_var> &operator= (const T_var& var);
-  // Assignment from a T_var, make a duplicate of the object
-
-  TAO_Object_Field_T<T,T_var> &operator= (const TAO_Object_Field_T<T,T_var> &);
-  // Assignment operator, in duplicates the underlying objects.
-
-  TAO_Object_Field_T<T,T_var> &operator= (const TAO_Object_Manager<T,T_var>&);
-  // Assignment from a T_var, make a duplicate of the object
-
-  T *operator-> (void) const;
-  // smart pointer (const)
-
-  operator T *const &() const;
-  // cast operator
-
-  operator T *&();
-  // cast operator
-
-  // = operations for parameter passing modes
-
-  T *in (void) const;
-  // for in type parameter
-
-  T *&inout (void);
-  // for inout type parameter
-
-  T *&out (void);
-  // for out parameter
-
-  T *_retn (void);
-  // for return type
-
-  T *ptr (void) const;
-  // TAO extension for access to the underlying pointer.
-
-  virtual void _downcast (CORBA_Object *base_ptr,
-                          CORBA_Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
-  // No default to workaround egcs problem with templates and
-  // namespaces
-  virtual CORBA_Object *_upcast (void);
-  virtual void _release (void);
-  // Implement the TAO_Object_Field methods.
-
-private:
-  T *ptr_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao/varout.i"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/varout.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("varout.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* TAO_VAROUT_H */
diff --git a/TAO/tao/varout.i b/TAO/tao/varout.i
deleted file mode 100644
index c506733d29f..00000000000
--- a/TAO/tao/varout.i
+++ /dev/null
@@ -1,102 +0,0 @@
-//
-// $Id$
-//
-
-template<class T, class T_var> ACE_INLINE
-TAO_Object_Field_T<T,T_var>::TAO_Object_Field_T (void)
-  :  ptr_ (0)
-{
-}
-
-template<class T, class T_var> ACE_INLINE
-TAO_Object_Field_T<T,T_var>::TAO_Object_Field_T (T* object)
-  :  ptr_ (object)
-{
-}
-
-template<class T, class T_var> ACE_INLINE
-TAO_Object_Field_T<T,T_var>::
-    TAO_Object_Field_T (const TAO_Object_Field_T<T,T_var>& rhs)
-  :  TAO_Object_Field (rhs), // keep HP/aCC happy
-     ptr_ (T::_duplicate (rhs.ptr_))
-{
-}
-
-template<class T, class T_var> ACE_INLINE
-TAO_Object_Field_T<T,T_var>::~TAO_Object_Field_T (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-template<class T, class T_var> ACE_INLINE TAO_Object_Field_T<T,T_var> &
-TAO_Object_Field_T<T,T_var>::operator= (T* object)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = object;
-  return *this;
-}
-
-template<class T, class T_var> ACE_INLINE TAO_Object_Field_T<T,T_var> &
-TAO_Object_Field_T<T,T_var>::
-    operator= (const TAO_Object_Field_T<T,T_var> &rhs)
-{
-  if (this != &rhs)
-    {
-      CORBA::release (this->ptr_);
-      this->ptr_ = T::_duplicate (rhs.ptr_);
-    }
-  return *this;
-}
-
-template<class T, class T_var> ACE_INLINE T*
-TAO_Object_Field_T<T,T_var>::ptr (void) const
-{
-  return this->ptr_;
-}
-
-template<class T, class T_var> ACE_INLINE
-TAO_Object_Field_T<T,T_var>::operator T* const &() const
-{
-  return this->ptr_;
-}
-
-template<class T, class T_var> ACE_INLINE
-TAO_Object_Field_T<T,T_var>::operator T* &()
-{
-  return this->ptr_;
-}
-
-template<class T, class T_var> ACE_INLINE T*
-TAO_Object_Field_T<T,T_var>::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-template<class T, class T_var> ACE_INLINE T*
-TAO_Object_Field_T<T,T_var>::in (void) const
-{
-  return this->ptr_;
-}
-
-template<class T, class T_var> ACE_INLINE T* &
-TAO_Object_Field_T<T,T_var>::inout (void)
-{
-  return this->ptr_;
-}
-
-template<class T, class T_var> ACE_INLINE T* &
-TAO_Object_Field_T<T,T_var>::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-template<class T, class T_var> ACE_INLINE T*
-TAO_Object_Field_T<T,T_var>::_retn (void)
-{
-  // yield ownership of managed obj reference
-  T* val = this->ptr_;
-  this->ptr_ = 0;
-  return val;
-}
diff --git a/TAO/tao/xt_resource.cpp b/TAO/tao/xt_resource.cpp
deleted file mode 100644
index f6204af62d2..00000000000
--- a/TAO/tao/xt_resource.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-// $Id$
-
-#include "tao/xt_resource.h"
-
-#if defined(ACE_HAS_XT)
-
-#if !defined (__ACE_INLINE__)
-# include "tao/xt_resource.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, xt_resource, "$Id$")
-
-XtAppContext
-TAO_XT_Resource_Factory::context_ = 0;
-
-ACE_Reactor_Impl*
-TAO_XT_Resource_Factory::allocate_reactor_impl (void) const
-{
-  if (TAO_XT_Resource_Factory::context_ == 0)
-    return 0;
-
-  ACE_Reactor_Impl *impl = 0;
-
-  ACE_NEW_RETURN (impl, ACE_XtReactor (TAO_XT_Resource_Factory::context_), 0);
-  return impl;
-}
-
-void
-TAO_XT_Resource_Factory::set_context (XtAppContext context)
-{
-  TAO_XT_Resource_Factory::context_ = context;
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_XT_Resource_Factory,
-                       ASYS_TEXT ("XT_Resource_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_XT_Resource_Factory),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-ACE_FACTORY_DEFINE (TAO, TAO_XT_Resource_Factory)
-
-#endif /* ACE_HAS_XT */
diff --git a/TAO/tao/xt_resource.h b/TAO/tao/xt_resource.h
deleted file mode 100644
index f65ebb2c8cf..00000000000
--- a/TAO/tao/xt_resource.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   xt_resource.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
-
-#ifndef TAO_XT_RESOURCE_H
-#define TAO_XT_RESOURCE_H
-
-#include "tao/default_resource.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (ACE_HAS_XT)
-
-#include "ace/XtReactor.h"
-
-// ****************************************************************
-
-class TAO_XT_Resource_Factory : public TAO_Default_Resource_Factory
-{
-  // = TITLE
-  //   TAO's default resource factory
-  //
-  // = DESCRIPTION
-  //   Using a <{resource source specifier}> as a discriminator, the
-  //   factory can return resource instances which are, e.g., global,
-  //   stored in thread-specific storage, stored in shared memory,
-  //   etc.
-  //
-public:
-  // = Initialization and termination methods.
-  TAO_XT_Resource_Factory (void);
-  // Constructor.
-
-  static void set_context (XtAppContext context);
-  // Set the context used to create the XtReactor
-
-protected:
-  virtual ACE_Reactor_Impl *allocate_reactor_impl (void) const;
-  // Obtain the reactor implementation
-
-private:
-  static XtAppContext context_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao/xt_resource.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_STATIC_SVC_DECLARE (TAO_XT_Resource_Factory)
-ACE_FACTORY_DECLARE (TAO, TAO_XT_Resource_Factory)
-
-#endif /* ACE_HAS_XT */
-
-#endif /* TAO_DEFAULT_CLIENT_H */
diff --git a/TAO/tao/xt_resource.i b/TAO/tao/xt_resource.i
deleted file mode 100644
index 0b14c74dcf9..00000000000
--- a/TAO/tao/xt_resource.i
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_XT_Resource_Factory::TAO_XT_Resource_Factory (void)
-{
-}