ChangeLogTag: Fri Jul 14 21:03:30 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

28 files changed, 43 insertions, 4360 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index ecf685d46f5..1565d359e28 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,10 +1,17 @@
+Fri Jul 14 21:03:30 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/IDL_Test/IDL_Test.mpc:
+          This fix closes [BUGID:2582]. Thanks to Heesuk Shin
+          <heesuks@econz.com> for reporting the bug.
+          Also fixes bug 2583.
+
 Fri Jul 14 20:50:30 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/ast/ast_decl.cpp:
         * TAO_IDL/ast/ast_typedef.cpp:
         * TAO_IDL/include/ast_decl.h:
         * TAO_IDL/include/ast_typedef.h:
-        
+
           Fixed bug in the recursive check for local type
           containment that was causing CDR operators to
           get generated for types that contain a local
diff --git a/TAO/tao/DynamicAny.mpc b/TAO/tao/DynamicAny.mpc
index d96ed04f9a9..c2d87143030 100644
--- a/TAO/tao/DynamicAny.mpc
+++ b/TAO/tao/DynamicAny.mpc
@@ -29,6 +29,13 @@ project : taolib, core, core_anytypecode, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
+    idlflags += -Gp -Gd -Ge 1 -Sci -SS -Sorb \
+                -Wb,export_macro=TAO_DynamicAny_Export \
+                -Wb,export_include=tao/DynamicAny/dynamicany_export.h \
+                -Wb,include_guard=TAO_DYNAMICANY_SAFE_INCLUDE \
+                -Wb,safe_include=tao/DynamicAny/DynamicAny.h \
+                -o DynamicAny
+    DynamicAny/DynamicAny.pidl
   }
 
   Pkgconfig_Files {
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.cpp b/TAO/tao/DynamicAny/DynamicAnyC.cpp
deleted file mode 100644
index 526509e6223..00000000000
--- a/TAO/tao/DynamicAny/DynamicAnyC.cpp
+++ /dev/null
@@ -1,1788 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "tao/DynamicAny/DynamicAny.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for DynamicAny::DynAny.
-
-DynamicAny::DynAny_ptr
-TAO::Objref_Traits<DynamicAny::DynAny>::duplicate (
-    DynamicAny::DynAny_ptr p
-  )
-{
-  return DynamicAny::DynAny::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<DynamicAny::DynAny>::release (
-    DynamicAny::DynAny_ptr p
-  )
-{
-  ::CORBA::release (p);
-}
-
-DynamicAny::DynAny_ptr
-TAO::Objref_Traits<DynamicAny::DynAny>::nil (void)
-{
-  return DynamicAny::DynAny::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<DynamicAny::DynAny>::marshal (
-    DynamicAny::DynAny_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/exception_cs.cpp:63
-
-DynamicAny::DynAny::InvalidValue::InvalidValue (void)
-  : CORBA::UserException (
-        "IDL:omg.org/DynamicAny/DynAny/InvalidValue:1.0",
-        "InvalidValue"
-      )
-{
-}
-
-DynamicAny::DynAny::InvalidValue::~InvalidValue (void)
-{
-}
-
-DynamicAny::DynAny::InvalidValue::InvalidValue (const ::DynamicAny::DynAny::InvalidValue &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-DynamicAny::DynAny::InvalidValue&
-DynamicAny::DynAny::InvalidValue::operator= (const ::DynamicAny::DynAny::InvalidValue &_tao_excp)
-{
-  this->::CORBA::UserException::operator= (_tao_excp);
-  return *this;
-}
-
-DynamicAny::DynAny::InvalidValue *
-DynamicAny::DynAny::InvalidValue::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<InvalidValue *> (_tao_excp);
-}
-
-const DynamicAny::DynAny::InvalidValue *
-DynamicAny::DynAny::InvalidValue::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const InvalidValue *> (_tao_excp);
-}
-
-CORBA::Exception *DynamicAny::DynAny::InvalidValue::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::DynamicAny::DynAny::InvalidValue, 0);
-  return retval;
-}
-
-CORBA::Exception *
-DynamicAny::DynAny::InvalidValue::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::DynamicAny::DynAny::InvalidValue (*this),
-      0
-    );
-  return result;
-}
-
-void DynamicAny::DynAny::InvalidValue::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void DynamicAny::DynAny::InvalidValue::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void DynamicAny::DynAny::InvalidValue::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/exception_cs.cpp:63
-
-DynamicAny::DynAny::TypeMismatch::TypeMismatch (void)
-  : CORBA::UserException (
-        "IDL:omg.org/DynamicAny/DynAny/TypeMismatch:1.0",
-        "TypeMismatch"
-      )
-{
-}
-
-DynamicAny::DynAny::TypeMismatch::~TypeMismatch (void)
-{
-}
-
-DynamicAny::DynAny::TypeMismatch::TypeMismatch (const ::DynamicAny::DynAny::TypeMismatch &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-DynamicAny::DynAny::TypeMismatch&
-DynamicAny::DynAny::TypeMismatch::operator= (const ::DynamicAny::DynAny::TypeMismatch &_tao_excp)
-{
-  this->::CORBA::UserException::operator= (_tao_excp);
-  return *this;
-}
-
-DynamicAny::DynAny::TypeMismatch *
-DynamicAny::DynAny::TypeMismatch::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<TypeMismatch *> (_tao_excp);
-}
-
-const DynamicAny::DynAny::TypeMismatch *
-DynamicAny::DynAny::TypeMismatch::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const TypeMismatch *> (_tao_excp);
-}
-
-CORBA::Exception *DynamicAny::DynAny::TypeMismatch::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::DynamicAny::DynAny::TypeMismatch, 0);
-  return retval;
-}
-
-CORBA::Exception *
-DynamicAny::DynAny::TypeMismatch::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::DynamicAny::DynAny::TypeMismatch (*this),
-      0
-    );
-  return result;
-}
-
-void DynamicAny::DynAny::TypeMismatch::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void DynamicAny::DynAny::TypeMismatch::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void DynamicAny::DynAny::TypeMismatch::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-
-
-DynamicAny::DynAny::DynAny (void)
-{}
-
-DynamicAny::DynAny::~DynAny (void)
-{}
-
-DynamicAny::DynAny_ptr
-DynamicAny::DynAny::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynAny::_nil ();
-    }
-
-  DynAny_ptr proxy =
-    dynamic_cast<DynAny_ptr> (_tao_objref);
-
-  return DynAny::_duplicate (proxy);
-}
-
-DynamicAny::DynAny_ptr
-DynamicAny::DynAny::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynAny::_nil ();
-    }
-
-  DynAny_ptr proxy =
-    dynamic_cast<DynAny_ptr> (_tao_objref);
-
-  return DynAny::_duplicate (proxy);
-}
-
-DynamicAny::DynAny_ptr
-DynamicAny::DynAny::_duplicate (DynAny_ptr obj)
-{
-  if (! ::CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-void
-DynamicAny::DynAny::_tao_release (DynAny_ptr obj)
-{
-  ::CORBA::release (obj);
-}
-
-CORBA::Boolean
-DynamicAny::DynAny::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/DynamicAny/DynAny:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* DynamicAny::DynAny::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/DynamicAny/DynAny:1.0";
-}
-
-CORBA::Boolean
-DynamicAny::DynAny::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for DynamicAny::DynFixed.
-
-DynamicAny::DynFixed_ptr
-TAO::Objref_Traits<DynamicAny::DynFixed>::duplicate (
-    DynamicAny::DynFixed_ptr p
-  )
-{
-  return DynamicAny::DynFixed::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<DynamicAny::DynFixed>::release (
-    DynamicAny::DynFixed_ptr p
-  )
-{
-  ::CORBA::release (p);
-}
-
-DynamicAny::DynFixed_ptr
-TAO::Objref_Traits<DynamicAny::DynFixed>::nil (void)
-{
-  return DynamicAny::DynFixed::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<DynamicAny::DynFixed>::marshal (
-    DynamicAny::DynFixed_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-DynamicAny::DynFixed::DynFixed (void)
-{}
-
-DynamicAny::DynFixed::~DynFixed (void)
-{}
-
-DynamicAny::DynFixed_ptr
-DynamicAny::DynFixed::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynFixed::_nil ();
-    }
-
-  DynFixed_ptr proxy =
-    dynamic_cast<DynFixed_ptr> (_tao_objref);
-
-  return DynFixed::_duplicate (proxy);
-}
-
-DynamicAny::DynFixed_ptr
-DynamicAny::DynFixed::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynFixed::_nil ();
-    }
-
-  DynFixed_ptr proxy =
-    dynamic_cast<DynFixed_ptr> (_tao_objref);
-
-  return DynFixed::_duplicate (proxy);
-}
-
-DynamicAny::DynFixed_ptr
-DynamicAny::DynFixed::_duplicate (DynFixed_ptr obj)
-{
-  if (! ::CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-void
-DynamicAny::DynFixed::_tao_release (DynFixed_ptr obj)
-{
-  ::CORBA::release (obj);
-}
-
-CORBA::Boolean
-DynamicAny::DynFixed::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/DynamicAny/DynAny:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/DynamicAny/DynFixed:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* DynamicAny::DynFixed::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/DynamicAny/DynFixed:1.0";
-}
-
-CORBA::Boolean
-DynamicAny::DynFixed::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for DynamicAny::DynEnum.
-
-DynamicAny::DynEnum_ptr
-TAO::Objref_Traits<DynamicAny::DynEnum>::duplicate (
-    DynamicAny::DynEnum_ptr p
-  )
-{
-  return DynamicAny::DynEnum::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<DynamicAny::DynEnum>::release (
-    DynamicAny::DynEnum_ptr p
-  )
-{
-  ::CORBA::release (p);
-}
-
-DynamicAny::DynEnum_ptr
-TAO::Objref_Traits<DynamicAny::DynEnum>::nil (void)
-{
-  return DynamicAny::DynEnum::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<DynamicAny::DynEnum>::marshal (
-    DynamicAny::DynEnum_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-DynamicAny::DynEnum::DynEnum (void)
-{}
-
-DynamicAny::DynEnum::~DynEnum (void)
-{}
-
-DynamicAny::DynEnum_ptr
-DynamicAny::DynEnum::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynEnum::_nil ();
-    }
-
-  DynEnum_ptr proxy =
-    dynamic_cast<DynEnum_ptr> (_tao_objref);
-
-  return DynEnum::_duplicate (proxy);
-}
-
-DynamicAny::DynEnum_ptr
-DynamicAny::DynEnum::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynEnum::_nil ();
-    }
-
-  DynEnum_ptr proxy =
-    dynamic_cast<DynEnum_ptr> (_tao_objref);
-
-  return DynEnum::_duplicate (proxy);
-}
-
-DynamicAny::DynEnum_ptr
-DynamicAny::DynEnum::_duplicate (DynEnum_ptr obj)
-{
-  if (! ::CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-void
-DynamicAny::DynEnum::_tao_release (DynEnum_ptr obj)
-{
-  ::CORBA::release (obj);
-}
-
-CORBA::Boolean
-DynamicAny::DynEnum::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/DynamicAny/DynAny:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/DynamicAny/DynEnum:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* DynamicAny::DynEnum::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/DynamicAny/DynEnum:1.0";
-}
-
-CORBA::Boolean
-DynamicAny::DynEnum::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/structure_cs.cpp:66
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_DYNAMICANY_NAMEVALUEPAIRSEQ_CS_)
-#define _DYNAMICANY_NAMEVALUEPAIRSEQ_CS_
-
-DynamicAny::NameValuePairSeq::NameValuePairSeq (void)
-{}
-
-DynamicAny::NameValuePairSeq::NameValuePairSeq (
-    CORBA::ULong max
-  )
-  : TAO::unbounded_value_sequence<
-        DynamicAny::NameValuePair
-      >
-    (max)
-{}
-
-DynamicAny::NameValuePairSeq::NameValuePairSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    DynamicAny::NameValuePair * buffer,
-    CORBA::Boolean release
-  )
-  : TAO::unbounded_value_sequence<
-        DynamicAny::NameValuePair
-      >
-    (max, length, buffer, release)
-{}
-
-DynamicAny::NameValuePairSeq::NameValuePairSeq (
-    const NameValuePairSeq &seq
-  )
-  : TAO::unbounded_value_sequence<
-        DynamicAny::NameValuePair
-      >
-    (seq)
-{}
-
-DynamicAny::NameValuePairSeq::~NameValuePairSeq (void)
-{}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/structure_cs.cpp:66
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_DYNAMICANY_NAMEDYNANYPAIRSEQ_CS_)
-#define _DYNAMICANY_NAMEDYNANYPAIRSEQ_CS_
-
-DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (void)
-{}
-
-DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (
-    CORBA::ULong max
-  )
-  : TAO::unbounded_value_sequence<
-        DynamicAny::NameDynAnyPair
-      >
-    (max)
-{}
-
-DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    DynamicAny::NameDynAnyPair * buffer,
-    CORBA::Boolean release
-  )
-  : TAO::unbounded_value_sequence<
-        DynamicAny::NameDynAnyPair
-      >
-    (max, length, buffer, release)
-{}
-
-DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (
-    const NameDynAnyPairSeq &seq
-  )
-  : TAO::unbounded_value_sequence<
-        DynamicAny::NameDynAnyPair
-      >
-    (seq)
-{}
-
-DynamicAny::NameDynAnyPairSeq::~NameDynAnyPairSeq (void)
-{}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for DynamicAny::DynStruct.
-
-DynamicAny::DynStruct_ptr
-TAO::Objref_Traits<DynamicAny::DynStruct>::duplicate (
-    DynamicAny::DynStruct_ptr p
-  )
-{
-  return DynamicAny::DynStruct::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<DynamicAny::DynStruct>::release (
-    DynamicAny::DynStruct_ptr p
-  )
-{
-  ::CORBA::release (p);
-}
-
-DynamicAny::DynStruct_ptr
-TAO::Objref_Traits<DynamicAny::DynStruct>::nil (void)
-{
-  return DynamicAny::DynStruct::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<DynamicAny::DynStruct>::marshal (
-    DynamicAny::DynStruct_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-DynamicAny::DynStruct::DynStruct (void)
-{}
-
-DynamicAny::DynStruct::~DynStruct (void)
-{}
-
-DynamicAny::DynStruct_ptr
-DynamicAny::DynStruct::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynStruct::_nil ();
-    }
-
-  DynStruct_ptr proxy =
-    dynamic_cast<DynStruct_ptr> (_tao_objref);
-
-  return DynStruct::_duplicate (proxy);
-}
-
-DynamicAny::DynStruct_ptr
-DynamicAny::DynStruct::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynStruct::_nil ();
-    }
-
-  DynStruct_ptr proxy =
-    dynamic_cast<DynStruct_ptr> (_tao_objref);
-
-  return DynStruct::_duplicate (proxy);
-}
-
-DynamicAny::DynStruct_ptr
-DynamicAny::DynStruct::_duplicate (DynStruct_ptr obj)
-{
-  if (! ::CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-void
-DynamicAny::DynStruct::_tao_release (DynStruct_ptr obj)
-{
-  ::CORBA::release (obj);
-}
-
-CORBA::Boolean
-DynamicAny::DynStruct::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/DynamicAny/DynAny:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/DynamicAny/DynStruct:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* DynamicAny::DynStruct::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/DynamicAny/DynStruct:1.0";
-}
-
-CORBA::Boolean
-DynamicAny::DynStruct::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for DynamicAny::DynUnion.
-
-DynamicAny::DynUnion_ptr
-TAO::Objref_Traits<DynamicAny::DynUnion>::duplicate (
-    DynamicAny::DynUnion_ptr p
-  )
-{
-  return DynamicAny::DynUnion::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<DynamicAny::DynUnion>::release (
-    DynamicAny::DynUnion_ptr p
-  )
-{
-  ::CORBA::release (p);
-}
-
-DynamicAny::DynUnion_ptr
-TAO::Objref_Traits<DynamicAny::DynUnion>::nil (void)
-{
-  return DynamicAny::DynUnion::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<DynamicAny::DynUnion>::marshal (
-    DynamicAny::DynUnion_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-DynamicAny::DynUnion::DynUnion (void)
-{}
-
-DynamicAny::DynUnion::~DynUnion (void)
-{}
-
-DynamicAny::DynUnion_ptr
-DynamicAny::DynUnion::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynUnion::_nil ();
-    }
-
-  DynUnion_ptr proxy =
-    dynamic_cast<DynUnion_ptr> (_tao_objref);
-
-  return DynUnion::_duplicate (proxy);
-}
-
-DynamicAny::DynUnion_ptr
-DynamicAny::DynUnion::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynUnion::_nil ();
-    }
-
-  DynUnion_ptr proxy =
-    dynamic_cast<DynUnion_ptr> (_tao_objref);
-
-  return DynUnion::_duplicate (proxy);
-}
-
-DynamicAny::DynUnion_ptr
-DynamicAny::DynUnion::_duplicate (DynUnion_ptr obj)
-{
-  if (! ::CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-void
-DynamicAny::DynUnion::_tao_release (DynUnion_ptr obj)
-{
-  ::CORBA::release (obj);
-}
-
-CORBA::Boolean
-DynamicAny::DynUnion::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/DynamicAny/DynAny:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/DynamicAny/DynUnion:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* DynamicAny::DynUnion::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/DynamicAny/DynUnion:1.0";
-}
-
-CORBA::Boolean
-DynamicAny::DynUnion::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_DYNAMICANY_ANYSEQ_CS_)
-#define _DYNAMICANY_ANYSEQ_CS_
-
-DynamicAny::AnySeq::AnySeq (void)
-{}
-
-DynamicAny::AnySeq::AnySeq (
-    CORBA::ULong max
-  )
-  : TAO::unbounded_value_sequence<
-        CORBA::Any
-      >
-    (max)
-{}
-
-DynamicAny::AnySeq::AnySeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::Any * buffer,
-    CORBA::Boolean release
-  )
-  : TAO::unbounded_value_sequence<
-        CORBA::Any
-      >
-    (max, length, buffer, release)
-{}
-
-DynamicAny::AnySeq::AnySeq (
-    const AnySeq &seq
-  )
-  : TAO::unbounded_value_sequence<
-        CORBA::Any
-      >
-    (seq)
-{}
-
-DynamicAny::AnySeq::~AnySeq (void)
-{}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_DYNAMICANY_DYNANYSEQ_CS_)
-#define _DYNAMICANY_DYNANYSEQ_CS_
-
-DynamicAny::DynAnySeq::DynAnySeq (void)
-{}
-
-DynamicAny::DynAnySeq::DynAnySeq (
-    CORBA::ULong max
-  )
-  : TAO::unbounded_object_reference_sequence<
-        DynamicAny::DynAny,
-        DynamicAny::DynAny_var
-      >
-    (max)
-{}
-
-DynamicAny::DynAnySeq::DynAnySeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    DynamicAny::DynAny_ptr * buffer,
-    CORBA::Boolean release
-  )
-  : TAO::unbounded_object_reference_sequence<
-        DynamicAny::DynAny,
-        DynamicAny::DynAny_var
-      >
-    (max, length, buffer, release)
-{}
-
-DynamicAny::DynAnySeq::DynAnySeq (
-    const DynAnySeq &seq
-  )
-  : TAO::unbounded_object_reference_sequence<
-        DynamicAny::DynAny,
-        DynamicAny::DynAny_var
-      >
-    (seq)
-{}
-
-DynamicAny::DynAnySeq::~DynAnySeq (void)
-{}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for DynamicAny::DynSequence.
-
-DynamicAny::DynSequence_ptr
-TAO::Objref_Traits<DynamicAny::DynSequence>::duplicate (
-    DynamicAny::DynSequence_ptr p
-  )
-{
-  return DynamicAny::DynSequence::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<DynamicAny::DynSequence>::release (
-    DynamicAny::DynSequence_ptr p
-  )
-{
-  ::CORBA::release (p);
-}
-
-DynamicAny::DynSequence_ptr
-TAO::Objref_Traits<DynamicAny::DynSequence>::nil (void)
-{
-  return DynamicAny::DynSequence::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<DynamicAny::DynSequence>::marshal (
-    DynamicAny::DynSequence_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-DynamicAny::DynSequence::DynSequence (void)
-{}
-
-DynamicAny::DynSequence::~DynSequence (void)
-{}
-
-DynamicAny::DynSequence_ptr
-DynamicAny::DynSequence::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynSequence::_nil ();
-    }
-
-  DynSequence_ptr proxy =
-    dynamic_cast<DynSequence_ptr> (_tao_objref);
-
-  return DynSequence::_duplicate (proxy);
-}
-
-DynamicAny::DynSequence_ptr
-DynamicAny::DynSequence::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynSequence::_nil ();
-    }
-
-  DynSequence_ptr proxy =
-    dynamic_cast<DynSequence_ptr> (_tao_objref);
-
-  return DynSequence::_duplicate (proxy);
-}
-
-DynamicAny::DynSequence_ptr
-DynamicAny::DynSequence::_duplicate (DynSequence_ptr obj)
-{
-  if (! ::CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-void
-DynamicAny::DynSequence::_tao_release (DynSequence_ptr obj)
-{
-  ::CORBA::release (obj);
-}
-
-CORBA::Boolean
-DynamicAny::DynSequence::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/DynamicAny/DynAny:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/DynamicAny/DynSequence:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* DynamicAny::DynSequence::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/DynamicAny/DynSequence:1.0";
-}
-
-CORBA::Boolean
-DynamicAny::DynSequence::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for DynamicAny::DynArray.
-
-DynamicAny::DynArray_ptr
-TAO::Objref_Traits<DynamicAny::DynArray>::duplicate (
-    DynamicAny::DynArray_ptr p
-  )
-{
-  return DynamicAny::DynArray::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<DynamicAny::DynArray>::release (
-    DynamicAny::DynArray_ptr p
-  )
-{
-  ::CORBA::release (p);
-}
-
-DynamicAny::DynArray_ptr
-TAO::Objref_Traits<DynamicAny::DynArray>::nil (void)
-{
-  return DynamicAny::DynArray::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<DynamicAny::DynArray>::marshal (
-    DynamicAny::DynArray_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-DynamicAny::DynArray::DynArray (void)
-{}
-
-DynamicAny::DynArray::~DynArray (void)
-{}
-
-DynamicAny::DynArray_ptr
-DynamicAny::DynArray::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynArray::_nil ();
-    }
-
-  DynArray_ptr proxy =
-    dynamic_cast<DynArray_ptr> (_tao_objref);
-
-  return DynArray::_duplicate (proxy);
-}
-
-DynamicAny::DynArray_ptr
-DynamicAny::DynArray::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynArray::_nil ();
-    }
-
-  DynArray_ptr proxy =
-    dynamic_cast<DynArray_ptr> (_tao_objref);
-
-  return DynArray::_duplicate (proxy);
-}
-
-DynamicAny::DynArray_ptr
-DynamicAny::DynArray::_duplicate (DynArray_ptr obj)
-{
-  if (! ::CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-void
-DynamicAny::DynArray::_tao_release (DynArray_ptr obj)
-{
-  ::CORBA::release (obj);
-}
-
-CORBA::Boolean
-DynamicAny::DynArray::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/DynamicAny/DynAny:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/DynamicAny/DynArray:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* DynamicAny::DynArray::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/DynamicAny/DynArray:1.0";
-}
-
-CORBA::Boolean
-DynamicAny::DynArray::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for DynamicAny::DynValue.
-
-DynamicAny::DynValue_ptr
-TAO::Objref_Traits<DynamicAny::DynValue>::duplicate (
-    DynamicAny::DynValue_ptr p
-  )
-{
-  return DynamicAny::DynValue::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<DynamicAny::DynValue>::release (
-    DynamicAny::DynValue_ptr p
-  )
-{
-  ::CORBA::release (p);
-}
-
-DynamicAny::DynValue_ptr
-TAO::Objref_Traits<DynamicAny::DynValue>::nil (void)
-{
-  return DynamicAny::DynValue::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<DynamicAny::DynValue>::marshal (
-    DynamicAny::DynValue_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-DynamicAny::DynValue::DynValue (void)
-{}
-
-DynamicAny::DynValue::~DynValue (void)
-{}
-
-DynamicAny::DynValue_ptr
-DynamicAny::DynValue::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynValue::_nil ();
-    }
-
-  DynValue_ptr proxy =
-    dynamic_cast<DynValue_ptr> (_tao_objref);
-
-  return DynValue::_duplicate (proxy);
-}
-
-DynamicAny::DynValue_ptr
-DynamicAny::DynValue::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynValue::_nil ();
-    }
-
-  DynValue_ptr proxy =
-    dynamic_cast<DynValue_ptr> (_tao_objref);
-
-  return DynValue::_duplicate (proxy);
-}
-
-DynamicAny::DynValue_ptr
-DynamicAny::DynValue::_duplicate (DynValue_ptr obj)
-{
-  if (! ::CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-void
-DynamicAny::DynValue::_tao_release (DynValue_ptr obj)
-{
-  ::CORBA::release (obj);
-}
-
-CORBA::Boolean
-DynamicAny::DynValue::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/DynamicAny/DynAny:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/DynamicAny/DynValue:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* DynamicAny::DynValue::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/DynamicAny/DynValue:1.0";
-}
-
-CORBA::Boolean
-DynamicAny::DynValue::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for DynamicAny::DynAnyFactory.
-
-DynamicAny::DynAnyFactory_ptr
-TAO::Objref_Traits<DynamicAny::DynAnyFactory>::duplicate (
-    DynamicAny::DynAnyFactory_ptr p
-  )
-{
-  return DynamicAny::DynAnyFactory::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<DynamicAny::DynAnyFactory>::release (
-    DynamicAny::DynAnyFactory_ptr p
-  )
-{
-  ::CORBA::release (p);
-}
-
-DynamicAny::DynAnyFactory_ptr
-TAO::Objref_Traits<DynamicAny::DynAnyFactory>::nil (void)
-{
-  return DynamicAny::DynAnyFactory::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<DynamicAny::DynAnyFactory>::marshal (
-    DynamicAny::DynAnyFactory_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/exception_cs.cpp:63
-
-DynamicAny::DynAnyFactory::InconsistentTypeCode::InconsistentTypeCode (void)
-  : CORBA::UserException (
-        "IDL:omg.org/DynamicAny/DynAnyFactory/InconsistentTypeCode:1.0",
-        "InconsistentTypeCode"
-      )
-{
-}
-
-DynamicAny::DynAnyFactory::InconsistentTypeCode::~InconsistentTypeCode (void)
-{
-}
-
-DynamicAny::DynAnyFactory::InconsistentTypeCode::InconsistentTypeCode (const ::DynamicAny::DynAnyFactory::InconsistentTypeCode &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-DynamicAny::DynAnyFactory::InconsistentTypeCode&
-DynamicAny::DynAnyFactory::InconsistentTypeCode::operator= (const ::DynamicAny::DynAnyFactory::InconsistentTypeCode &_tao_excp)
-{
-  this->::CORBA::UserException::operator= (_tao_excp);
-  return *this;
-}
-
-DynamicAny::DynAnyFactory::InconsistentTypeCode *
-DynamicAny::DynAnyFactory::InconsistentTypeCode::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<InconsistentTypeCode *> (_tao_excp);
-}
-
-const DynamicAny::DynAnyFactory::InconsistentTypeCode *
-DynamicAny::DynAnyFactory::InconsistentTypeCode::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const InconsistentTypeCode *> (_tao_excp);
-}
-
-CORBA::Exception *DynamicAny::DynAnyFactory::InconsistentTypeCode::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::DynamicAny::DynAnyFactory::InconsistentTypeCode, 0);
-  return retval;
-}
-
-CORBA::Exception *
-DynamicAny::DynAnyFactory::InconsistentTypeCode::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::DynamicAny::DynAnyFactory::InconsistentTypeCode (*this),
-      0
-    );
-  return result;
-}
-
-void DynamicAny::DynAnyFactory::InconsistentTypeCode::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void DynamicAny::DynAnyFactory::InconsistentTypeCode::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void DynamicAny::DynAnyFactory::InconsistentTypeCode::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-
-
-DynamicAny::DynAnyFactory::DynAnyFactory (void)
-{}
-
-DynamicAny::DynAnyFactory::~DynAnyFactory (void)
-{}
-
-DynamicAny::DynAnyFactory_ptr
-DynamicAny::DynAnyFactory::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynAnyFactory::_nil ();
-    }
-
-  DynAnyFactory_ptr proxy =
-    dynamic_cast<DynAnyFactory_ptr> (_tao_objref);
-
-  return DynAnyFactory::_duplicate (proxy);
-}
-
-DynamicAny::DynAnyFactory_ptr
-DynamicAny::DynAnyFactory::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynAnyFactory::_nil ();
-    }
-
-  DynAnyFactory_ptr proxy =
-    dynamic_cast<DynAnyFactory_ptr> (_tao_objref);
-
-  return DynAnyFactory::_duplicate (proxy);
-}
-
-DynamicAny::DynAnyFactory_ptr
-DynamicAny::DynAnyFactory::_duplicate (DynAnyFactory_ptr obj)
-{
-  if (! ::CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-void
-DynamicAny::DynAnyFactory::_tao_release (DynAnyFactory_ptr obj)
-{
-  ::CORBA::release (obj);
-}
-
-CORBA::Boolean
-DynamicAny::DynAnyFactory::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/DynamicAny/DynAnyFactory:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* DynamicAny::DynAnyFactory::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/DynamicAny/DynAnyFactory:1.0";
-}
-
-CORBA::Boolean
-DynamicAny::DynAnyFactory::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const DynamicAny::NameValuePair &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << _tao_aggregate.value);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    DynamicAny::NameValuePair &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> _tao_aggregate.value);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_DynamicAny_NameValuePairSeq_CPP_
-#define _TAO_CDR_OP_DynamicAny_NameValuePairSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const DynamicAny::NameValuePairSeq &_tao_sequence
-  )
-{
-  return TAO::marshal_sequence(strm, _tao_sequence);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    DynamicAny::NameValuePairSeq &_tao_sequence
-  )
-{
-  return TAO::demarshal_sequence(strm, _tao_sequence);
-}
-
-#endif /* _TAO_CDR_OP_DynamicAny_NameValuePairSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_DynamicAny_AnySeq_CPP_
-#define _TAO_CDR_OP_DynamicAny_AnySeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const DynamicAny::AnySeq &_tao_sequence
-  )
-{
-  return TAO::marshal_sequence(strm, _tao_sequence);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    DynamicAny::AnySeq &_tao_sequence
-  )
-{
-  return TAO::demarshal_sequence(strm, _tao_sequence);
-}
-
-#endif /* _TAO_CDR_OP_DynamicAny_AnySeq_CPP_ */
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.h b/TAO/tao/DynamicAny/DynamicAnyC.h
deleted file mode 100644
index 2a03f120da2..00000000000
--- a/TAO/tao/DynamicAny/DynamicAnyC.h
+++ /dev/null
@@ -1,2531 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_DYNAMICANYC_H_
-#define _TAO_IDL_ORIG_DYNAMICANYC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#ifndef TAO_DYNAMICANY_SAFE_INCLUDE
-#error "You should not include DynamicAnyC.h directly, use DynamicAny.h"
-#endif /* !TAO_DYNAMICANY_SAFE_INCLUDE */
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/DynamicAny/dynamicany_export.h"
-#include "tao/AnyTypeCode/TypeCode.h"
-#include "tao/AnyTypeCode/TypeCode_Constants.h"
-#include "tao/AnyTypeCode/Any.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Sequence_T.h"
-#include "tao/Objref_VarOut_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-#include "tao/VarOut_T.h"
-
-#include "tao/Typecode_typesC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_DynamicAny_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace DynamicAny
-{
-
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_DYNAMICANY_DYNANY__VAR_OUT_CH_)
-#define _DYNAMICANY_DYNANY__VAR_OUT_CH_
-
-  class DynAny;
-  typedef DynAny *DynAny_ptr;
-
-  typedef
-    TAO_Objref_Var_T<
-        DynAny
-      >
-    DynAny_var;
-
-  typedef
-    TAO_Objref_Out_T<
-        DynAny
-      >
-    DynAny_out;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_DYNAMICANY_DYNANY_CH_)
-#define _DYNAMICANY_DYNANY_CH_
-
-  class TAO_DynamicAny_Export DynAny
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef DynAny_ptr _ptr_type;
-    typedef DynAny_var _var_type;
-
-    // The static operations.
-    static DynAny_ptr _duplicate (DynAny_ptr obj);
-
-    static void _tao_release (DynAny_ptr obj);
-
-    static DynAny_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static DynAny_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static DynAny_ptr _nil (void)
-    {
-      return static_cast<DynAny_ptr> (0);
-    }
-
-
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_DYNAMICANY_DYNANY_INVALIDVALUE_CH_)
-#define _DYNAMICANY_DYNANY_INVALIDVALUE_CH_
-
-    class TAO_DynamicAny_Export InvalidValue : public CORBA::UserException
-    {
-    public:
-
-      InvalidValue (void);
-      InvalidValue (const InvalidValue &);
-      ~InvalidValue (void);
-
-      InvalidValue &operator= (const InvalidValue &);
-
-      static InvalidValue *_downcast (CORBA::Exception *);
-      static const InvalidValue *_downcast (CORBA::Exception const *);
-
-      static CORBA::Exception *_alloc (void);
-
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
-    };
-
-#endif /* end #if !defined */
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_DYNAMICANY_DYNANY_TYPEMISMATCH_CH_)
-#define _DYNAMICANY_DYNANY_TYPEMISMATCH_CH_
-
-    class TAO_DynamicAny_Export TypeMismatch : public CORBA::UserException
-    {
-    public:
-
-      TypeMismatch (void);
-      TypeMismatch (const TypeMismatch &);
-      ~TypeMismatch (void);
-
-      TypeMismatch &operator= (const TypeMismatch &);
-
-      static TypeMismatch *_downcast (CORBA::Exception *);
-      static const TypeMismatch *_downcast (CORBA::Exception const *);
-
-      static CORBA::Exception *_alloc (void);
-
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
-    };
-
-#endif /* end #if !defined */
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void assign (
-        ::DynamicAny::DynAny_ptr dyn_any
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void from_any (
-        const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Any * to_any (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Boolean equal (
-        ::DynamicAny::DynAny_ptr dyn_any
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::DynamicAny::DynAny_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void insert_boolean (
-        ::CORBA::Boolean value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void insert_octet (
-        ::CORBA::Octet value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void insert_char (
-        ::CORBA::Char value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void insert_short (
-        ::CORBA::Short value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void insert_ushort (
-        ::CORBA::UShort value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void insert_long (
-        ::CORBA::Long value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void insert_ulong (
-        ::CORBA::ULong value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void insert_float (
-        ::CORBA::Float value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void insert_double (
-        ::CORBA::Double value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void insert_string (
-        const char * value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void insert_reference (
-        ::CORBA::Object_ptr value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void insert_typecode (
-        ::CORBA::TypeCode_ptr value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void insert_longlong (
-        ::CORBA::LongLong value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void insert_ulonglong (
-        ::CORBA::ULongLong value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void insert_longdouble (
-        ::CORBA::LongDouble value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void insert_wchar (
-        ::CORBA::WChar value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void insert_wstring (
-        const CORBA::WChar * value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void insert_any (
-        const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void insert_dyn_any (
-        ::DynamicAny::DynAny_ptr value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void insert_val (
-        ::CORBA::ValueBase * value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Boolean get_boolean (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Octet get_octet (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Char get_char (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Short get_short (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::UShort get_ushort (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Long get_long (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::ULong get_ulong (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Float get_float (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Double get_double (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual char * get_string (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Object_ptr get_reference (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::TypeCode_ptr get_typecode (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::LongLong get_longlong (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::ULongLong get_ulonglong (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::LongDouble get_longdouble (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::WChar get_wchar (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::WChar * get_wstring (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Any * get_any (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::DynamicAny::DynAny_ptr get_dyn_any (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::ValueBase * get_val (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Boolean seek (
-        ::CORBA::Long index
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void rewind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Boolean next (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::ULong component_count (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::DynamicAny::DynAny_ptr current_component (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
-  protected:
-    // Abstract or local interface only.
-    DynAny (void);
-
-    virtual ~DynAny (void);
-
-  private:
-    // Private and unimplemented for concrete interfaces.
-    DynAny (const DynAny &);
-
-    void operator= (const DynAny &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_DYNAMICANY_DYNFIXED__VAR_OUT_CH_)
-#define _DYNAMICANY_DYNFIXED__VAR_OUT_CH_
-
-  class DynFixed;
-  typedef DynFixed *DynFixed_ptr;
-
-  typedef
-    TAO_Objref_Var_T<
-        DynFixed
-      >
-    DynFixed_var;
-
-  typedef
-    TAO_Objref_Out_T<
-        DynFixed
-      >
-    DynFixed_out;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_DYNAMICANY_DYNFIXED_CH_)
-#define _DYNAMICANY_DYNFIXED_CH_
-
-  class TAO_DynamicAny_Export DynFixed
-    : public virtual ::DynamicAny::DynAny
-  {
-  public:
-    typedef DynFixed_ptr _ptr_type;
-    typedef DynFixed_var _var_type;
-
-    // The static operations.
-    static DynFixed_ptr _duplicate (DynFixed_ptr obj);
-
-    static void _tao_release (DynFixed_ptr obj);
-
-    static DynFixed_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static DynFixed_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static DynFixed_ptr _nil (void)
-    {
-      return static_cast<DynFixed_ptr> (0);
-    }
-
-
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual char * get_value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Boolean set_value (
-        const char * val
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
-  protected:
-    // Abstract or local interface only.
-    DynFixed (void);
-
-    virtual ~DynFixed (void);
-
-  private:
-    // Private and unimplemented for concrete interfaces.
-    DynFixed (const DynFixed &);
-
-    void operator= (const DynFixed &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_DYNAMICANY_DYNENUM__VAR_OUT_CH_)
-#define _DYNAMICANY_DYNENUM__VAR_OUT_CH_
-
-  class DynEnum;
-  typedef DynEnum *DynEnum_ptr;
-
-  typedef
-    TAO_Objref_Var_T<
-        DynEnum
-      >
-    DynEnum_var;
-
-  typedef
-    TAO_Objref_Out_T<
-        DynEnum
-      >
-    DynEnum_out;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_DYNAMICANY_DYNENUM_CH_)
-#define _DYNAMICANY_DYNENUM_CH_
-
-  class TAO_DynamicAny_Export DynEnum
-    : public virtual ::DynamicAny::DynAny
-  {
-  public:
-    typedef DynEnum_ptr _ptr_type;
-    typedef DynEnum_var _var_type;
-
-    // The static operations.
-    static DynEnum_ptr _duplicate (DynEnum_ptr obj);
-
-    static void _tao_release (DynEnum_ptr obj);
-
-    static DynEnum_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static DynEnum_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static DynEnum_ptr _nil (void)
-    {
-      return static_cast<DynEnum_ptr> (0);
-    }
-
-
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual char * get_as_string (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void set_as_string (
-        const char * value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::ULong get_as_ulong (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void set_as_ulong (
-        ::CORBA::ULong value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
-  protected:
-    // Abstract or local interface only.
-    DynEnum (void);
-
-    virtual ~DynEnum (void);
-
-  private:
-    // Private and unimplemented for concrete interfaces.
-    DynEnum (const DynEnum &);
-
-    void operator= (const DynEnum &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:413
-
-  typedef char * FieldName;
-  typedef CORBA::String_var FieldName_var;
-  typedef CORBA::String_out FieldName_out;
-
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-
-  struct NameValuePair;
-
-  typedef
-    TAO_Var_Var_T<
-        NameValuePair
-      >
-    NameValuePair_var;
-
-  typedef
-    TAO_Out_T<
-        NameValuePair
-      >
-    NameValuePair_out;
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-
-  struct TAO_DynamicAny_Export NameValuePair
-  {
-    typedef NameValuePair_var _var_type;
-
-
-    TAO::String_Manager id;
-    CORBA::Any value;
-  };
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_DYNAMICANY_NAMEVALUEPAIRSEQ_CH_)
-#define _DYNAMICANY_NAMEVALUEPAIRSEQ_CH_
-
-  class NameValuePairSeq;
-
-  typedef
-    TAO_VarSeq_Var_T<
-        NameValuePairSeq
-      >
-    NameValuePairSeq_var;
-
-  typedef
-    TAO_Seq_Out_T<
-        NameValuePairSeq
-      >
-    NameValuePairSeq_out;
-
-  class TAO_DynamicAny_Export NameValuePairSeq
-    : public
-        TAO::unbounded_value_sequence<
-            NameValuePair
-          >
-  {
-  public:
-    NameValuePairSeq (void);
-    NameValuePairSeq (CORBA::ULong max);
-    NameValuePairSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        NameValuePair* buffer,
-        CORBA::Boolean release = false
-      );
-    NameValuePairSeq (const NameValuePairSeq &);
-    ~NameValuePairSeq (void);
-
-    typedef NameValuePairSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-
-  struct NameDynAnyPair;
-
-  typedef
-    TAO_Var_Var_T<
-        NameDynAnyPair
-      >
-    NameDynAnyPair_var;
-
-  typedef
-    TAO_Out_T<
-        NameDynAnyPair
-      >
-    NameDynAnyPair_out;
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-
-  struct TAO_DynamicAny_Export NameDynAnyPair
-  {
-    typedef NameDynAnyPair_var _var_type;
-
-
-    TAO::String_Manager id;
-    DynamicAny::DynAny_var value;
-  };
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_DYNAMICANY_NAMEDYNANYPAIRSEQ_CH_)
-#define _DYNAMICANY_NAMEDYNANYPAIRSEQ_CH_
-
-  class NameDynAnyPairSeq;
-
-  typedef
-    TAO_VarSeq_Var_T<
-        NameDynAnyPairSeq
-      >
-    NameDynAnyPairSeq_var;
-
-  typedef
-    TAO_Seq_Out_T<
-        NameDynAnyPairSeq
-      >
-    NameDynAnyPairSeq_out;
-
-  class TAO_DynamicAny_Export NameDynAnyPairSeq
-    : public
-        TAO::unbounded_value_sequence<
-            NameDynAnyPair
-          >
-  {
-  public:
-    NameDynAnyPairSeq (void);
-    NameDynAnyPairSeq (CORBA::ULong max);
-    NameDynAnyPairSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        NameDynAnyPair* buffer,
-        CORBA::Boolean release = false
-      );
-    NameDynAnyPairSeq (const NameDynAnyPairSeq &);
-    ~NameDynAnyPairSeq (void);
-
-    typedef NameDynAnyPairSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_DYNAMICANY_DYNSTRUCT__VAR_OUT_CH_)
-#define _DYNAMICANY_DYNSTRUCT__VAR_OUT_CH_
-
-  class DynStruct;
-  typedef DynStruct *DynStruct_ptr;
-
-  typedef
-    TAO_Objref_Var_T<
-        DynStruct
-      >
-    DynStruct_var;
-
-  typedef
-    TAO_Objref_Out_T<
-        DynStruct
-      >
-    DynStruct_out;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_DYNAMICANY_DYNSTRUCT_CH_)
-#define _DYNAMICANY_DYNSTRUCT_CH_
-
-  class TAO_DynamicAny_Export DynStruct
-    : public virtual ::DynamicAny::DynAny
-  {
-  public:
-    typedef DynStruct_ptr _ptr_type;
-    typedef DynStruct_var _var_type;
-
-    // The static operations.
-    static DynStruct_ptr _duplicate (DynStruct_ptr obj);
-
-    static void _tao_release (DynStruct_ptr obj);
-
-    static DynStruct_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static DynStruct_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static DynStruct_ptr _nil (void)
-    {
-      return static_cast<DynStruct_ptr> (0);
-    }
-
-
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual char * current_member_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::CORBA::TCKind current_member_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::DynamicAny::NameValuePairSeq * get_members (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void set_members (
-        const ::DynamicAny::NameValuePairSeq & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void set_members_as_dyn_any (
-        const ::DynamicAny::NameDynAnyPairSeq & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
-  protected:
-    // Abstract or local interface only.
-    DynStruct (void);
-
-    virtual ~DynStruct (void);
-
-  private:
-    // Private and unimplemented for concrete interfaces.
-    DynStruct (const DynStruct &);
-
-    void operator= (const DynStruct &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_DYNAMICANY_DYNUNION__VAR_OUT_CH_)
-#define _DYNAMICANY_DYNUNION__VAR_OUT_CH_
-
-  class DynUnion;
-  typedef DynUnion *DynUnion_ptr;
-
-  typedef
-    TAO_Objref_Var_T<
-        DynUnion
-      >
-    DynUnion_var;
-
-  typedef
-    TAO_Objref_Out_T<
-        DynUnion
-      >
-    DynUnion_out;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_DYNAMICANY_DYNUNION_CH_)
-#define _DYNAMICANY_DYNUNION_CH_
-
-  class TAO_DynamicAny_Export DynUnion
-    : public virtual ::DynamicAny::DynAny
-  {
-  public:
-    typedef DynUnion_ptr _ptr_type;
-    typedef DynUnion_var _var_type;
-
-    // The static operations.
-    static DynUnion_ptr _duplicate (DynUnion_ptr obj);
-
-    static void _tao_release (DynUnion_ptr obj);
-
-    static DynUnion_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static DynUnion_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static DynUnion_ptr _nil (void)
-    {
-      return static_cast<DynUnion_ptr> (0);
-    }
-
-
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::DynamicAny::DynAny_ptr get_discriminator (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void set_discriminator (
-        ::DynamicAny::DynAny_ptr d
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void set_to_default_member (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void set_to_no_active_member (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Boolean has_no_active_member (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::CORBA::TCKind discriminator_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::DynamicAny::DynAny_ptr member (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual char * member_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::CORBA::TCKind member_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
-  protected:
-    // Abstract or local interface only.
-    DynUnion (void);
-
-    virtual ~DynUnion (void);
-
-  private:
-    // Private and unimplemented for concrete interfaces.
-    DynUnion (const DynUnion &);
-
-    void operator= (const DynUnion &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_DYNAMICANY_ANYSEQ_CH_)
-#define _DYNAMICANY_ANYSEQ_CH_
-
-  class AnySeq;
-
-  typedef
-    TAO_VarSeq_Var_T<
-        AnySeq
-      >
-    AnySeq_var;
-
-  typedef
-    TAO_Seq_Out_T<
-        AnySeq
-      >
-    AnySeq_out;
-
-  class TAO_DynamicAny_Export AnySeq
-    : public
-        TAO::unbounded_value_sequence<
-            CORBA::Any
-          >
-  {
-  public:
-    AnySeq (void);
-    AnySeq (CORBA::ULong max);
-    AnySeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::Any* buffer,
-        CORBA::Boolean release = false
-      );
-    AnySeq (const AnySeq &);
-    ~AnySeq (void);
-
-    typedef AnySeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_DYNAMICANY_DYNANYSEQ_CH_)
-#define _DYNAMICANY_DYNANYSEQ_CH_
-
-  class DynAnySeq;
-
-  typedef
-    TAO_VarSeq_Var_T<
-        DynAnySeq
-      >
-    DynAnySeq_var;
-
-  typedef
-    TAO_Seq_Out_T<
-        DynAnySeq
-      >
-    DynAnySeq_out;
-
-  class TAO_DynamicAny_Export DynAnySeq
-    : public
-        TAO::unbounded_object_reference_sequence<
-            DynAny,
-            DynAny_var
-          >
-  {
-  public:
-    DynAnySeq (void);
-    DynAnySeq (CORBA::ULong max);
-    DynAnySeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        DynAny_ptr* buffer,
-        CORBA::Boolean release = false
-      );
-    DynAnySeq (const DynAnySeq &);
-    ~DynAnySeq (void);
-
-    typedef DynAnySeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_DYNAMICANY_DYNSEQUENCE__VAR_OUT_CH_)
-#define _DYNAMICANY_DYNSEQUENCE__VAR_OUT_CH_
-
-  class DynSequence;
-  typedef DynSequence *DynSequence_ptr;
-
-  typedef
-    TAO_Objref_Var_T<
-        DynSequence
-      >
-    DynSequence_var;
-
-  typedef
-    TAO_Objref_Out_T<
-        DynSequence
-      >
-    DynSequence_out;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_DYNAMICANY_DYNSEQUENCE_CH_)
-#define _DYNAMICANY_DYNSEQUENCE_CH_
-
-  class TAO_DynamicAny_Export DynSequence
-    : public virtual ::DynamicAny::DynAny
-  {
-  public:
-    typedef DynSequence_ptr _ptr_type;
-    typedef DynSequence_var _var_type;
-
-    // The static operations.
-    static DynSequence_ptr _duplicate (DynSequence_ptr obj);
-
-    static void _tao_release (DynSequence_ptr obj);
-
-    static DynSequence_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static DynSequence_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static DynSequence_ptr _nil (void)
-    {
-      return static_cast<DynSequence_ptr> (0);
-    }
-
-
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::ULong get_length (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void set_length (
-        ::CORBA::ULong len
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::DynamicAny::AnySeq * get_elements (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void set_elements (
-        const ::DynamicAny::AnySeq & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::DynamicAny::DynAnySeq * get_elements_as_dyn_any (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void set_elements_as_dyn_any (
-        const ::DynamicAny::DynAnySeq & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
-  protected:
-    // Abstract or local interface only.
-    DynSequence (void);
-
-    virtual ~DynSequence (void);
-
-  private:
-    // Private and unimplemented for concrete interfaces.
-    DynSequence (const DynSequence &);
-
-    void operator= (const DynSequence &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_DYNAMICANY_DYNARRAY__VAR_OUT_CH_)
-#define _DYNAMICANY_DYNARRAY__VAR_OUT_CH_
-
-  class DynArray;
-  typedef DynArray *DynArray_ptr;
-
-  typedef
-    TAO_Objref_Var_T<
-        DynArray
-      >
-    DynArray_var;
-
-  typedef
-    TAO_Objref_Out_T<
-        DynArray
-      >
-    DynArray_out;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_DYNAMICANY_DYNARRAY_CH_)
-#define _DYNAMICANY_DYNARRAY_CH_
-
-  class TAO_DynamicAny_Export DynArray
-    : public virtual ::DynamicAny::DynAny
-  {
-  public:
-    typedef DynArray_ptr _ptr_type;
-    typedef DynArray_var _var_type;
-
-    // The static operations.
-    static DynArray_ptr _duplicate (DynArray_ptr obj);
-
-    static void _tao_release (DynArray_ptr obj);
-
-    static DynArray_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static DynArray_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static DynArray_ptr _nil (void)
-    {
-      return static_cast<DynArray_ptr> (0);
-    }
-
-
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::DynamicAny::AnySeq * get_elements (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void set_elements (
-        const ::DynamicAny::AnySeq & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::DynamicAny::DynAnySeq * get_elements_as_dyn_any (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void set_elements_as_dyn_any (
-        const ::DynamicAny::DynAnySeq & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
-  protected:
-    // Abstract or local interface only.
-    DynArray (void);
-
-    virtual ~DynArray (void);
-
-  private:
-    // Private and unimplemented for concrete interfaces.
-    DynArray (const DynArray &);
-
-    void operator= (const DynArray &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_DYNAMICANY_DYNVALUE__VAR_OUT_CH_)
-#define _DYNAMICANY_DYNVALUE__VAR_OUT_CH_
-
-  class DynValue;
-  typedef DynValue *DynValue_ptr;
-
-  typedef
-    TAO_Objref_Var_T<
-        DynValue
-      >
-    DynValue_var;
-
-  typedef
-    TAO_Objref_Out_T<
-        DynValue
-      >
-    DynValue_out;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_DYNAMICANY_DYNVALUE_CH_)
-#define _DYNAMICANY_DYNVALUE_CH_
-
-  class TAO_DynamicAny_Export DynValue
-    : public virtual ::DynamicAny::DynAny
-  {
-  public:
-    typedef DynValue_ptr _ptr_type;
-    typedef DynValue_var _var_type;
-
-    // The static operations.
-    static DynValue_ptr _duplicate (DynValue_ptr obj);
-
-    static void _tao_release (DynValue_ptr obj);
-
-    static DynValue_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static DynValue_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static DynValue_ptr _nil (void)
-    {
-      return static_cast<DynValue_ptr> (0);
-    }
-
-
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual char * current_member_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::CORBA::TCKind current_member_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::DynamicAny::NameValuePairSeq * get_members (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void set_members (
-        const ::DynamicAny::NameValuePairSeq & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void set_members_as_dyn_any (
-        const ::DynamicAny::NameDynAnyPairSeq & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
-  protected:
-    // Abstract or local interface only.
-    DynValue (void);
-
-    virtual ~DynValue (void);
-
-  private:
-    // Private and unimplemented for concrete interfaces.
-    DynValue (const DynValue &);
-
-    void operator= (const DynValue &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_DYNAMICANY_DYNANYFACTORY__VAR_OUT_CH_)
-#define _DYNAMICANY_DYNANYFACTORY__VAR_OUT_CH_
-
-  class DynAnyFactory;
-  typedef DynAnyFactory *DynAnyFactory_ptr;
-
-  typedef
-    TAO_Objref_Var_T<
-        DynAnyFactory
-      >
-    DynAnyFactory_var;
-
-  typedef
-    TAO_Objref_Out_T<
-        DynAnyFactory
-      >
-    DynAnyFactory_out;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_DYNAMICANY_DYNANYFACTORY_CH_)
-#define _DYNAMICANY_DYNANYFACTORY_CH_
-
-  class TAO_DynamicAny_Export DynAnyFactory
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef DynAnyFactory_ptr _ptr_type;
-    typedef DynAnyFactory_var _var_type;
-
-    // The static operations.
-    static DynAnyFactory_ptr _duplicate (DynAnyFactory_ptr obj);
-
-    static void _tao_release (DynAnyFactory_ptr obj);
-
-    static DynAnyFactory_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static DynAnyFactory_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static DynAnyFactory_ptr _nil (void)
-    {
-      return static_cast<DynAnyFactory_ptr> (0);
-    }
-
-
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_DYNAMICANY_DYNANYFACTORY_INCONSISTENTTYPECODE_CH_)
-#define _DYNAMICANY_DYNANYFACTORY_INCONSISTENTTYPECODE_CH_
-
-    class TAO_DynamicAny_Export InconsistentTypeCode : public CORBA::UserException
-    {
-    public:
-
-      InconsistentTypeCode (void);
-      InconsistentTypeCode (const InconsistentTypeCode &);
-      ~InconsistentTypeCode (void);
-
-      InconsistentTypeCode &operator= (const InconsistentTypeCode &);
-
-      static InconsistentTypeCode *_downcast (CORBA::Exception *);
-      static const InconsistentTypeCode *_downcast (CORBA::Exception const *);
-
-      static CORBA::Exception *_alloc (void);
-
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
-    };
-
-#endif /* end #if !defined */
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::DynamicAny::DynAny_ptr create_dyn_any (
-        const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAnyFactory::InconsistentTypeCode
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::DynamicAny::DynAny_ptr create_dyn_any_from_type_code (
-        ::CORBA::TypeCode_ptr type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAnyFactory::InconsistentTypeCode
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
-  protected:
-    // Abstract or local interface only.
-    DynAnyFactory (void);
-
-    virtual ~DynAnyFactory (void);
-
-  private:
-    // Private and unimplemented for concrete interfaces.
-    DynAnyFactory (const DynAnyFactory &);
-
-    void operator= (const DynAnyFactory &);
-  };
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module DynamicAny
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_DYNAMICANY_DYNANY__TRAITS_CH_)
-#define _DYNAMICANY_DYNANY__TRAITS_CH_
-
-  template<>
-  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynAny>
-  {
-    static ::DynamicAny::DynAny_ptr duplicate (
-        ::DynamicAny::DynAny_ptr
-      );
-    static void release (
-        ::DynamicAny::DynAny_ptr
-      );
-    static ::DynamicAny::DynAny_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::DynamicAny::DynAny_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNFIXED__TRAITS_CH_)
-#define _DYNAMICANY_DYNFIXED__TRAITS_CH_
-
-  template<>
-  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynFixed>
-  {
-    static ::DynamicAny::DynFixed_ptr duplicate (
-        ::DynamicAny::DynFixed_ptr
-      );
-    static void release (
-        ::DynamicAny::DynFixed_ptr
-      );
-    static ::DynamicAny::DynFixed_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::DynamicAny::DynFixed_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNENUM__TRAITS_CH_)
-#define _DYNAMICANY_DYNENUM__TRAITS_CH_
-
-  template<>
-  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynEnum>
-  {
-    static ::DynamicAny::DynEnum_ptr duplicate (
-        ::DynamicAny::DynEnum_ptr
-      );
-    static void release (
-        ::DynamicAny::DynEnum_ptr
-      );
-    static ::DynamicAny::DynEnum_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::DynamicAny::DynEnum_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNSTRUCT__TRAITS_CH_)
-#define _DYNAMICANY_DYNSTRUCT__TRAITS_CH_
-
-  template<>
-  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynStruct>
-  {
-    static ::DynamicAny::DynStruct_ptr duplicate (
-        ::DynamicAny::DynStruct_ptr
-      );
-    static void release (
-        ::DynamicAny::DynStruct_ptr
-      );
-    static ::DynamicAny::DynStruct_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::DynamicAny::DynStruct_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNUNION__TRAITS_CH_)
-#define _DYNAMICANY_DYNUNION__TRAITS_CH_
-
-  template<>
-  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynUnion>
-  {
-    static ::DynamicAny::DynUnion_ptr duplicate (
-        ::DynamicAny::DynUnion_ptr
-      );
-    static void release (
-        ::DynamicAny::DynUnion_ptr
-      );
-    static ::DynamicAny::DynUnion_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::DynamicAny::DynUnion_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNSEQUENCE__TRAITS_CH_)
-#define _DYNAMICANY_DYNSEQUENCE__TRAITS_CH_
-
-  template<>
-  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynSequence>
-  {
-    static ::DynamicAny::DynSequence_ptr duplicate (
-        ::DynamicAny::DynSequence_ptr
-      );
-    static void release (
-        ::DynamicAny::DynSequence_ptr
-      );
-    static ::DynamicAny::DynSequence_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::DynamicAny::DynSequence_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNARRAY__TRAITS_CH_)
-#define _DYNAMICANY_DYNARRAY__TRAITS_CH_
-
-  template<>
-  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynArray>
-  {
-    static ::DynamicAny::DynArray_ptr duplicate (
-        ::DynamicAny::DynArray_ptr
-      );
-    static void release (
-        ::DynamicAny::DynArray_ptr
-      );
-    static ::DynamicAny::DynArray_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::DynamicAny::DynArray_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNVALUE__TRAITS_CH_)
-#define _DYNAMICANY_DYNVALUE__TRAITS_CH_
-
-  template<>
-  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynValue>
-  {
-    static ::DynamicAny::DynValue_ptr duplicate (
-        ::DynamicAny::DynValue_ptr
-      );
-    static void release (
-        ::DynamicAny::DynValue_ptr
-      );
-    static ::DynamicAny::DynValue_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::DynamicAny::DynValue_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNANYFACTORY__TRAITS_CH_)
-#define _DYNAMICANY_DYNANYFACTORY__TRAITS_CH_
-
-  template<>
-  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynAnyFactory>
-  {
-    static ::DynamicAny::DynAnyFactory_ptr duplicate (
-        ::DynamicAny::DynAnyFactory_ptr
-      );
-    static void release (
-        ::DynamicAny::DynAnyFactory_ptr
-      );
-    static ::DynamicAny::DynAnyFactory_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::DynamicAny::DynAnyFactory_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_DynamicAny_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const DynamicAny::NameValuePair &);
-TAO_DynamicAny_Export CORBA::Boolean operator>> (TAO_InputCDR &, DynamicAny::NameValuePair &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_DynamicAny_NameValuePairSeq_H_
-#define _TAO_CDR_OP_DynamicAny_NameValuePairSeq_H_
-
-TAO_DynamicAny_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const DynamicAny::NameValuePairSeq &
-  );
-TAO_DynamicAny_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    DynamicAny::NameValuePairSeq &
-  );
-
-#endif /* _TAO_CDR_OP_DynamicAny_NameValuePairSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_DynamicAny_AnySeq_H_
-#define _TAO_CDR_OP_DynamicAny_AnySeq_H_
-
-TAO_DynamicAny_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const DynamicAny::AnySeq &
-  );
-TAO_DynamicAny_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    DynamicAny::AnySeq &
-  );
-
-#endif /* _TAO_CDR_OP_DynamicAny_AnySeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/FlResource.mpc b/TAO/tao/FlResource.mpc
index f439dc587e6..0c0161c2d99 100644
--- a/TAO/tao/FlResource.mpc
+++ b/TAO/tao/FlResource.mpc
@@ -7,14 +7,11 @@ project(TAO_FlResource) : acelib, taolib, core, tao_output, taodefaults, ace_flr
   dynamicflags += TAO_FLRESOURCE_BUILD_DLL
 
   Source_Files {
-    FlResource_Factory.cpp
-    FlResource_Loader.cpp
+    FlResource
   }
 
   Header_Files {
-    FlResource_Factory.h
-    FlResource_Loader.h
-    TAO_FlResource_Export.h
+    FlResource
   }
 
   Inline_Files {
diff --git a/TAO/tao/FlResource_Factory.cpp b/TAO/tao/FlResource/FlResource_Factory.cpp
index ebdd37f545e..a280383b065 100644
--- a/TAO/tao/FlResource_Factory.cpp
+++ b/TAO/tao/FlResource/FlResource_Factory.cpp
@@ -1,6 +1,6 @@
 //$Id$
 
-#include "tao/FlResource_Factory.h"
+#include "tao/FlResource/FlResource_Factory.h"
 #include "tao/debug.h"
 #include "ace/FlReactor.h"
 
diff --git a/TAO/tao/FlResource_Factory.h b/TAO/tao/FlResource/FlResource_Factory.h
index c56d652005a..28da6ab9341 100644
--- a/TAO/tao/FlResource_Factory.h
+++ b/TAO/tao/FlResource/FlResource_Factory.h
@@ -14,7 +14,7 @@
 #define TAO_FLRESOURCE_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_FlResource_Export.h"
+#include "tao/FlResource/TAO_FlResource_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/tao/FlResource_Loader.cpp b/TAO/tao/FlResource/FlResource_Loader.cpp
index c5dbe7131eb..f004941bddb 100644
--- a/TAO/tao/FlResource_Loader.cpp
+++ b/TAO/tao/FlResource/FlResource_Loader.cpp
@@ -1,7 +1,7 @@
 //$Id$
-#include "tao/FlResource_Loader.h"
+#include "tao/FlResource/FlResource_Loader.h"
 #include "tao/ORB_Core.h"
-#include "tao/FlResource_Factory.h"
+#include "tao/FlResource/FlResource_Factory.h"
 
 ACE_RCSID( TAO_FlResource,
            FlResource_Loader,
diff --git a/TAO/tao/FlResource_Loader.h b/TAO/tao/FlResource/FlResource_Loader.h
index feec4495f68..09b6ef2ce4d 100644
--- a/TAO/tao/FlResource_Loader.h
+++ b/TAO/tao/FlResource/FlResource_Loader.h
@@ -15,7 +15,7 @@
 #define TAO_FLRESOURCE_LOADER_H
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_FlResource_Export.h"
+#include "tao/FlResource/TAO_FlResource_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/tao/TAO_FlResource_Export.h b/TAO/tao/FlResource/TAO_FlResource_Export.h
index e63890b54a6..e63890b54a6 100644
--- a/TAO/tao/TAO_FlResource_Export.h
+++ b/TAO/tao/FlResource/TAO_FlResource_Export.h
diff --git a/TAO/tao/QtResource.mpc b/TAO/tao/QtResource.mpc
index 4deabb05ea3..9a2f0c5eeb2 100644
--- a/TAO/tao/QtResource.mpc
+++ b/TAO/tao/QtResource.mpc
@@ -7,14 +7,11 @@ project(TAO_QtResource) : acelib, taolib, core, tao_output, taodefaults, ace_qtr
   dynamicflags += TAO_QTRESOURCE_BUILD_DLL
 
   Source_Files {
-    QtResource_Factory.cpp
-    QtResource_Loader.cpp
+    QtResource
   }
 
   Header_Files {
-    QtResource_Factory.h
-    QtResource_Loader.h
-    TAO_QtResource_Export.h
+    QtResource
   }
 
   Inline_Files {
diff --git a/TAO/tao/QtResource_Factory.cpp b/TAO/tao/QtResource/QtResource_Factory.cpp
index 2c25a88cf7b..e14004464f1 100644
--- a/TAO/tao/QtResource_Factory.cpp
+++ b/TAO/tao/QtResource/QtResource_Factory.cpp
@@ -1,6 +1,6 @@
 //$Id$
 
-#include "tao/QtResource_Factory.h"
+#include "tao/QtResource/QtResource_Factory.h"
 #include "tao/debug.h"
 #include "ace/QtReactor.h"
 
diff --git a/TAO/tao/QtResource_Factory.h b/TAO/tao/QtResource/QtResource_Factory.h
index ba922a44480..8af126b607a 100644
--- a/TAO/tao/QtResource_Factory.h
+++ b/TAO/tao/QtResource/QtResource_Factory.h
@@ -14,7 +14,7 @@
 #define TAO_QTRESOURCE_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_QtResource_Export.h"
+#include "tao/QtResource/TAO_QtResource_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/tao/QtResource_Loader.cpp b/TAO/tao/QtResource/QtResource_Loader.cpp
index a735eaa6d87..c63dd54e4dc 100644
--- a/TAO/tao/QtResource_Loader.cpp
+++ b/TAO/tao/QtResource/QtResource_Loader.cpp
@@ -1,7 +1,7 @@
 //$Id$
-#include "tao/QtResource_Loader.h"
+#include "tao/QtResource/QtResource_Loader.h"
 #include "tao/ORB_Core.h"
-#include "tao/QtResource_Factory.h"
+#include "tao/QtResource/QtResource_Factory.h"
 
 ACE_RCSID( TAO_QtResource,
            QtResource_Loader,
diff --git a/TAO/tao/QtResource_Loader.h b/TAO/tao/QtResource/QtResource_Loader.h
index 212f2b51795..2f7ef42e7a7 100644
--- a/TAO/tao/QtResource_Loader.h
+++ b/TAO/tao/QtResource/QtResource_Loader.h
@@ -15,7 +15,7 @@
 #define TAO_QTRESOURCE_LOADER_H
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_QtResource_Export.h"
+#include "tao/QtResource/TAO_QtResource_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/tao/TAO_QtResource_Export.h b/TAO/tao/QtResource/TAO_QtResource_Export.h
index 1e61d00a1c0..1e61d00a1c0 100644
--- a/TAO/tao/TAO_QtResource_Export.h
+++ b/TAO/tao/QtResource/TAO_QtResource_Export.h
diff --git a/TAO/tao/TkResource.mpc b/TAO/tao/TkResource.mpc
index a2662fe77ab..b658cc67f83 100644
--- a/TAO/tao/TkResource.mpc
+++ b/TAO/tao/TkResource.mpc
@@ -7,14 +7,11 @@ project(TAO_TkResource) : acelib, taolib, core, tao_output, taodefaults, ace_tkr
   dynamicflags += TAO_TKRESOURCE_BUILD_DLL
 
   Source_Files {
-    TkResource_Factory.cpp
-    TkResource_Loader.cpp
+    TkResource
   }
 
   Header_Files {
-    TkResource_Factory.h
-    TkResource_Loader.h
-    TAO_TkResource_Export.h
+    TkResource
   }
 
   Inline_Files {
diff --git a/TAO/tao/TAO_TkResource_Export.h b/TAO/tao/TkResource/TAO_TkResource_Export.h
index 34904a6d9af..34904a6d9af 100644
--- a/TAO/tao/TAO_TkResource_Export.h
+++ b/TAO/tao/TkResource/TAO_TkResource_Export.h
diff --git a/TAO/tao/TkResource_Factory.cpp b/TAO/tao/TkResource/TkResource_Factory.cpp
index d9d6d3dffeb..622a0fb45cf 100644
--- a/TAO/tao/TkResource_Factory.cpp
+++ b/TAO/tao/TkResource/TkResource_Factory.cpp
@@ -1,6 +1,6 @@
 //$Id$
 
-#include "tao/TkResource_Factory.h"
+#include "tao/TkResource/TkResource_Factory.h"
 #include "tao/debug.h"
 #include "ace/TkReactor.h"
 
diff --git a/TAO/tao/TkResource_Factory.h b/TAO/tao/TkResource/TkResource_Factory.h
index 7fe5bb140ac..f4aab08db60 100644
--- a/TAO/tao/TkResource_Factory.h
+++ b/TAO/tao/TkResource/TkResource_Factory.h
@@ -14,7 +14,7 @@
 #define TAO_TKRESOURCE_FACTORY_H
 #include /**/ "ace/pre.h"
 #include "ace/TkReactor.h"
-#include "tao/TAO_TkResource_Export.h"
+#include "tao/TkResource/TAO_TkResource_Export.h"
 #include "tao/GUIResource_Factory.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/tao/TkResource_Loader.cpp b/TAO/tao/TkResource/TkResource_Loader.cpp
index e8885850e0d..cbe8fb79681 100644
--- a/TAO/tao/TkResource_Loader.cpp
+++ b/TAO/tao/TkResource/TkResource_Loader.cpp
@@ -1,7 +1,7 @@
 //$Id$
-#include "tao/TkResource_Loader.h"
+#include "tao/TkResource/TkResource_Loader.h"
 #include "tao/ORB_Core.h"
-#include "tao/TkResource_Factory.h"
+#include "tao/TkResource/TkResource_Factory.h"
 
 ACE_RCSID( TAO_TkResource,
            TkResource_Loader,
diff --git a/TAO/tao/TkResource_Loader.h b/TAO/tao/TkResource/TkResource_Loader.h
index 86122b169d1..bdd3daeb0d2 100644
--- a/TAO/tao/TkResource_Loader.h
+++ b/TAO/tao/TkResource/TkResource_Loader.h
@@ -16,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_TkResource_Export.h"
+#include "tao/TkResource/TAO_TkResource_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/tao/XtResource.mpc b/TAO/tao/XtResource.mpc
index 8b437204f8b..158da848ec9 100644
--- a/TAO/tao/XtResource.mpc
+++ b/TAO/tao/XtResource.mpc
@@ -7,14 +7,11 @@ project(TAO_XtResource) : acelib, taolib, core, tao_output, taodefaults, ace_xtr
   dynamicflags += TAO_XTRESOURCE_BUILD_DLL
 
   Source_Files {
-    XtResource_Factory.cpp
-    XtResource_Loader.cpp
+    XtResource
   }
 
   Header_Files {
-    XtResource_Factory.h
-    XtResource_Loader.h
-    TAO_XtResource_Export.h
+    XtResource
   }
 
   Inline_Files {
diff --git a/TAO/tao/TAO_XtResource_Export.h b/TAO/tao/XtResource/TAO_XtResource_Export.h
index 5cc41d8da11..5cc41d8da11 100644
--- a/TAO/tao/TAO_XtResource_Export.h
+++ b/TAO/tao/XtResource/TAO_XtResource_Export.h
diff --git a/TAO/tao/XtResource_Factory.cpp b/TAO/tao/XtResource/XtResource_Factory.cpp
index c6afc35a325..0bd2f417292 100644
--- a/TAO/tao/XtResource_Factory.cpp
+++ b/TAO/tao/XtResource/XtResource_Factory.cpp
@@ -1,6 +1,6 @@
 //$Id$
 
-#include "tao/XtResource_Factory.h"
+#include "tao/XtResource/XtResource_Factory.h"
 #include "tao/debug.h"
 #include "ace/XtReactor.h"
 
diff --git a/TAO/tao/XtResource_Factory.h b/TAO/tao/XtResource/XtResource_Factory.h
index 5498865a256..5099969e25c 100644
--- a/TAO/tao/XtResource_Factory.h
+++ b/TAO/tao/XtResource/XtResource_Factory.h
@@ -14,7 +14,7 @@
 #define TAO_XTRESOURCE_FACTORY_H
 #include /**/ "ace/pre.h"
 #include /**/ <X11/Intrinsic.h>
-#include "tao/TAO_XtResource_Export.h"
+#include "tao/XtResource/TAO_XtResource_Export.h"
 #include "ace/XtReactor.h"
 #include "tao/GUIResource_Factory.h"
 
diff --git a/TAO/tao/XtResource_Loader.cpp b/TAO/tao/XtResource/XtResource_Loader.cpp
index 5fdc64af074..fb24c916b04 100644
--- a/TAO/tao/XtResource_Loader.cpp
+++ b/TAO/tao/XtResource/XtResource_Loader.cpp
@@ -1,7 +1,7 @@
 //$Id$
-#include "tao/XtResource_Loader.h"
+#include "tao/XtResource/XtResource_Loader.h"
 #include "tao/ORB_Core.h"
-#include "tao/XtResource_Factory.h"
+#include "tao/XtResource/XtResource_Factory.h"
 
 ACE_RCSID( TAO_XtResource,
            XtResource_Loader,
diff --git a/TAO/tao/XtResource_Loader.h b/TAO/tao/XtResource/XtResource_Loader.h
index f3e809ab1ed..37fe91406a2 100644
--- a/TAO/tao/XtResource_Loader.h
+++ b/TAO/tao/XtResource/XtResource_Loader.h
@@ -15,7 +15,7 @@
 #define TAO_XTRESOURCE_LOADER_H
 #include /**/ "ace/pre.h"
 #include /**/ <X11/Intrinsic.h>
-#include "tao/TAO_XtResource_Export.h"
+#include "tao/XtResource/TAO_XtResource_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once